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,654 Commits 845 Branches 1,202 Tags
e7ece19957f17bf60379167dd9ae9e7bac804e0a
Commit Graph

161 Commits

Author SHA1 Message Date
Elias Nahum
25d599747e Fix typo 2016-02-25 14:10:24 -03:00
Elias Nahum
6a8df70e73 Set Context Error if ExtraUpdateByUser fails 2016-02-25 13:46:17 -03:00
Elias Nahum
f0084229a5 Member show on Activate and Hide on deactivate from channel member list and at_mention 2016-02-25 04:24:03 -03:00
=Corey Hulen
35e3b8c40f Fixing IE expire issue 2016-02-11 13:17:27 -08:00
Elias Nahum
85d0eece3d Need to set as template.HTML 2016-02-10 16:43:03 -03:00
Elias Nahum
d5c666ec12 Change body info from String to HTML 2016-02-10 16:26:32 -03:00
Elias Nahum
7476bc9883 Fix change email subject 2016-02-10 15:20:51 -03:00
=Corey Hulen
fbe932ece6 Fixing attaching device id 2016-02-08 14:30:58 -08:00
JoramWilander
53ee703e7c Add ExpiresAt to session cookie so that IE/Edge store the cookie 2016-02-08 11:29:11 -05:00
JoramWilander
9f5f18a93a Make insecure TLS connections configurable 2016-02-05 12:40:32 -05:00
JoramWilander
8c505e7b5c Accept unsigned TLS certs for SSO and outgoing hooks, also fix delete hooks bug 2016-02-05 08:21:15 -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
=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
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
b4ec690051 Fixing merge 2016-02-01 14:44:17 -08:00
=Corey Hulen
dc4b71bba2 PLT-7 Removing AppError ctor 2016-01-27 10:56:15 -05:00
=Corey Hulen
c2bc9454ce PLT-1586 adding attach device id method 2016-01-26 20:32:24 -05: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
=Corey Hulen
c2d98c2c1f merging 2016-01-22 16:31:58 -06: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
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
f5eb3c1bcb PLT-7 adding loc for db calls audits and prefs 2016-01-20 07:59:56 -06:00
=Corey Hulen
6d6cada097 Merge branch 'master' into PLT-1429 2016-01-14 09:08:13 -06: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
Corey Hulen
b8c70b4d04 Merge pull request #1876 from mattermost/release-1.4 
Release 1.4 RC2
 2016-01-12 14:46:06 -06:00
JoramWilander
1763ff6d72 Support old oauth routes 2016-01-12 08:02:38 -05:00
=Corey Hulen
b1251b9393 Upgrade logging package 2016-01-11 09:12:51 -06:00
=Corey Hulen
3fba8e42b1 partial fix for UI 2016-01-08 12:41:26 -06:00
=Corey Hulen
bd4314e977 PLT-1558 adding session length to config file 2016-01-05 11:13:25 -06:00
=Corey Hulen
e432b66641 PLT-1557 revoking sessions from same device 2016-01-05 09:58:21 -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
2ab13b7ad3 PLT-1302 fixing hiding email adddress 2015-12-07 15:13:31 -08:00
Florian Orben
911e430b3f set correct http status code for login failures/wrong email 2015-11-28 12:43:46 +01:00
=Corey Hulen
c115191d6b fixing based on feedback 2015-11-18 08:53:17 -08:00
=Corey Hulen
6b2eabf610 Adding perm delete to cmd line 2015-11-16 17:12:49 -08:00
JoramWilander
c07c266b27 Omit unneeded fields from user object in getProfiles service and remove ImgCount field from Post model 2015-11-09 15:44:28 -05:00
JoramWilander
6a2ef68444 Add tutorial pref for new users by default 2015-11-06 12:55:05 -05:00
JoramWilander
7eca077877 Prevent SSO users from changing their email 2015-11-06 08:56:13 -05:00
JoramWilander
23d6cfe4d8 Don't send welcome emails for users signing up from an email invite, update email content 2015-11-05 08:59:29 -05:00