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

260 Коммитов

Автор SHA1 Сообщение Дата
JoramWilander
e45282deaa Move license storage to database 2016-02-04 13:35:44 -05:00
Harrison Healey
4f1dbb8ca9 Merge pull request #2052 from mattermost/PLT-1429
PLT-1429 adding user created slash commands
2016-02-04 11:38:27 -05:00
Harrison Healey
5e83be02ba Merge pull request #2059 from mattermost/plt-1732
PLT-1732 Update user email when switching to SSO
2016-02-04 09:24:41 -05:00
=Corey Hulen
bdfa4715d6 Merge branch 'master' into PLT-1429 2016-02-03 10:45:58 -08:00
Harrison Healey
6769969051 Merge pull request #2057 from khoa-le/PLT-1673
PLT-1673: Make hashtag searching independent of case
2016-02-03 11:10:35 -05:00
JoramWilander
a4e7d02cec Fix auth data unit test 2016-02-03 11:06:24 -05:00
JoramWilander
3425aa3e5d Update user email when switching to SSO 2016-02-03 10:32:37 -05:00
Christopher Speller
75f412c4be Merge pull request #2049 from mattermost/plt-1856
PLT-1856 Add basic server audit tab to system console for EE
2016-02-03 08:52:18 -05:00
Khoa, Le Ngoc
36228f5f8a Make hashtag searching independent of case 2016-02-03 16:53:03 +07:00
JoramWilander
d153d661db Add basic server audit tab to system console for EE 2016-02-02 16:49:27 -05:00
JoramWilander
3d03bdf2f1 Added extra system-wide statistics for EE 2016-02-02 08:41:02 -05:00
=Corey Hulen
27586a320a Adding loc to new command backend 2016-02-01 18:52:43 -08:00
=Corey Hulen
b4ec690051 Fixing merge 2016-02-01 14:44:17 -08:00
=Corey Hulen
2138b46f6c PLT-1765 allowing support of 2 previous versions 2016-01-28 11:39:48 -05:00
Christopher Speller
b7606da40f Merge pull request #1988 from mattermost/plt-1475
PLT-1475 Update search query to ignore system messages
2016-01-27 09:28:09 -05:00
=Corey Hulen
6fd0f651b9 Fixing naming 2016-01-26 21:13:44 -05:00
=Corey Hulen
c2bc9454ce PLT-1586 adding attach device id method 2016-01-26 20:32:24 -05:00
JoramWilander
fb794f03c1 Update search query to ignore system messages 2016-01-26 11:51:27 -05:00
Elias Nahum
69fbea225e PLT-7: Refactoring stores to use translations (chunk 7)
- Add spanish translations
2016-01-25 16:23:57 -03:00
=Corey Hulen
ea71731f83 merging 2016-01-25 11:23:55 -05:00
hmhealey
fc0b422c37 Changed GetMemberCount to stop including inactive users 2016-01-23 13:13:44 -05:00
=Corey Hulen
c2d98c2c1f merging 2016-01-22 16:31:58 -06:00
JoramWilander
2a26d85757 Generalize analytics server functions and begin componentizing client analytics controls 2016-01-21 12:14:23 -05:00
Corey Hulen
aefbb541d0 Revert " PLT-7 adding loc for db calls" 2016-01-20 13:36:16 -06:00
=Corey Hulen
75f8729e2d PLT-7 adding loc db calls for users table 2016-01-20 12:43:44 -06:00
=Corey Hulen
aac8d121a0 PLT-7 adding loc db calls for posts table 2016-01-20 10:34:31 -06:00
=Corey Hulen
3ac5ecf0e9 PLT-7 adding loc db calls for session table 2016-01-20 10:18:11 -06:00
=Corey Hulen
11c035aef4 PLT-7 adding loc db calls for oauth table 2016-01-20 10:04:17 -06:00
=Corey Hulen
640d3018c9 PLT-7 adding loc db calls for oauth table 2016-01-20 08:56:09 -06:00
=Corey Hulen
ef11df7532 PLT-7 adding loc db calls for webhooks table 2016-01-20 08:44:05 -06:00
=Corey Hulen
5b2ec62347 PLT-7 adding loc db calls for team table 2016-01-20 08:33:26 -06:00
=Corey Hulen
ca33812cb5 PLT-7 adding loc db calls for system table 2016-01-20 08:07:52 -06:00
=Corey Hulen
f5eb3c1bcb PLT-7 adding loc for db calls audits and prefs 2016-01-20 07:59:56 -06:00
=Corey Hulen
8e404c1dcf PLT-7 Adding translation function to context 2016-01-19 22:00:01 -06:00
=Corey Hulen
6d6cada097 Merge branch 'master' into PLT-1429 2016-01-14 09:08:13 -06:00
=Corey Hulen
2fd597043b Chaning webhooks to be team wide 2016-01-11 10:04:01 -06:00
=Corey Hulen
b1251b9393 Upgrade logging package 2016-01-11 09:12:51 -06:00
=Corey Hulen
001a4448ca PLT-1429 adding sql storage for slash commands 2016-01-06 21:09:05 -06:00
hmhealey
0e7a149982 Added the ability to get more channel members from getChannelExtraInfo 2016-01-06 18:04:24 -05:00
=Corey Hulen
4e8c59279c Moving to constnt 2016-01-05 14:53:41 -06:00
=Corey Hulen
456b7872a4 PLT-1572 Adding more info to the error message 2016-01-05 08:54:39 -06: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
=Corey Hulen
944f884a05 Fixing channel limit 2015-12-15 11:05:40 -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
Christopher Speller
985dc06e5f Removing old 1.3 DB upgrade code 2015-12-09 15:55:44 -05:00
JoramWilander
8e8b001609 Split db channel get into two functions using master and replica 2015-12-09 10:48:35 -05:00
Joram Wilander
a686bcc19a Merge pull request #1646 from mattermost/PLT-1302
PLT-1302 fixing hiding email adddress
2015-12-08 08:29:27 -05:00
=Corey Hulen
2ab13b7ad3 PLT-1302 fixing hiding email adddress 2015-12-07 15:13:31 -08:00
JoramWilander
910b3216fe Update unit test 2015-12-07 15:10:03 -05:00