Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Merge pull request #2052 from mattermost/PLT-1429 | Harrison Healey | 2016-02-04 | 1 | -0/+4 | |
|\ | | | | | PLT-1429 adding user created slash commands | |||||
| * | Merge branch 'master' into PLT-1429 | =Corey Hulen | 2016-02-03 | 1 | -0/+34 | |
| |\ | ||||||
| * \ | Fixing merge | =Corey Hulen | 2016-02-01 | 1 | -2/+45 | |
| |\ \ | ||||||
| * \ \ | merging | =Corey Hulen | 2016-01-25 | 1 | -50/+71 | |
| |\ \ \ | ||||||
| * \ \ \ | merging | =Corey Hulen | 2016-01-22 | 1 | -86/+94 | |
| |\ \ \ \ | ||||||
| * \ \ \ \ | Merge branch 'master' into PLT-1429 | =Corey Hulen | 2016-01-14 | 1 | -11/+26 | |
| |\ \ \ \ \ | ||||||
| * | | | | | | partial fix for UI | =Corey Hulen | 2016-01-08 | 1 | -0/+4 | |
| | | | | | | | ||||||
* | | | | | | | Update user email when switching to SSO | JoramWilander | 2016-02-03 | 1 | -2/+5 | |
| |_|_|_|_|/ |/| | | | | | ||||||
* | | | | | | Added ability to sign in via username; separated email sign in and sign up ↵ | Reed Garmsen | 2016-02-02 | 1 | -0/+34 | |
| |_|_|_|/ |/| | | | | | | | | | | | | | | config settings | |||||
* | | | | | PLT-7 Removing AppError ctor | =Corey Hulen | 2016-01-27 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | PLT-1586 adding attach device id method | =Corey Hulen | 2016-01-26 | 1 | -1/+44 | |
| |_|_|/ |/| | | | ||||||
* | | | | PLT-7: Refactoring api to use translations (chunk 4) | Elias Nahum | 2016-01-24 | 1 | -50/+71 | |
| |_|/ |/| | | | | | | | | - Translation for api templates english and spanish | |||||
* | | | Refactoring api to use translations (chunk 2) | Elias Nahum | 2016-01-22 | 1 | -86/+94 | |
| | | | | | | | | | | | | | | | | | | - Add spanish translations - Does not include tests - Add func to get the translations for a user locale | |||||
* | | | Revert " PLT-7 adding loc for db calls" | Corey Hulen | 2016-01-20 | 1 | -97/+95 | |
| | | | ||||||
* | | | PLT-7 adding loc db calls for users table | =Corey Hulen | 2016-01-20 | 1 | -42/+42 | |
| | | | ||||||
* | | | PLT-7 adding loc db calls for posts table | =Corey Hulen | 2016-01-20 | 1 | -1/+1 | |
| | | | ||||||
* | | | PLT-7 adding loc db calls for session table | =Corey Hulen | 2016-01-20 | 1 | -12/+12 | |
| | | | ||||||
* | | | PLT-7 adding loc db calls for oauth table | =Corey Hulen | 2016-01-20 | 1 | -2/+2 | |
| | | | ||||||
* | | | PLT-7 adding loc db calls for oauth table | =Corey Hulen | 2016-01-20 | 1 | -3/+3 | |
| | | | ||||||
* | | | PLT-7 adding loc db calls for webhooks table | =Corey Hulen | 2016-01-20 | 1 | -2/+2 | |
| | | | ||||||
* | | | PLT-7 adding loc db calls for team table | =Corey Hulen | 2016-01-20 | 1 | -12/+12 | |
| | | | ||||||
* | | | PLT-7 adding loc for db calls audits and prefs | =Corey Hulen | 2016-01-20 | 1 | -21/+23 | |
| |/ |/| | ||||||
* | | Final updates | JoramWilander | 2016-01-14 | 1 | -0/+4 | |
| | | ||||||
* | | Add some unit tests | JoramWilander | 2016-01-14 | 1 | -9/+20 | |
| | | ||||||
* | | Merge pull request #1876 from mattermost/release-1.4 | Corey Hulen | 2016-01-12 | 1 | -1/+1 | |
|\ \ | | | | | | | Release 1.4 RC2 | |||||
| * | | Support old oauth routes | JoramWilander | 2016-01-12 | 1 | -1/+1 | |
| |/ | ||||||
* / | Upgrade logging package | =Corey Hulen | 2016-01-11 | 1 | -1/+1 | |
|/ | ||||||
* | PLT-1558 adding session length to config file | =Corey Hulen | 2016-01-05 | 1 | -4/+4 | |
| | ||||||
* | PLT-1557 revoking sessions from same device | =Corey Hulen | 2016-01-05 | 1 | -7/+25 | |
| | ||||||
* | Add ability to switch between SSO and email account | JoramWilander | 2015-12-17 | 1 | -22/+318 | |
| | ||||||
* | Some refactoring | Christopher Speller | 2015-12-16 | 1 | -18/+82 | |
| | ||||||
* | PLT-1302 fixing hiding email adddress | =Corey Hulen | 2015-12-07 | 1 | -4/+4 | |
| | ||||||
* | set correct http status code for login failures/wrong email | Florian Orben | 2015-11-28 | 1 | -0/+1 | |
| | ||||||
* | fixing based on feedback | =Corey Hulen | 2015-11-18 | 1 | -2/+4 | |
| | ||||||
* | Adding perm delete to cmd line | =Corey Hulen | 2015-11-16 | 1 | -2/+61 | |
| | ||||||
* | Omit unneeded fields from user object in getProfiles service and remove ↵ | JoramWilander | 2015-11-09 | 1 | -0/+1 | |
| | | | | ImgCount field from Post model | |||||
* | Add tutorial pref for new users by default | JoramWilander | 2015-11-06 | 1 | -0/+5 | |
| | ||||||
* | Prevent SSO users from changing their email | JoramWilander | 2015-11-06 | 1 | -1/+1 | |
| | ||||||
* | Don't send welcome emails for users signing up from an email invite, update ↵ | JoramWilander | 2015-11-05 | 1 | -2/+7 | |
| | | | | email content | |||||
* | Multiple fixes to major performance issues with teams with 50+ users | JoramWilander | 2015-11-03 | 1 | -2/+17 | |
| | ||||||
* | Fixing 200 error bug | =Corey Hulen | 2015-10-29 | 1 | -1/+1 | |
| | ||||||
* | PLT-25 fixing issues with stats page | =Corey Hulen | 2015-10-27 | 1 | -0/+6 | |
| | ||||||
* | Prevented image files larger than 4k resolution from being uploaded | hmhealey | 2015-10-26 | 1 | -0/+12 | |
| | ||||||
* | Set correct mime type for profile images | Florian Orben | 2015-10-25 | 1 | -0/+1 | |
| | ||||||
* | Merge pull request #1143 from mattermost/plt-803 | Corey Hulen | 2015-10-22 | 1 | -0/+10 | |
|\ | | | | | PLT-803 Prevent users from resetting their password when the user is using SSO | |||||
| * | Prevent users from resetting their password when the user is using SSO | JoramWilander | 2015-10-22 | 1 | -0/+10 | |
| | | ||||||
* | | Fixing code review issues | =Corey Hulen | 2015-10-22 | 1 | -1/+1 | |
| | | ||||||
* | | Fixing group code review issues | =Corey Hulen | 2015-10-22 | 1 | -1/+1 | |
| | | ||||||
* | | Addressing issues from group code review | =Corey Hulen | 2015-10-22 | 1 | -20/+9 | |
| | | ||||||
* | | Merge branch 'master' into PLT-44 | =Corey Hulen | 2015-10-20 | 1 | -10/+10 | |
|\| |