summaryrefslogtreecommitdiffstats
path: root/web/react/components
Commit message (Collapse)AuthorAgeFilesLines
...
| * Updating setting_uploadAsaad Mahmood2015-08-211-12/+0
| |
| * Merge branch 'master' of https://github.com/mattermost/platform into mm-1696Asaad Mahmood2015-08-215-42/+99
| |\ | | | | | | | | | | | | | | | Conflicts: web/react/components/setting_upload.jsx web/react/components/team_import_tab.jsx
| * | MM-1696 - Improvements for Slack ImportAsaad Mahmood2015-08-212-9/+27
| | |
* | | Merge pull request #420 from asaadmahmoodspin/ui-changesJoram Wilander2015-08-218-23/+52
|\ \ \ | |_|/ |/| | Multiple UI Improvements
| * | Solving conflicts and also fixing css for MM-1752Asaad Mahmood2015-08-211-1/+1
| | |
| * | Merge branch 'master' of https://github.com/mattermost/platform into ui-changesAsaad Mahmood2015-08-214-204/+508
| |\| | | | | | | | | | | | | Conflicts: web/react/components/channel_notifications.jsx
| * | Updating intro text for channelsAsaad Mahmood2015-08-211-2/+2
| | |
| * | Removing getDOMNode from view_imageAsaad Mahmood2015-08-211-2/+2
| | |
| * | Multiple UI ImprovementsAsaad Mahmood2015-08-218-23/+52
| | |
* | | Merge pull request #431 from nickago/MM-1797Christopher Speller2015-08-211-8/+2
|\ \ \ | | | | | | | | MM-1797 Removed state holding functionality when switching to access history or session view
| * | | Removed state holding functionality when switching to access history or ↵nickago2015-08-201-8/+2
| | | | | | | | | | | | | | | | session view
* | | | Merge pull request #432 from nickago/MM-1804Joram Wilander2015-08-211-0/+3
|\ \ \ \ | | | | | | | | | | MM-1804 Updated navbar to more accurately mirror desktop preformance
| * | | | Updated navbar to more accurately mirror desktop preformancenickago2015-08-201-0/+3
| |/ / /
* | | | Merge pull request #437 from mattermost/it33-patch-4Christopher Speller2015-08-211-2/+2
|\ \ \ \ | | | | | | | | | | Adjusting "Find Your Team" instructions
| * | | | Adjusting "Find Your Team" instructionsit332015-08-211-2/+2
| | |_|/ | |/| |
* | | | Merge pull request #435 from mattermost/it33-patch-2Christopher Speller2015-08-211-2/+2
|\ \ \ \ | | | | | | | | | | Fixing typo "Summery" -> "Summary"
| * | | | Fixing typo "Summery" -> "Summary"it332015-08-201-2/+2
| |/ / /
* | | | Merge pull request #434 from mattermost/it33-patch-1Christopher Speller2015-08-211-1/+1
|\ \ \ \ | | | | | | | | | | Fixing typo "SelectFile" -> "Select File"
| * | | | Fixing typo "SelectFile" -> "Select File"it332015-08-201-1/+1
| |/ / /
* | | | Merge pull request #425 from rgarmsen2295/mm-1901Joram Wilander2015-08-211-32/+80
|\ \ \ \ | |/ / / |/| | | MM-1901 When a user joins a channel that channel is now automatically opened for them
| * | | Fixed issue with channel name in url and added loading icon to replace ↵Reed Garmsen2015-08-201-10/+24
| | | | | | | | | | | | | | | | 'Join' button for slow connections
| * | | Cosmetic reformatting of more_channels.jsxReed Garmsen2015-08-201-29/+62
| | | |
| * | | Users are now placed in the channel after joining it from the 'More...' ↵Reed Garmsen2015-08-201-1/+2
| | | | | | | | | | | | | | | | channel menu
* | | | Merge pull request #433 from nickago/MM-1840Corey Hulen2015-08-201-1/+1
|\ \ \ \ | | | | | | | | | | MM-1840 Changed title of the edit channel modal
| * | | | changed title of edit_channel modalnickago2015-08-201-1/+1
| | |/ / | |/| |
* | | | Merge pull request #423 from nickago/MM-1888Corey Hulen2015-08-201-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 itnickago2015-08-201-1/+1
| |/ / /
* | | | Merge pull request #410 from rgarmsen2295/mm-1821bCorey Hulen2015-08-202-202/+506
|\ \ \ \ | |_|_|/ |/| | | MM-1821 Replaces the on/off buttons with simple radio buttons
| * | | Reformats the user_settings_notifications.jsx fileReed Garmsen2015-08-201-98/+308
| | | |
| * | | Cosmetic reformatting of the channel_notifications.jsx fileReed Garmsen2015-08-201-104/+198
| | |/ | |/|
* | | Fixing posts not being able to uploadChristopher Speller2015-08-201-2/+2
| | |
* | | Merge pull request #418 from mattermost/mm-1811Corey Hulen2015-08-201-29/+87
|\ \ \ | | | | | | | | MM-1811 Skipping invite members step when email is disabled.
| * | | Skipping invite members step when email is disabled. Cosmetic refactoring ↵Christopher Speller2015-08-201-29/+87
| | | | | | | | | | | | | | | | included.
* | | | Merge pull request #421 from nickago/hotfixCorey Hulen2015-08-201-1/+1
|\ \ \ \ | |_|_|/ |/| | | HOTFIX: Fixed this/self typo
| * | | Fixed this/self typonickago2015-08-201-1/+1
| | | |
* | | | Merge pull request #404 from nickago/MM-1886Joram Wilander2015-08-201-78/+100
|\ \ \ \ | |_|_|/ |/| | | Mm 1886 Add loading screen to channel invite modal
| * | | Made state getter member function and fixed scu edge casenickago2015-08-201-39/+35
| | | |
| * | | Re-added state update on shownickago2015-08-191-0/+1
| | | |
| * | | Cosmetic refactoringnickago2015-08-191-56/+67
| | | |
| * | | Added loading screen to add more members modalnickago2015-08-191-20/+34
| | | |
* | | | Revert "Multiple UI Improvements"Joram Wilander2015-08-208-31/+14
| | | |
* | | | Merge pull request #416 from asaadmahmoodspin/ui-changesHarrison Healey2015-08-208-14/+31
|\ \ \ \ | |_|/ / |/| | | Multiple UI Improvements
| * | | Multiple UI ImprovementsAsaad Mahmood2015-08-208-14/+31
| | |/ | |/|
* / | Fixed mixed case typonickago2015-08-201-1/+1
|/ /
* | Merge pull request #401 from rgarmsen2295/mm-1875Harrison Healey2015-08-201-14/+54
|\ \ | | | | | | MM-1875 Url parameters are now removed after logging in
| * | Additional cosmetic reformatting to meet new es6 requirementsReed Garmsen2015-08-191-18/+52
| | |
| * | Url parameters are now removed after logging inReed Garmsen2015-08-191-2/+8
| | |
* | | Merge pull request #412 from mattermost/sidebar-patchJoram Wilander2015-08-201-4/+4
|\ \ \ | |_|/ |/| | Fixing a few refactoring errors.
| * | Fixing a few refactoring errors.Christopher Speller2015-08-201-4/+4
| | |
* | | Merge pull request #406 from mattermost/mm-1281Christopher Speller2015-08-191-5/+14
|\ \ \ | | | | | | | | MM-1281 Track channel creator in DB and show in channel intro message