| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Solving conflicts and also fixing css for MM-1752 | Asaad Mahmood | 2015-08-21 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'master' of https://github.com/mattermost/platform into ui-changes | Asaad Mahmood | 2015-08-21 | 4 | -204/+508 |
| |\ | | | | | | | | | Conflicts: web/react/components/channel_notifications.jsx | ||||
| | * | Merge pull request #433 from nickago/MM-1840 | Corey Hulen | 2015-08-20 | 1 | -1/+1 |
| | |\ | | | | | | | MM-1840 Changed title of the edit channel modal | ||||
| | | * | 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 |
| | |\ \ | | | | | | | | | MM-1888 Added blank href to make tab recognize and jump to it | ||||
| | | * | | 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 |
| | |\ \ | | | | | | | | | MM-1821 Replaces the on/off buttons with simple radio buttons | ||||
| | | * | | 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 |
| | | | | | |||||
| * | | | | Updating intro text for channels | Asaad Mahmood | 2015-08-21 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Removing getDOMNode from view_image | Asaad Mahmood | 2015-08-21 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Multiple UI Improvements | Asaad Mahmood | 2015-08-21 | 8 | -23/+52 |
| |/ / / | |||||
| * | | | Fixing posts not being able to upload | Christopher Speller | 2015-08-20 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge pull request #418 from mattermost/mm-1811 | Corey Hulen | 2015-08-20 | 1 | -29/+87 |
| |\ \ \ | | | | | | | | | MM-1811 Skipping invite members step when email is disabled. | ||||
| | * | | | Skipping invite members step when email is disabled. Cosmetic refactoring ↵ | Christopher Speller | 2015-08-20 | 1 | -29/+87 |
| | | | | | | | | | | | | | | | | | included. | ||||
| * | | | | Merge pull request #421 from nickago/hotfix | Corey Hulen | 2015-08-20 | 1 | -1/+1 |
| |\ \ \ \ | |_|_|/ |/| | | | HOTFIX: Fixed this/self typo | ||||
| | * | | | 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 |
| |\ \ \ \ | |_|_|/ |/| | | | Mm 1886 Add loading screen to channel invite modal | ||||
| | * | | | 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 | 8 | -31/+14 |
| | | | | | |||||
| * | | | | Merge pull request #416 from asaadmahmoodspin/ui-changes | Harrison Healey | 2015-08-20 | 8 | -14/+31 |
| |\ \ \ \ | |_|/ / |/| | | | Multiple UI Improvements | ||||
| | * | | | Multiple UI Improvements | Asaad Mahmood | 2015-08-20 | 8 | -14/+31 |
| | | |/ | |/| | |||||
| * / | | Fixed mixed case typo | nickago | 2015-08-20 | 1 | -1/+1 |
| |/ / | |||||
| * | | Merge pull request #401 from rgarmsen2295/mm-1875 | Harrison Healey | 2015-08-20 | 1 | -14/+54 |
| |\ \ | | | | | | | MM-1875 Url parameters are now removed after logging in | ||||
| | * | | 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 | 1 | -4/+4 |
| |\ \ \ | |_|/ |/| | | Fixing a few refactoring errors. | ||||
| | * | | Fixing a few refactoring errors. | Christopher Speller | 2015-08-20 | 1 | -4/+4 |
| | | | | |||||
| * | | | Merge pull request #406 from mattermost/mm-1281 | Christopher Speller | 2015-08-19 | 1 | -5/+14 |
| |\ \ \ | | | | | | | | | MM-1281 Track channel creator in DB and show in channel intro message | ||||
| | * | | | 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 |
| |\ \ \ \ | |_|/ / |/| | | | Mm 1829 Fixed edge case of stale data not being cleared from user settings display | ||||
| | * | | | 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 | 7 | -163/+360 |
| |\ \ \ \ | |_|_|/ |/| | | | MM-1410 Initial implementaiton of import from Slack | ||||
| | * | | | Cosmetic refactoring for ESLint | Christopher Speller | 2015-08-19 | 6 | -231/+278 |
| | | | | | |||||
| | * | | | Implemention of slack import feature. | Christopher Speller | 2015-08-19 | 3 | -1/+151 |
| | | |/ | |/| | |||||
| * | | | Merge pull request #398 from mattermost/mm-1593 | Joram Wilander | 2015-08-19 | 2 | -14/+33 |
| |\ \ \ | | | | | | | | | MM-1593 Added a message deleted indicator | ||||
| | * | | | Added a message deleted indicator when a post is deleted to let the user ↵ | JoramWilander | 2015-08-19 | 2 | -14/+33 |
| | | | | | | | | | | | | | | | | | know what's happening. | ||||
| * | | | | Merge pull request #397 from mattermost/mm-1962 | Harrison Healey | 2015-08-19 | 1 | -1/+1 |
| |\ \ \ \ | | | | | | | | | | | Fixes mm-1962 verify email redirect now works correctly | ||||
| | * | | | | Fixes mm-1962 verify email redirect now works correctly | =Corey Hulen | 2015-08-18 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Merge pull request #407 from mattermost/mm-1976 | Christopher Speller | 2015-08-19 | 1 | -1/+1 |
| |\ \ \ \ \ | |_|/ / / |/| | | | | MM-1976 Fixes new message indicator not appearing | ||||
| | * | | | | Fixes new message indicator not appearing. | JoramWilander | 2015-08-19 | 1 | -1/+1 |
| | | |/ / | |/| | | |||||
| * | | | | Merge pull request #399 from mattermost/update-dependencies | Joram Wilander | 2015-08-19 | 2 | -41/+129 |
| |\ \ \ \ | |/ / / |/| | | | MM-1908 Update dependencies and switch to Babelify | ||||
| | * | | | Refacting post_info.jsx to be an example for ES6 class syntax | Christopher Speller | 2015-08-18 | 2 | -41/+129 |
| | | | | | |||||
| * | | | | Merge pull request #387 from rgarmsen2295/mm-1733 | Corey Hulen | 2015-08-18 | 9 | -723/+811 |
| |\ \ \ \ | | | | | | | | | | | MM-1733 Team URLs no longer accept a number as the first character | ||||
 |
server / chat | |
| chat | spline |
| summaryrefslogtreecommitdiffstats |