Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Added ShowTermsDuringSignup config option on the client which toggles the ↵ | hmhealey | 2015-08-05 | 2 | -1/+9 |
| | | | | Terms of Service disclaimer on signup | ||||
* | Reformat signup_user_complete to match style guide | hmhealey | 2015-08-05 | 1 | -76/+121 |
| | |||||
* | Merge pull request #342 from mattermost/release-0.6.0 | Christopher Speller | 2015-08-05 | 8 | -58/+109 |
|\ | | | | | Release 0.6.0 | ||||
| * | Merge pull request #331 from mattermost/060-readme-updates | Christopher Speller | 2015-08-05 | 1 | -48/+52 |
| |\ | | | | | | | Updates to the README for release. | ||||
| | * | Correcting minor typos, formatting, wording | it33 | 2015-08-04 | 1 | -31/+30 |
| | | | |||||
| | * | Fixing typeo | Christopher Speller | 2015-08-04 | 1 | -1/+1 |
| | | | |||||
| | * | Updates to the README for release. | it33 | 2015-08-04 | 1 | -23/+28 |
| | | | |||||
| * | | Merge pull request #328 from asaadmahmoodspin/mm-1874 | Christopher Speller | 2015-08-05 | 3 | -4/+31 |
| |\ \ | | | | | | | | | mm-1874 - Improving team url screen and fixing file attachments in IE 10 | ||||
| | * | | Updating css for url input add-on and removing display flex | Asaad Mahmood | 2015-08-05 | 2 | -3/+6 |
| | | | | |||||
| | * | | Fixing tooltip word-wrap | Asaad Mahmood | 2015-08-05 | 1 | -0/+3 |
| | | | | |||||
| | * | | mm-1874 - Improving team url screen and fixing file attachments in IE 10 | Asaad Mahmood | 2015-08-04 | 3 | -2/+23 |
| | |/ | |||||
| * | | Merge pull request #337 from mattermost/docker-config-updates | Christopher Speller | 2015-08-05 | 2 | -5/+13 |
| |\ \ | | | | | | | | | Updating docker configuration files for release | ||||
| | * | | Updating docker configuration files for release | Christopher Speller | 2015-08-05 | 2 | -5/+13 |
| |/ / | |||||
| * | | Merge pull request #320 from rgarmsen2295/mm-1873 | Christopher Speller | 2015-08-04 | 1 | -1/+1 |
| |\ \ | | | | | | | | | Fixed typo on landing page for sign-up | ||||
| | * | | Fixed typo on landing page for sign-up | Reed Garmsen | 2015-08-03 | 1 | -1/+1 |
| | |/ | |||||
| * | | Merge pull request #319 from mattermost/fix-dist | Christopher Speller | 2015-08-04 | 1 | -0/+12 |
| |\ \ | | |/ | |/| | Adding docs to build | ||||
| | * | Adding docs to build | =Corey Hulen | 2015-08-03 | 1 | -0/+12 |
| |/ | |||||
* | | Merge pull request #338 from nickago/MM-1671 | Christopher Speller | 2015-08-05 | 1 | -1/+1 |
|\ \ | | | | | | | MM-1671 Fixed typo causing new channels not to spawn | ||||
| * | | Fixed non-cosmetic refactoring typo | nickago | 2015-08-05 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #326 from nickago/MM-1754 | Christopher Speller | 2015-08-04 | 6 | -6/+6 |
|\ \ | | | | | | | MM-1754 Modals now close upon pressing ESC | ||||
| * | | 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 |
|\ \ \ | | | | | | | | | MM-1611 Removes ability to cycle through the mention list by jumping top to bottom or vice versa | ||||
| * | | | 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 |
|\ \ \ | | | | | | | | | MM-1671 Added support for enter key triggering submission and changed Close to Cancel | ||||
| * | | | 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 |
|\ \ \ | | | | | | | | | 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 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 |
| | |/ | |/| | | | | | | | when they press the 'Copy Link' button | ||||
* | | | Merge pull request #323 from rgarmsen2295/mm-1554 | Christopher Speller | 2015-08-04 | 1 | -119/+151 |
|\ \ \ | | | | | | | | | MM-1554 Removes the delete icon for the first entry in the 'Invite New Members' form | ||||
| * | | | 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 |
| |/ / | | | | | | | | | | deleted | ||||
* | | | Merge pull request #318 from rgarmsen2295/mm-1592 | Christopher Speller | 2015-08-04 | 1 | -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 guide | Reed Garmsen | 2015-08-02 | 1 | -84/+95 |
| | | | | |||||
| * | | | Searching for recent mentions no longer includes all or channel if those ↵ | Reed Garmsen | 2015-08-02 | 1 | -1/+8 |
| | | | | | | | | | | | | | | | | options were toggled in the users mention settings | ||||
* | | | | Merge pull request #322 from nickago/MM-1679 | Christopher Speller | 2015-08-04 | 1 | -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 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 |
| | |/ | |/| | |||||
* | | | Merge pull request #309 from nickago/MM-1691 | Christopher Speller | 2015-08-04 | 2 | -4/+14 |
|\ \ \ | |/ / |/| | | MM-1691/1692 Reset User settings tab on close | ||||
| * | | 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 |
|\ \ | | | | | | | MM-1619 Updating dockerfiles. | ||||
| * \ | 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 |
|\ \ \ | | | | | | | | | 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 | 7 | -23/+176 |
| | | | |