IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity
5,190 Commits 845 Branches 1,202 Tags
4f1dbb8ca9a6cce09c9a20e91e074feaadd755a8
Commit Graph

631 Commits

Author SHA1 Message Date
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
=Corey Hulen
dffc5323ec PLT-1429 Fixing code review comments 2016-02-04 08:03:42 -08: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
950e25df5a Fixing build 2016-02-03 16:11:54 -08:00
=Corey Hulen
4da7b0ccbd Fixing based on feedback 2016-02-03 12:16:37 -08:00
=Corey Hulen
d3a965a362 Merge branch 'master' into PLT-1429 2016-02-03 12:11:02 -08:00
=Corey Hulen
bdfa4715d6 Merge branch 'master' into PLT-1429 2016-02-03 10:45:58 -08:00
JoramWilander
3425aa3e5d Update user email when switching to SSO 2016-02-03 10:32:37 -05:00
Elias Nahum
6a3806fe9d PLT-7: Refactoring frontend (chunk 11) 
- channel view
- Added translations for previous commits
- Fix bug on signup_team email body
 2016-02-03 12:17:13 -03: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
Christopher Speller
d479b08c99 Merge pull request #2045 from mattermost/plt-1849 
PLT-1849 Added extra system-wide statistics for EE
 2016-02-03 08:50:25 -05:00
JoramWilander
d153d661db Add basic server audit tab to system console for EE 2016-02-02 16:49:27 -05:00
Reed Garmsen
b013f02209 Added ability to sign in via username; separated email sign in and sign up config settings 2016-02-02 12:07:42 -08:00
=Corey Hulen
4c6c94d47c Fixing unit test 2016-02-02 08:46:43 -08:00
=Corey Hulen
ff54da2e4a Adding loc to front-end 2016-02-02 08:42:36 -08: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
1006e99859 Fixing email unit tests 2016-02-01 08:35:08 -08:00
Christopher Speller
66af7a8337 Merge pull request #2013 from mattermost/plt-1749 
PLT-1749 Return channel type in new post websocket events
 2016-01-29 08:38:24 -05:00
JoramWilander
6cba0353c9 Return channel type in new post websocket events 2016-01-28 12:28:02 -05:00
JoramWilander
0937cd4e38 Remove expiry from public links 2016-01-28 11:32:59 -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
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
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
JoramWilander
c4cca4d418 Updated search test cases 2016-01-27 07:37:05 -05:00
=Corey Hulen
c2bc9454ce PLT-1586 adding attach device id method 2016-01-26 20:32:24 -05:00
hmhealey
a6c97490b3 Changed first preference load to be done synchronously 2016-01-26 13:50:57 -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
Elias Nahum
470349d105 PLT-7: Refactoring api to use translations (chunk 4) 
- Translation for api templates english and spanish
 2016-01-24 17:10:54 -03:00
Elias Nahum
eb58e631e7 PLT-7: Refactoring api to use translations (chunk 3) 
- Add spanish translations
- Not included tests and templates
 2016-01-23 10:25:10 -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
=Corey Hulen
6b534f1b0d Merging 2016-01-22 16:42:38 -06:00
=Corey Hulen
c2d98c2c1f merging 2016-01-22 16:31:58 -06:00
Asaad Mahmood
b9fb855c6c Updating favicon stuff 2016-01-22 22:18:25 +05: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
=Corey Hulen
518efd7d2e PLT-7 fixing unit test for chunk 2 server 2016-01-22 08:04:02 -06:00
Corey Hulen
dd52e3f729 Merge pull request #1952 from ZBoxApp/PLT-7-go 
PLT-7: Refactoring api to use translations (chunk 2)
 2016-01-22 07:47:41 -06:00
Christopher Speller
9937e1ead2 Merge pull request #1948 from hmhealey/plt1652 
PLT-1652 Added download param to getFile api call
 2016-01-22 08:14:18 -05:00
Elias Nahum
4ef46db0f6 PLT-7: Change post CreatePost back to model.NewAppError 
- It was failing test using model.NewLocAppError
 2016-01-22 02:41:23 -03:00
Elias Nahum
6fd328ddaa Refactoring api to use translations (chunk 2) 
- Add spanish translations
- Does not include tests
- Add func to get the translations for a user locale
 2016-01-22 01:37:11 -03:00
=Corey Hulen
2219854359 PLT-7 client side infra 2016-01-21 14:15:44 -06:00
=Corey Hulen
8cc45a2e08 Merge branch 'master' into PLT-7-client-infra 2016-01-21 13:54:47 -06:00
=Corey Hulen
dea84b1892 PLT-7 Adding react-intl libs 2016-01-21 13:54:21 -06:00
hmhealey
261b38be45 Added download param to getFile api call 2016-01-21 13:55:47 -05:00
JoramWilander
2a26d85757 Generalize analytics server functions and begin componentizing client analytics controls 2016-01-21 12:14:23 -05:00