| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'ui-changes' of https://github.com/asaadmahmoodspin/platform ↵ | Asaad Mahmood | 2015-08-21 | 0 | -0/+0 |
| |\ | | | | | | | | | | | | | into ui-changes Conflicts: web/sass-files/sass/partials/_modal.scss | ||||
| | * | Updating intro text for channels | Asaad Mahmood | 2015-08-21 | 1 | -2/+2 |
| | | | |||||
| | * | Removing getDOMNode from view_image | Asaad Mahmood | 2015-08-20 | 1 | -2/+2 |
| | | | |||||
| | * | Merge branch 'master' of https://github.com/mattermost/platform into ui-changes | Asaad Mahmood | 2015-08-20 | 2 | -30/+88 |
| | |\ | |||||
| | * | | Multiple UI Improvements | Asaad Mahmood | 2015-08-20 | 11 | -30/+73 |
| | | | | |||||
| * | | | Solving conflicts and also fixing css for MM-1752 | Asaad Mahmood | 2015-08-21 | 3 | -2/+5 |
| | | | | |||||
| * | | | Merge branch 'master' of https://github.com/mattermost/platform into ui-changes | Asaad Mahmood | 2015-08-21 | 5 | -211/+552 |
| |\ \ \ | | | | | | | | | | | | | | | | | 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 |
| | | | | | | |||||
| | * | | | | Merge pull request #413 from mattermost/mm-1940 | Corey Hulen | 2015-08-20 | 1 | -7/+44 |
| | |\ \ \ \ | | | | | | | | | | | | | MM-1940 Adding updates section to README | ||||
| | | * | | | | Adding updates section to README | Christopher Speller | 2015-08-20 | 1 | -7/+44 |
| | | | | | | | |||||
| * | | | | | | 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 | 11 | -30/+73 |
| |/ / / / / | |||||
| * | | | | | Merge pull request #424 from mattermost/mm-1987 | Joram Wilander | 2015-08-20 | 1 | -2/+2 |
| |\ \ \ \ \ | | | | | | | | | | | | | MM-1987 Fixing posts not being able to upload | ||||
| | * | | | | | 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 | ||||
| | * | | | | 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 |
| |\ \ \ \ | | | | | | | | | | | 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 |
| | | | | | | |||||
| * | | | | | Merge pull request #419 from mattermost/revert-416-ui-changes | Joram Wilander | 2015-08-20 | 11 | -52/+21 |
| |\ \ \ \ \ | | | | | | | | | | | | | Revert "Multiple UI Improvements" | ||||
| | * | | | | | 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 | ||||
| | * | | | | | 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 |
| |\ \ \ \ \ | | |_|/ / | |/| | | | HOTFIX: Fixed mixed case typo | ||||
| | * | | | | 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 |
| |\ \ \ \ | |/ / / |/| | | | Update etag version for the addition of CreatorId field to channels | ||||
| | * | | | Update etag version for the addition of CreatorId field to channels | JoramWilander | 2015-08-20 | 2 | -2/+2 |
| | |/ / | |||||
| * | | | 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 | 2 | -7/+7 |
| |\ \ \ \ | |_|/ / |/| | | | Fixing a few refactoring errors. | ||||
| | * | | | 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 | 4 | -5/+23 |
| |\ \ \ | | | | | | | | | 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 | 4 | -5/+23 |
| | | | | | |||||
| * | | | | 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 |
| | | | | | |||||
 |
server / chat | |
| chat | spline |
| summaryrefslogtreecommitdiffstats |