Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of https://github.com/mattermost/platform | Asaad Mahmood | 2015-08-05 | 12 | -295/+359 |
|\ | |||||
| * | Merge pull request #326 from nickago/MM-1754 | Christopher Speller | 2015-08-04 | 6 | -6/+6 |
| |\ | |||||
| | * | Added closing on ESC key press | nickago | 2015-08-04 | 6 | -6/+6 |
| * | | Merge pull request #321 from rgarmsen2295/mm-1611 | Christopher Speller | 2015-08-04 | 1 | -84/+96 |
| |\ \ | |||||
| | * | | Cosmetic changes to better follow style guide | Reed Garmsen | 2015-08-03 | 1 | -75/+95 |
| | * | | Removes ability for the mention list to cycle from top to bottom and vice-versa | Reed Garmsen | 2015-08-03 | 1 | -13/+5 |
| * | | | Merge pull request #310 from nickago/MM-1671 | Christopher Speller | 2015-08-04 | 1 | -62/+70 |
| |\ \ \ | |||||
| | * | | | Cosmetic Refactoring | nickago | 2015-08-04 | 1 | -59/+67 |
| | * | | | Changed 'Close' to 'Cancel' | nickago | 2015-08-04 | 1 | -2/+2 |
| | * | | | Placed button inside of form to allow for submission on strike of enter key | nickago | 2015-08-04 | 1 | -8/+8 |
| | | |/ | | |/| | |||||
| * | | | Merge pull request #325 from rgarmsen2295/mm-1618 | Christopher Speller | 2015-08-04 | 3 | -19/+37 |
| |\ \ \ | |||||
| | * | | | Fixed help text rendering on mobile | Reed Garmsen | 2015-08-04 | 2 | -9/+10 |
| | * | | | Added help text informing the user that the team invite link has been copied ... | Reed Garmsen | 2015-08-03 | 3 | -18/+35 |
| | | |/ | | |/| | |||||
| * | | | Merge pull request #323 from rgarmsen2295/mm-1554 | Christopher Speller | 2015-08-04 | 1 | -119/+151 |
| |\ \ \ | |||||
| | * | | | Cosmetic refactoring to better fit style guide | Reed Garmsen | 2015-08-04 | 1 | -121/+151 |
| | * | | | The first field of the 'Invite New Member' field can no longer be cleared or ... | Reed Garmsen | 2015-08-03 | 1 | -0/+2 |
| | |/ / | |||||
* | | | | Updating channel header tooltip placement | Asaad Mahmood | 2015-08-04 | 1 | -1/+1 |
* | | | | Merge branch 'master' of https://github.com/mattermost/platform | Asaad Mahmood | 2015-08-04 | 2 | -190/+223 |
|\| | | | |||||
| * | | | Merge pull request #318 from rgarmsen2295/mm-1592 | Christopher Speller | 2015-08-04 | 1 | -81/+99 |
| |\ \ \ | |||||
| | * | | | Cosmetic refactoring to be inline with the style guide | Reed Garmsen | 2015-08-02 | 1 | -84/+95 |
| | * | | | Searching for recent mentions no longer includes all or channel if those opti... | Reed Garmsen | 2015-08-02 | 1 | -1/+8 |
| * | | | | Merge pull request #322 from nickago/MM-1679 | Christopher Speller | 2015-08-04 | 1 | -109/+124 |
| |\ \ \ \ | | |_|_|/ | |/| | | | |||||
| | * | | | Fixed variable naming conflict with msg and added cosmetic refactors | nickago | 2015-08-03 | 1 | -6/+6 |
| | * | | | Changed private channel list to use username and did semi-cosmetic refactoring | nickago | 2015-08-03 | 1 | -108/+123 |
| | | |/ | | |/| | |||||
* | | | | Fixing scrolling of mention box in RHS | Asaad Mahmood | 2015-08-04 | 1 | -1/+3 |
* | | | | Adding bootstrap tooltip for channel members | Asaad Mahmood | 2015-08-04 | 1 | -1/+1 |
* | | | | UI Improvements | Asaad Mahmood | 2015-08-04 | 12 | -41/+99 |
|/ / / | |||||
* | | | Merge pull request #309 from nickago/MM-1691 | Christopher Speller | 2015-08-04 | 2 | -4/+14 |
|\ \ \ | |/ / |/| | | |||||
| * | | User Settings modal resets to General tab with nothing open on close | nickago | 2015-07-31 | 2 | -4/+14 |
* | | | fixing docker file | =Corey Hulen | 2015-08-02 | 1 | -1/+1 |
| |/ |/| | |||||
* | | incrementing to rc2 | =Corey Hulen | 2015-08-02 | 1 | -1/+1 |
* | | Merge pull request #311 from mattermost/mm-1619 | Corey Hulen | 2015-08-02 | 14 | -8/+462 |
|\ \ | |||||
| * \ | Merge branch 'master' into mm-1619 | =Corey Hulen | 2015-08-02 | 210 | -24938/+8377 |
| |\ \ | |/ / |/| | | |||||
* | | | Fixing upgrade | =Corey Hulen | 2015-08-02 | 1 | -1/+1 |
* | | | Merge pull request #278 from mattermost/mm-1702 | Corey Hulen | 2015-08-02 | 7 | -28/+185 |
|\ \ \ | |||||
| * | | | Moving the handing of extra_info etag before the extra info is retrieved from... | Christopher Speller | 2015-07-30 | 1 | -10/+14 |
| * | | | Adding etag to channel extra_info api call. | Christopher Speller | 2015-07-29 | 7 | -23/+176 |
* | | | | Merge pull request #273 from mattermost/mm-1355 | Corey Hulen | 2015-08-02 | 142 | -24159/+7277 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'master' into mm-1355 | =Corey Hulen | 2015-07-30 | 41 | -365/+1110 |
| |\ \ \ \ | |||||
| * | | | | | Fixing code review feedback | =Corey Hulen | 2015-07-30 | 3 | -3/+8 |
| * | | | | | Merge branch 'master' into mm-1355 | =Corey Hulen | 2015-07-29 | 40 | -118/+290 |
| |\ \ \ \ \ | |||||
| * | | | | | | Fixes mm-1355 adds rate limiting apis | =Corey Hulen | 2015-07-29 | 142 | -24158/+7271 |
* | | | | | | | Merge pull request #312 from mattermost/mm-1784 | Corey Hulen | 2015-08-02 | 1 | -1/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | switching to a new PM channel now works in the more modal | JoramWilander | 2015-07-31 | 1 | -1/+2 |
* | | | | | | | | Merge pull request #305 from nickago/MM-1681 | Corey Hulen | 2015-08-02 | 14 | -46/+47 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Changed all templates to use site url instead of team url for finding the 'st... | nickago | 2015-07-31 | 14 | -46/+47 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #302 from hmhealey/mm1788 | Corey Hulen | 2015-08-02 | 6 | -125/+5 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Removed ^replying in preparation for 0.6.0 | hmhealey | 2015-07-30 | 6 | -125/+5 |
* | | | | | | | | | Merge pull request #301 from lfbrock/patch-1 | Corey Hulen | 2015-08-02 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | MM-1841 Corrected help text | lfbrock | 2015-07-30 | 1 | -1/+1 |
| |/ / / / / / / / |