Граф коммитов

293 Коммитов

Автор SHA1 Сообщение Дата
=Corey Hulen
2138b46f6c PLT-1765 allowing support of 2 previous versions 2016-01-28 11:39:48 -05:00
=Corey Hulen
c50b8661ec Fixing build 2016-01-27 11:05:46 -05:00
=Corey Hulen
dc4b71bba2 PLT-7 Removing AppError ctor 2016-01-27 10:56:15 -05:00
Christopher Speller
f0e6e7de93 Merge pull request #1993 from mattermost/PLT-1586
PLT-1586 adding LDAP/OAuth to iOS
2016-01-27 09:22:27 -05:00
=Corey Hulen
0dec26bb9f Fixing version 2016-01-26 21:11:39 -05:00
=Corey Hulen
c2bc9454ce PLT-1586 adding attach device id method 2016-01-26 20:32:24 -05:00
hmhealey
97ede2a428 Updated serverside hashtag regex to ignore more punctuation around words 2016-01-26 10:20:36 -05:00
hmhealey
1cd25cf380 Fixed serverside errors occurring when getting files with no extension 2016-01-25 09:51:17 -05:00
Elias Nahum
f33cff21cf PLT-7: Refactoring models to use translations (chunk 6)
- Add spanish translations
2016-01-25 10:22:12 -03:00
Corey Hulen
1a0b12313b Merge pull request #1956 from mattermost/plt-1779
PLT-1779 Add system-wide statistics page
2016-01-22 17:00:09 -06:00
JoramWilander
0d239a1a9e Added unit test and fixed errors 2016-01-22 10:19:02 -05:00
JoramWilander
bbcf00f02e Add create_at back to profile fields to fix analytics 2016-01-22 09:53:17 -05:00
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