summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Cosmetic changes to better follow style guideReed Garmsen2015-08-031-75/+95
| | | | |
| * | | | Removes ability for the mention list to cycle from top to bottom and vice-versaReed Garmsen2015-08-031-13/+5
| | |/ / | |/| |
* | | | Merge pull request #310 from nickago/MM-1671Christopher Speller2015-08-041-62/+70
|\ \ \ \ | | | | | | | | | | MM-1671 Added support for enter key triggering submission and changed Close to Cancel
| * | | | Cosmetic Refactoringnickago2015-08-041-59/+67
| | | | |
| * | | | Changed 'Close' to 'Cancel'nickago2015-08-041-2/+2
| | | | |
| * | | | Placed button inside of form to allow for submission on strike of enter keynickago2015-08-041-8/+8
| | |/ / | |/| |
* | | | Merge pull request #325 from rgarmsen2295/mm-1618Christopher Speller2015-08-043-19/+37
|\ \ \ \ | | | | | | | | | | MM-1618 Adds help text to the Get Link modal that informs user when link has been copied to clipboard
| * | | | Fixed help text rendering on mobileReed Garmsen2015-08-042-9/+10
| | | | |
| * | | | Added help text informing the user that the team invite link has been copied ↵Reed Garmsen2015-08-033-18/+35
| | |/ / | |/| | | | | | | | | | when they press the 'Copy Link' button
* | | | Merge pull request #323 from rgarmsen2295/mm-1554Christopher Speller2015-08-041-119/+151
|\ \ \ \ | |_|_|/ |/| | | MM-1554 Removes the delete icon for the first entry in the 'Invite New Members' form
| * | | Cosmetic refactoring to better fit style guideReed Garmsen2015-08-041-121/+151
| | | |
| * | | The first field of the 'Invite New Member' field can no longer be cleared or ↵Reed Garmsen2015-08-031-0/+2
| |/ / | | | | | | | | | deleted
* | | Merge pull request #318 from rgarmsen2295/mm-1592Christopher Speller2015-08-041-81/+99
|\ \ \ | | | | | | | | MM-1592 Searching for recent mentions no longer includes all or channel if the all/channel options were toggled on
| * | | Cosmetic refactoring to be inline with the style guideReed Garmsen2015-08-021-84/+95
| | | |
| * | | Searching for recent mentions no longer includes all or channel if those ↵Reed Garmsen2015-08-021-1/+8
| | | | | | | | | | | | | | | | options were toggled in the users mention settings
* | | | Merge pull request #322 from nickago/MM-1679Christopher Speller2015-08-041-109/+124
|\ \ \ \ | |_|_|/ |/| | | MM-1679 PM channels in sidebar now display username instead of nickname, plus semi-cosmetic refactoring
| * | | Fixed variable naming conflict with msg and added cosmetic refactorsnickago2015-08-031-6/+6
| | | |
| * | | Changed private channel list to use username and did semi-cosmetic refactoringnickago2015-08-031-108/+123
| | |/ | |/|
* | | Merge pull request #309 from nickago/MM-1691Christopher Speller2015-08-042-4/+14
|\ \ \ | |/ / |/| | MM-1691/1692 Reset User settings tab on close
| * | User Settings modal resets to General tab with nothing open on closenickago2015-07-312-4/+14
| | |
* | | fixing docker file=Corey Hulen2015-08-021-1/+1
| |/ |/|
* | incrementing to rc2=Corey Hulen2015-08-021-1/+1
| |
* | Merge pull request #311 from mattermost/mm-1619Corey Hulen2015-08-0214-8/+462
|\ \ | | | | | | MM-1619 Updating dockerfiles.
| * \ Merge branch 'master' into mm-1619=Corey Hulen2015-08-02210-24938/+8377
| |\ \ | |/ / |/| |
* | | Fixing upgrade=Corey Hulen2015-08-021-1/+1
| | |
* | | Merge pull request #278 from mattermost/mm-1702Corey Hulen2015-08-027-28/+185
|\ \ \ | | | | | | | | MM-1702 Adding etag to channel extra_info api call.
| * | | Moving the handing of extra_info etag before the extra info is retrieved ↵Christopher Speller2015-07-301-10/+14
| | | | | | | | | | | | | | | | from the database
| * | | Adding etag to channel extra_info api call.Christopher Speller2015-07-297-23/+176
| | | |
* | | | Merge pull request #273 from mattermost/mm-1355Corey Hulen2015-08-02142-24159/+7277
|\ \ \ \ | | | | | | | | | | Fixes mm-1355 adds rate limiting apis
| * \ \ \ Merge branch 'master' into mm-1355=Corey Hulen2015-07-3041-365/+1110
| |\ \ \ \
| * | | | | Fixing code review feedback=Corey Hulen2015-07-303-3/+8
| | | | | |
| * | | | | Merge branch 'master' into mm-1355=Corey Hulen2015-07-2940-118/+290
| |\ \ \ \ \
| * | | | | | Fixes mm-1355 adds rate limiting apis=Corey Hulen2015-07-29142-24158/+7271
| | | | | | |
* | | | | | | Merge pull request #312 from mattermost/mm-1784Corey Hulen2015-08-021-1/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | MM-1784 switching to a new PM channel now works in the more modal
| * | | | | | | switching to a new PM channel now works in the more modalJoramWilander2015-07-311-1/+2
| | | | | | | |
* | | | | | | | Merge pull request #305 from nickago/MM-1681Corey Hulen2015-08-0214-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 ↵nickago2015-07-3114-46/+47
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | 'static' directory
* | | | | | | | Merge pull request #302 from hmhealey/mm1788Corey Hulen2015-08-026-125/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | MM-1788 Removed ^replying in preparation for 0.6.0
| * | | | | | | | Removed ^replying in preparation for 0.6.0hmhealey2015-07-306-125/+5
| | | | | | | | |
* | | | | | | | | Merge pull request #301 from lfbrock/patch-1Corey Hulen2015-08-021-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | MM-1841 Corrected help text
| * | | | | | | | | MM-1841 Corrected help textlfbrock2015-07-301-1/+1
| |/ / / / / / / /
* | | | | | | | | Merge pull request #300 from hmhealey/ubuntudevCorey Hulen2015-08-021-33/+73
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Updated developer setup instructions for Ubuntu
| * | | | | | | | | Updated developer setup instructions to include Ubuntu setupHarrison Healey2015-07-311-33/+73
| | | | | | | | | |
* | | | | | | | | | Merge pull request #291 from mattermost/mm-1758Corey Hulen2015-08-022-1/+6
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | MM-1758 partially fixed postgres search so that multiple search terms work
| * | | | | | | | | | partially fixed postgres search so that multiple search terms workJoramWilander2015-07-302-1/+6
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #276 from mattermost/mm-1688Corey Hulen2015-08-024-5/+13
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | MM-1688 reset number of posts to fetch on channel switch and fresh page load
| * | | | | | | | | | | removed ternary operator to make if statement clearerJoramWilander2015-07-301-1/+4
| | | | | | | | | | | |
| * | | | | | | | | | | reset number of posts to fetch on channel switch and fresh page loadJoramWilander2015-07-294-5/+10
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #274 from mattermost/mm-1497Corey Hulen2015-08-026-8/+33
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | MM-1497 image thumbnails now scale appropriately so there is no whitespace
| * | | | | | | | | | | | center small thumbnails and top left larger thumbnailsJoramWilander2015-07-311-0/+11
| | | | | | | | | | | | |