Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #278 from mattermost/mm-1702 | Corey Hulen | 2015-08-02 | 3 | -9/+83 |
|\ | | | | | MM-1702 Adding etag to channel extra_info api call. | ||||
| * | Moving the handing of extra_info etag before the extra info is retrieved ↵ | Christopher Speller | 2015-07-30 | 1 | -10/+14 |
| | | | | | | | | from the database | ||||
| * | Adding etag to channel extra_info api call. | Christopher Speller | 2015-07-29 | 3 | -4/+74 |
| | | |||||
* | | Merge pull request #273 from mattermost/mm-1355 | Corey Hulen | 2015-08-02 | 2 | -3/+55 |
|\ \ | | | | | | | Fixes mm-1355 adds rate limiting apis | ||||
| * | | Merge branch 'master' into mm-1355 | =Corey Hulen | 2015-07-30 | 2 | -9/+2 |
| |\| | |||||
| * | | Fixing code review feedback | =Corey Hulen | 2015-07-30 | 1 | -1/+6 |
| | | | |||||
| * | | Merge branch 'master' into mm-1355 | =Corey Hulen | 2015-07-29 | 12 | -21/+32 |
| |\ \ | |||||
| * | | | Fixes mm-1355 adds rate limiting apis | =Corey Hulen | 2015-07-29 | 2 | -2/+49 |
| | | | | |||||
* | | | | Merge pull request #305 from nickago/MM-1681 | Corey Hulen | 2015-08-02 | 14 | -46/+47 |
|\ \ \ \ | | | | | | | | | | | MM-1681 Fixed regression of static images not displaying in emails | ||||
| * | | | | Changed all templates to use site url instead of team url for finding the ↵ | nickago | 2015-07-31 | 14 | -46/+47 |
| | | | | | | | | | | | | | | | | | | | | 'static' directory | ||||
* | | | | | Merge pull request #274 from mattermost/mm-1497 | Corey Hulen | 2015-08-02 | 1 | -3/+10 |
|\ \ \ \ \ | | | | | | | | | | | | | MM-1497 image thumbnails now scale appropriately so there is no whitespace | ||||
| * | | | | | image thumbnails now scale appropriately so there is no whitespace, also ↵ | JoramWilander | 2015-07-31 | 1 | -3/+10 |
| |/ / / / | | | | | | | | | | | | | | | | generalized some thumbnail loading code | ||||
* | | | | | Merge pull request #303 from nickago/MM-1642 | Christopher Speller | 2015-07-31 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | MM-1642 Updated the password error | ||||
| * | | | | Updated error message for an incorrect password | nickago | 2015-07-30 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #271 from hmhealey/mm1656 | Joram Wilander | 2015-07-31 | 1 | -2/+5 |
|\ \ \ \ \ | | | | | | | | | | | | | MM-1656 Updated file UI | ||||
| * | | | | | Changed file API to not write response data on a HEAD request | hmhealey | 2015-07-29 | 1 | -1/+4 |
| | | | | | | |||||
| * | | | | | Allow file access apis to respond to HEAD requests | hmhealey | 2015-07-29 | 1 | -1/+1 |
| |/ / / / | |||||
* | | | | | Merge pull request #283 from mattermost/mm-1787 | Christopher Speller | 2015-07-31 | 1 | -5/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | MM-1787 Fixing links for signup from team invite link. | ||||
| * | | | | | Removing nickname parameter from FireAndForgetVerifyEmail | Christopher Speller | 2015-07-30 | 1 | -3/+2 |
| | | | | | | |||||
| * | | | | | Fixing links for signup from team invite link. Enter now advances ↵ | Christopher Speller | 2015-07-30 | 1 | -5/+5 |
| | |_|_|/ | |/| | | | | | | | | | | | | | signup_user_complete screen. Signin now link now redirects properly. | ||||
* | | | | | Merge pull request #285 from hmhealey/mm1738 | Joram Wilander | 2015-07-30 | 1 | -4/+17 |
|\ \ \ \ \ | | | | | | | | | | | | | MM-1787 Fixed team API to properly provide team names for the Find My Team email | ||||
| * | | | | | Fixed team API to properly provide team names for the Find My Team email | hmhealey | 2015-07-29 | 1 | -4/+17 |
| |/ / / / | |||||
* | | | | | Merge pull request #272 from rgarmsen2295/mm-1463 | Christopher Speller | 2015-07-30 | 1 | -4/+33 |
|\ \ \ \ \ | |/ / / / |/| | | | | MM-1463 Adds back username initials being included in user's default profile picture | ||||
| * | | | | Made font type a field in the config file | Reed Garmsen | 2015-07-29 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Changed text initial size and positioning to better handle different image ↵ | Reed Garmsen | 2015-07-29 | 1 | -3/+5 |
| | | | | | | | | | | | | | | | | | | | | sizes and removed dead code | ||||
| * | | | | Added godeps and the source for the go freetype library | Reed Garmsen | 2015-07-29 | 1 | -29/+5 |
| | | | | | |||||
| * | | | | Added back username initials being included in default profile picture | Reed Garmsen | 2015-07-28 | 1 | -5/+38 |
| | | | | | |||||
| * | | | | Initial changes to putting initials on default profile pics | Reed Garmsen | 2015-07-28 | 1 | -0/+18 |
| | | | | | |||||
* | | | | | updated channel error messages to reflect proper naming | JoramWilander | 2015-07-29 | 1 | -2/+2 |
| |/ / / |/| | | | |||||
* | | | | Merge pull request #265 from mattermost/mm-1711 | Joram Wilander | 2015-07-29 | 1 | -7/+0 |
|\ \ \ \ | |_|_|/ |/| | | | MM-1711 update sign-up and login UI | ||||
| * | | | updates to sign-up flow, remove company name and marketing checkbox | JoramWilander | 2015-07-28 | 1 | -7/+0 |
| |/ / | |||||
* | | | Merge pull request #264 from asaadmahmoodspin/mm-1732 | Corey Hulen | 2015-07-28 | 9 | -18/+18 |
|\ \ \ | |/ / |/| | | mm-1732 - Decreasing font size for footer in emails | ||||
| * | | MM-1730 - Updating logo in emails | Asaad Mahmood | 2015-07-28 | 9 | -9/+9 |
| | | | |||||
| * | | mm-1732 - Decrease font size for footer in emails | Asaad Mahmood | 2015-07-28 | 9 | -9/+9 |
| | | | |||||
* | | | Allow users to download file attachments with names that don't include a ↵ | hmhealey | 2015-07-28 | 1 | -1/+1 |
|/ / | | | | | | | file extension | ||||
* | | Merge pull request #253 from nickago/MM-1654 | Christopher Speller | 2015-07-28 | 1 | -0/+6 |
|\ \ | | | | | | | MM-1654 Anti-clickjacking measures | ||||
| * | | Limited the added headers to only non-api calls | nickago | 2015-07-27 | 1 | -2/+6 |
| | | | |||||
| * | | Centralized header additions and removed duplicate code | nickago | 2015-07-27 | 1 | -0/+2 |
| |/ | |||||
* | | Merge pull request #239 from nickago/MM-1295 | Christopher Speller | 2015-07-28 | 1 | -0/+5 |
|\ \ | | | | | | | MM-1295 Removal from a channel occurs in real time | ||||
| * | | When user is removed, a modal appears, which on closing redirects the | nickago | 2015-07-27 | 1 | -0/+1 |
| | | | | | | | | | | | | user to town square. | ||||
| * | | When removed from a channel, user is sent back to town square and that | nickago | 2015-07-27 | 1 | -0/+4 |
| |/ | | | | | | | channel is removed from their sidebar | ||||
* / | Change image rescaling algorithm back to Lanczos3 now that it works ↵ | hmhealey | 2015-07-24 | 1 | -2/+2 |
|/ | | | | correctly in all cases | ||||
* | Merge branch 'master' into mm-1420 | =Corey Hulen | 2015-07-23 | 2 | -78/+188 |
|\ | |||||
| * | Merge pull request #237 from mattermost/mm-1570 | Corey Hulen | 2015-07-23 | 1 | -77/+187 |
| |\ | | | | | | | fixes mm-1570 adds support for using mattermost as an OAuth client | ||||
| | * | added store unit test for user.GetByAuth and added password length checking ↵ | JoramWilander | 2015-07-23 | 1 | -0/+6 |
| | | | | | | | | | | | | in api.login | ||||
| | * | add check on server to prevent password updating for users who log in ↵ | JoramWilander | 2015-07-22 | 1 | -0/+7 |
| | | | | | | | | | | | | through oauth | ||||
| | * | add changes from team review | JoramWilander | 2015-07-22 | 1 | -0/+1 |
| | | | |||||
| | * | added error case for login and removed authdata + authservice unique ↵ | JoramWilander | 2015-07-22 | 1 | -9/+23 |
| | | | | | | | | | | | | constraint in users table | ||||
| | * | added signup link verification to oauth signup flow | JoramWilander | 2015-07-22 | 1 | -45/+34 |
| | | | |||||
| | * | add error for trying to sign up with the same oauth account twice | JoramWilander | 2015-07-22 | 1 | -1/+1 |
| | | |