Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Updating setting_upload | Asaad Mahmood | 2015-08-21 | 1 | -12/+0 |
* | Merge branch 'mm-1696' of https://github.com/asaadmahmoodspin/platform into m... | Asaad Mahmood | 2015-08-21 | 0 | -0/+0 |
|\ | |||||
| * | MM-1696 - Improvements for Slack Import | Asaad Mahmood | 2015-08-21 | 3 | -9/+37 |
* | | Merge branch 'master' of https://github.com/mattermost/platform into mm-1696 | Asaad Mahmood | 2015-08-21 | 7 | -45/+122 |
|\ \ | |||||
| * \ | Merge pull request #431 from nickago/MM-1797 | Christopher Speller | 2015-08-21 | 1 | -8/+2 |
| |\ \ | |||||
| | * | | Removed state holding functionality when switching to access history or sessi... | nickago | 2015-08-20 | 1 | -8/+2 |
| * | | | Merge pull request #432 from nickago/MM-1804 | Joram Wilander | 2015-08-21 | 1 | -0/+3 |
| |\ \ \ | |||||
| | * | | | Updated navbar to more accurately mirror desktop preformance | nickago | 2015-08-20 | 1 | -0/+3 |
| | |/ / | |||||
| * | | | Merge pull request #437 from mattermost/it33-patch-4 | Christopher Speller | 2015-08-21 | 1 | -2/+2 |
| |\ \ \ | |||||
| | * | | | Adjusting "Find Your Team" instructions | it33 | 2015-08-21 | 1 | -2/+2 |
| * | | | | 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 #429 from nickago/MM-1859 | Joram Wilander | 2015-08-21 | 1 | -0/+12 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| | * | | | | Added updating of username based mentions on username change | nickago | 2015-08-20 | 1 | -0/+12 |
| | | |/ / | | |/| | | |||||
* | / | | | MM-1696 - Improvements for Slack Import | Asaad Mahmood | 2015-08-21 | 3 | -9/+37 |
|/ / / / | |||||
* | | | | 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 #413 from mattermost/mm-1940 | Corey Hulen | 2015-08-20 | 1 | -7/+44 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Adding updates section to README | Christopher Speller | 2015-08-20 | 1 | -7/+44 |
* | | | | 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 |
* | | | | | Merge pull request #419 from mattermost/revert-416-ui-changes | Joram Wilander | 2015-08-20 | 11 | -52/+21 |
|\ \ \ \ \ | |||||
| * | | | | | 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 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #417 from nickago/hotfix | Harrison Healey | 2015-08-20 | 1 | -1/+1 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | 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 | 2 | -2/+2 |
|\ \ \ \ | |/ / / |/| | | |