summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Adding tooltip to email in user popoverAsaad Mahmood2015-08-052-0/+7
* Fixing style guide stuff in post_listAsaad Mahmood2015-08-051-5/+3
* Removing console.logAsaad Mahmood2015-08-051-1/+0
* Fixing mentions scroll again due to merge conflictAsaad Mahmood2015-08-051-0/+7
* Merge branch 'master' of https://github.com/mattermost/platformAsaad Mahmood2015-08-0512-295/+359
|\
| * Merge pull request #326 from nickago/MM-1754Christopher Speller2015-08-046-6/+6
| |\
| | * Added closing on ESC key pressnickago2015-08-046-6/+6
| * | Merge pull request #321 from rgarmsen2295/mm-1611Christopher Speller2015-08-041-84/+96
| |\ \
| | * | 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
| |\ \ \
| | * | | 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
| |\ \ \
| | * | | 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
| | | |/ | | |/|
| * | | Merge pull request #323 from rgarmsen2295/mm-1554Christopher Speller2015-08-041-119/+151
| |\ \ \
| | * | | 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
| | |/ /
* | | | Updating channel header tooltip placementAsaad Mahmood2015-08-041-1/+1
* | | | Merge branch 'master' of https://github.com/mattermost/platformAsaad Mahmood2015-08-042-190/+223
|\| | |
| * | | Merge pull request #318 from rgarmsen2295/mm-1592Christopher Speller2015-08-041-81/+99
| |\ \ \
| | * | | 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 opti...Reed Garmsen2015-08-021-1/+8
| * | | | Merge pull request #322 from nickago/MM-1679Christopher Speller2015-08-041-109/+124
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | 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
| | | |/ | | |/|
* | | | Fixing scrolling of mention box in RHSAsaad Mahmood2015-08-041-1/+3
* | | | Adding bootstrap tooltip for channel membersAsaad Mahmood2015-08-041-1/+1
* | | | UI ImprovementsAsaad Mahmood2015-08-0412-41/+99
|/ / /
* | | Merge pull request #309 from nickago/MM-1691Christopher Speller2015-08-042-4/+14
|\ \ \ | |/ / |/| |
| * | 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
|\ \
| * \ 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
|\ \ \
| * | | Moving the handing of extra_info etag before the extra info is retrieved from...Christopher Speller2015-07-301-10/+14
| * | | 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
|\ \ \ \
| * \ \ \ 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
|\ \ \ \ \ \ \
| * | | | | | | 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
|\ \ \ \ \ \ \ \
| * | | | | | | | Changed all templates to use site url instead of team url for finding the 'st...nickago2015-07-3114-46/+47
| | |_|_|_|_|_|/ | |/| | | | | |