Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #435 from mattermost/it33-patch-2 | Christopher Speller | 2015-08-21 | 1 | -2/+2 |
|\ | |||||
| * | Fixing typo "Summery" -> "Summary" | it33 | 2015-08-20 | 1 | -2/+2 |
* | | Merge pull request #434 from mattermost/it33-patch-1 | Christopher Speller | 2015-08-21 | 1 | -1/+1 |
|\ \ | |||||
| * | | Fixing typo "SelectFile" -> "Select File" | it33 | 2015-08-20 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #425 from rgarmsen2295/mm-1901 | Joram Wilander | 2015-08-21 | 2 | -35/+91 |
|\ \ | |/ |/| | |||||
| * | Fixed issue with channel name in url and added loading icon to replace 'Join'... | Reed Garmsen | 2015-08-20 | 2 | -13/+35 |
| * | Cosmetic reformatting of more_channels.jsx | Reed Garmsen | 2015-08-20 | 1 | -29/+62 |
| * | Users are now placed in the channel after joining it from the 'More...' chann... | Reed Garmsen | 2015-08-20 | 1 | -1/+2 |
* | | Merge pull request #433 from nickago/MM-1840 | Corey Hulen | 2015-08-20 | 1 | -1/+1 |
|\ \ | |||||
| * | | changed title of edit_channel modal | nickago | 2015-08-20 | 1 | -1/+1 |
* | | | Merge pull request #423 from nickago/MM-1888 | Corey Hulen | 2015-08-20 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Added blank href to make tab recognize and jump to it | nickago | 2015-08-20 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge pull request #410 from rgarmsen2295/mm-1821b | Corey Hulen | 2015-08-20 | 2 | -202/+506 |
|\ \ \ | |||||
| * | | | Reformats the user_settings_notifications.jsx file | Reed Garmsen | 2015-08-20 | 1 | -98/+308 |
| * | | | Cosmetic reformatting of the channel_notifications.jsx file | Reed Garmsen | 2015-08-20 | 1 | -104/+198 |
| | |/ | |/| | |||||
* | | | Merge pull request #424 from mattermost/mm-1987 | Joram Wilander | 2015-08-20 | 1 | -2/+2 |
|\ \ \ | |||||
| * | | | Fixing posts not being able to upload | Christopher Speller | 2015-08-20 | 1 | -2/+2 |
* | | | | Merge pull request #422 from mattermost/ampm-fix | Joram Wilander | 2015-08-20 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Fixing AM-PM issue | Christopher Speller | 2015-08-20 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | Merge pull request #418 from mattermost/mm-1811 | Corey Hulen | 2015-08-20 | 1 | -29/+87 |
|\ \ \ | |||||
| * | | | Skipping invite members step when email is disabled. Cosmetic refactoring inc... | Christopher Speller | 2015-08-20 | 1 | -29/+87 |
* | | | | Merge pull request #421 from nickago/hotfix | Corey Hulen | 2015-08-20 | 1 | -1/+1 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Fixed this/self typo | nickago | 2015-08-20 | 1 | -1/+1 |
* | | | | Merge pull request #404 from nickago/MM-1886 | Joram Wilander | 2015-08-20 | 1 | -78/+100 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Made state getter member function and fixed scu edge case | nickago | 2015-08-20 | 1 | -39/+35 |
| * | | | Re-added state update on show | nickago | 2015-08-19 | 1 | -0/+1 |
| * | | | Cosmetic refactoring | nickago | 2015-08-19 | 1 | -56/+67 |
| * | | | Added loading screen to add more members modal | nickago | 2015-08-19 | 1 | -20/+34 |
* | | | | Revert "Multiple UI Improvements" | Joram Wilander | 2015-08-20 | 11 | -52/+21 |
* | | | | Merge pull request #416 from asaadmahmoodspin/ui-changes | Harrison Healey | 2015-08-20 | 11 | -21/+52 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Multiple UI Improvements | Asaad Mahmood | 2015-08-20 | 11 | -21/+52 |
| | |/ | |/| | |||||
* | | | Fixed mixed case typo | nickago | 2015-08-20 | 1 | -1/+1 |
* | | | Merge pull request #414 from mattermost/update-etag-version | Christopher Speller | 2015-08-20 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | |||||
| * | | Update etag version for the addition of CreatorId field to channels | JoramWilander | 2015-08-20 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #401 from rgarmsen2295/mm-1875 | Harrison Healey | 2015-08-20 | 1 | -14/+54 |
|\ \ | |||||
| * | | Additional cosmetic reformatting to meet new es6 requirements | Reed Garmsen | 2015-08-19 | 1 | -18/+52 |
| * | | Url parameters are now removed after logging in | Reed Garmsen | 2015-08-19 | 1 | -2/+8 |
* | | | Merge pull request #412 from mattermost/sidebar-patch | Joram Wilander | 2015-08-20 | 2 | -7/+7 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Fixing a few refactoring errors. | Christopher Speller | 2015-08-20 | 2 | -7/+7 |
* | | | Merge pull request #406 from mattermost/mm-1281 | Christopher Speller | 2015-08-19 | 1 | -5/+14 |
|\ \ \ | |||||
| * | | | Track channel creator in DB and show in channel intro message. | JoramWilander | 2015-08-19 | 1 | -5/+14 |
* | | | | Merge pull request #400 from nickago/MM-1829 | Christopher Speller | 2015-08-19 | 5 | -1187/+1245 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Further cosmetic refactoring | nickago | 2015-08-18 | 1 | -153/+176 |
| * | | | Cosmetic refactoring | nickago | 2015-08-18 | 1 | -5/+11 |
| * | | | Clear state info on section change | nickago | 2015-08-18 | 2 | -9/+13 |
| * | | | Split up user settings files | nickago | 2015-08-18 | 5 | -1182/+1207 |
* | | | | Merge pull request #394 from mattermost/mm-1410 | Joram Wilander | 2015-08-19 | 10 | -802/+1051 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Requiring team admin to import and fixing a few style issues | Christopher Speller | 2015-08-19 | 1 | -2/+1 |
| * | | | Cosmetic refactoring for ESLint | Christopher Speller | 2015-08-19 | 9 | -877/+952 |
| * | | | Implemention of slack import feature. | Christopher Speller | 2015-08-19 | 5 | -1/+176 |
| | |/ | |/| |