Commit Graph

281 Commits

Author SHA1 Message Date
Christopher Speller
c7faefbedc Merge pull request #1924 from loafoe/master
[#1923] Make Websocket ports configurable
2016-01-21 10:01:15 -05:00
=Corey Hulen
d74e2f3e11 tweaking 2016-01-20 14:53:12 -06:00
=Corey Hulen
e70428c1bd tweak 2016-01-20 14:38:17 -06:00
=Corey Hulen
984fa7f1ca PLT-7-server-db 2016-01-20 14:36:34 -06:00
=Corey Hulen
96f8394bf4 Fxing version 2016-01-19 22:03:53 -06:00
=Corey Hulen
8e404c1dcf PLT-7 Adding translation function to context 2016-01-19 22:00:01 -06:00
Andy Lo-A-Foe
6faabe34e8 Optionally specify ws:// and wss:// port in config 2016-01-19 19:41:39 +01:00
JoramWilander
c26edcf678 Final updates 2016-01-14 08:24:09 -05:00
JoramWilander
874d120535 Add some unit tests 2016-01-14 08:24:09 -05:00
JoramWilander
9110dd54a1 Added license validation and settings 2016-01-14 08:24:09 -05:00
Joram Wilander
691380a60a Merge pull request #1852 from mattermost/PLT-1608
PLT-1608 Upgrading logging package
2016-01-12 11:29:21 -05:00
=Corey Hulen
5083a3947a Release 1.4 rc1 2016-01-11 13:04:55 -06:00
=Corey Hulen
b1251b9393 Upgrade logging package 2016-01-11 09:12:51 -06:00
Joram Wilander
7aa7f83524 Merge pull request #1824 from hmhealey/plt1525
PLT-1525 Fixed ChannelInviteModal displaying some users that are already in the channel
2016-01-11 06:54:55 -05:00
hmhealey
0e7a149982 Added the ability to get more channel members from getChannelExtraInfo 2016-01-06 18:04:24 -05:00
Harrison Healey
5bcb9f1c50 Merge pull request #1813 from mattermost/PLT-1558
PLT-1558 adding session length to config file
2016-01-06 16:13:10 -05:00
=Corey Hulen
f0e620a485 PLT-1485 Adding last view channel sticky 2016-01-05 14:48:05 -06:00
=Corey Hulen
214c6bc15e Adding UI for session length settings 2016-01-05 11:46:51 -06:00
=Corey Hulen
bd4314e977 PLT-1558 adding session length to config file 2016-01-05 11:13:25 -06:00
Christopher Speller
67db3ca8ce Merge pull request #1745 from mattermost/plt-1118
PLT-1118 Add ability to switch between SSO and email account
2016-01-04 15:55:51 -05:00
Christopher Speller
59a3d6e725 Merge pull request #1770 from mattermost/GIT-1766
GIT-1766 fixing typo
2016-01-04 07:15:13 -05:00
Christopher Speller
c44873c61b Merge pull request #1763 from benburkert/non-s3-region
support unofficial S3 regions
2016-01-04 07:13:38 -05:00
=Corey Hulen
fedf973c64 GIT-1766 fixing typo 2015-12-23 11:01:51 -08:00
Ben Burkert
ecef2c8cb5 support unofficial S3 regions
Adds support for S3 clones like Ceph.
2015-12-21 16:51:37 -08:00
hmhealey
cfdc5ab999 Fixed TestGetFile unit test 2015-12-18 19:02:48 -05:00
hmhealey
d4a139c09a Added additional information to getFileInfo api call 2015-12-18 12:24:52 -05:00
JoramWilander
a6ae90ac2a Add ability to switch between SSO and email account 2015-12-17 12:44:46 -05:00
Christopher Speller
58358ddd7c Some refactoring 2015-12-16 17:30:15 -05:00
Christopher Speller
3e418a100a Merge pull request #1710 from mattermost/plt-1498
PLT-1498 Add hashtag testing and allow special german characters
2015-12-16 09:09:11 -05:00
=Corey Hulen
c7c03817d0 Adding error bar message when console error detected 2015-12-14 11:34:16 -08:00
Harrison Healey
aec25ceb4b Merge pull request #1720 from rgarmsen2295/plt-860
PLT 860 & 1116 - Changes test emails to include a '+' and fixes email verification issue with emails that included a '+'
2015-12-14 09:54:11 -05:00
Reed Garmsen
b9d93b104c Fixing issues caused by changing test emails 2015-12-13 15:31:27 -08:00
Reed Garmsen
e7eb86c8c3 Updated emails in unit tests to include '+' 2015-12-13 14:21:23 -08:00
Joram Wilander
b9a4966e7d Merge pull request #1588 from rgarmsen2295/plt-881
PLT-881 Adds Legal and Support Settings to the System Console
2015-12-12 15:47:36 -05:00
JoramWilander
b660acf8f8 Add hashtag testing and allow special german characters 2015-12-11 13:03:14 -05:00
Corey Hulen
412b45431a Merge pull request #1652 from hmhealey/plt1319
PLT-1319 Fixed direct channels not being visible when no actual channel exists
2015-12-11 06:40:37 -08:00
Reed Garmsen
470797cca6 Fixed issue with Team Settings modal saving items instead of cancelling; changed remaining copyrights 2015-12-10 14:33:21 -08:00
Reed Garmsen
87d7db3438 Added legal and support settings to sys console and implemented support for options in app 2015-12-10 09:38:19 -08:00
Christopher Speller
aef1686606 Merge pull request #1688 from mattermost/fix-salts
Generate salts when empty
2015-12-10 08:54:12 -05:00
=Corey Hulen
7299fd6a4c Fixing unit test 2015-12-09 20:59:15 -08:00
=Corey Hulen
9fbe16c17b Generate salts when empty 2015-12-09 15:42:48 -08:00
Christopher Speller
0f563509a5 Updating version to 1.3.0 2015-12-09 14:51:33 -05:00
=Corey Hulen
d2db4b1621 Fixing defaults 2015-12-08 14:06:52 -08:00
=Corey Hulen
2ab13b7ad3 PLT-1302 fixing hiding email adddress 2015-12-07 15:13:31 -08:00
hmhealey
7d4a9ad376 Added preference_changed web socket event 2015-12-07 18:13:14 -05:00
Florian Orben
18d29a19e5 PLT-1380: Post system message when user updates channel header 2015-12-04 03:39:37 +01:00
Florian Orben
14d1ec5191 PLT-1326: Enable channel posts of type join or leave not trigger unread notifications 2015-12-04 02:07:47 +01:00
JoramWilander
cc111205f9 Add limit to Props size in Post table 2015-12-03 11:57:20 -05:00
Joram Wilander
7678d4aafa Merge pull request #1556 from npcode/sso-github-ent
Make the Gitlab SSO Support compatible with Github Enterprise
2015-12-02 08:08:27 -05:00
Yi EungJun
6d63f5703c Make the Gitlab SSO Support compatible with Github Enterprise
See doc/integrations/Single-Sign-On/Github.md for the usage.

Note: I thought it should work also with Github.com but it failed with "Bad
token type" error.
2015-12-02 13:23:57 +09:00