| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #487 from rgarmsen2295/mm-2000 | Christopher Speller | 2015-08-27 | 2 | -3/+3 |
| |\ | | | | | MM-2000 Added links to the teams listed in the 'Find your teams' email | ||||
| | * | Added links to the teams listed in the 'Find your teams' email | Reed Garmsen | 2015-08-26 | 2 | -3/+3 |
| | | | |||||
| * | | Merge pull request #470 from nickago/MM-1945 | Joram Wilander | 2015-08-27 | 2 | -4/+18 |
| |\ \ | |/ |/| | MM-1945 Added a link to error page that returns users to the root page | ||||
| | * | Added a link to error page that returns users to the root page | nickago | 2015-08-25 | 2 | -4/+18 |
| | | | |||||
| * | | Fixes mm-1912 move get file info into its own web service call | =Corey Hulen | 2015-08-24 | 2 | -7/+78 |
| |/ | |||||
| * | Fixing audit log to wait for confirm | =Corey Hulen | 2015-08-20 | 1 | -11/+11 |
| | | |||||
| * | Fixing build | =Corey Hulen | 2015-08-20 | 1 | -7/+11 |
| | | |||||
| * | Merge pull request #406 from mattermost/mm-1281 | Christopher Speller | 2015-08-19 | 1 | -0/+2 |
| |\ | | | | | MM-1281 Track channel creator in DB and show in channel intro message | ||||
| | * | Track channel creator in DB and show in channel intro message. | JoramWilander | 2015-08-19 | 1 | -0/+2 |
| | | | |||||
| * | | Merge pull request #394 from mattermost/mm-1410 | Joram Wilander | 2015-08-19 | 5 | -2/+374 |
| |\ \ | | | | | | | MM-1410 Initial implementaiton of import from Slack | ||||
| | * | | Requiring team admin to import and fixing a few style issues | Christopher Speller | 2015-08-19 | 2 | -7/+4 |
| | | | | |||||
| | * | | Implemention of slack import feature. | Christopher Speller | 2015-08-19 | 5 | -2/+377 |
| | |/ | |||||
| * / | Added a message deleted indicator when a post is deleted to let the user ↵ | JoramWilander | 2015-08-19 | 1 | -2/+1 |
| |/ | | | | know what's happening. | ||||
| * | Merge pull request #385 from mattermost/mm-1623 | Christopher Speller | 2015-08-18 | 2 | -5/+37 |
| |\ | | | | | MM-1623 when user roles are updated, the relevant session roles are updated as well | ||||
| | * | when user roles are updated, the relevant session roles are updated as well | JoramWilander | 2015-08-17 | 2 | -5/+37 |
| | | | |||||
| * | | added google sign-in functionality to the client, with minor model modifications | JoramWilander | 2015-08-14 | 1 | -13/+40 |
| | | | |||||
| * | | initial server implementation for using google as a single-sign-on oauth service | JoramWilander | 2015-08-14 | 1 | -0/+6 |
| |/ | |||||
| * | Merge pull request #370 from hmhealey/mm1812 | Christopher Speller | 2015-08-14 | 2 | -0/+35 |
| |\ | | | | | MM-1812 Provide warnings on team invite screens when email is disabled | ||||
| | * | Removed isEmailEnabledSynchronous and switched the email disabled warnings ↵ | hmhealey | 2015-08-13 | 1 | -5/+0 |
| | | | | | | | | | to use ConfigStore | ||||
| | * | Added ConfigStore that is populated from the server | hmhealey | 2015-08-13 | 1 | -0/+16 |
| | | | |||||
| | * | Added initial api to allow clientside code to query serverside configuration | hmhealey | 2015-08-11 | 2 | -0/+24 |
| | | | |||||
| * | | fixed channel counts etag to only update when appropriate | JoramWilander | 2015-08-11 | 1 | -1/+1 |
| | | | |||||
| * | | change getChannel api service to not register as user activity | JoramWilander | 2015-08-11 | 1 | -1/+1 |
| | | | |||||
| * | | add etag cache testing to api GetChannelCounts unit test | JoramWilander | 2015-08-11 | 1 | -0/+7 |
| | | | |||||
| * | | added api unit test for GetChannelCounts | JoramWilander | 2015-08-11 | 1 | -0/+34 |
| | | | |||||
| * | | added getChannelCounts service and refactored the client to more ↵ | JoramWilander | 2015-08-11 | 1 | -0/+17 |
| | | | | | | | | | intelligently pull channel data | ||||
| * | | added getChannel api service and use that over getChannels where appropriate ↵ | JoramWilander | 2015-08-11 | 2 | -2/+55 |
| |/ | | | | on client | ||||
| * | Changed post drafts to maintain a store a unique id for each file upload to ↵ | hmhealey | 2015-08-10 | 1 | -1/+7 |
| | | | | | fix issues with duplicate file names | ||||
| * | Drawing all images onto a white background, thus removing transparency | nickago | 2015-08-04 | 1 | -0/+8 |
| | | |||||
| * | 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 | ||||
 |
server / chat | |
| chat | spline |
| summaryrefslogtreecommitdiffstats |