summaryrefslogtreecommitdiffstats
path: root/web
Commit message (Collapse)AuthorAgeFilesLines
* Fixed issue with timestamp incorrectly displaying single digit minutesReed Garmsen2015-08-241-1/+1
|
* MM-1831 - Fixing channel name and having channel name in bold for edit ↵Asaad Mahmood2015-08-242-2/+2
| | | | channel modal
* Merge pull request #439 from nickago/MM-1822Joram Wilander2015-08-243-0/+8
|\ | | | | MM-1822 Added help text to profile picture screen
| * Added help text to profile picture screennickago2015-08-213-0/+8
| |
* | Merge pull request #440 from nickago/MM-1803Corey Hulen2015-08-232-0/+14
|\ \ | | | | | | MM-1803 Remove search term after the RHS is closed
| * | remove search term after the RHS is closednickago2015-08-212-0/+14
| |/
* | Merge pull request #448 from mattermost/it33-patch-4Corey Hulen2015-08-231-1/+1
|\ \ | | | | | | Changing "Features"->"Advanced" in Team Settings
| * | Changing "Features"->"Advanced" in Team Settingsit332015-08-211-1/+1
| | | | | | | | | Also changing order of menu items, so Advanced (least used) is at the bottom)
* | | Merge pull request #447 from mattermost/it33-patch-2Corey Hulen2015-08-231-2/+2
|\ \ \ | | | | | | | | Renaming "Feature Settings"->"Advanced Features"
| * | | Renaming "Feature Settings"->"Advanced Features"it332015-08-211-2/+2
| |/ /
* | | Merge pull request #444 from nickago/MM-1795Corey Hulen2015-08-231-1/+2
|\ \ \ | | | | | | | | MM-1795 Added fullscreen capability to youtube embed
| * | | Added fullscreen capability to youtube embednickago2015-08-211-1/+2
| | |/ | |/|
* | | MM-1989 - Hiding Cancel text in LHS that messes up the RHSAsaad Mahmood2015-08-211-0/+3
| |/ |/|
* | Merge pull request #427 from asaadmahmoodspin/mm-1696Harrison Healey2015-08-213-9/+37
|\ \ | |/ |/| MM-1696 - Improvements for Slack Import
| * Updating setting_uploadAsaad Mahmood2015-08-211-12/+0
| |
| * Merge branch 'master' of https://github.com/mattermost/platform into mm-1696Asaad Mahmood2015-08-216-45/+110
| |\ | | | | | | | | | | | | | | | Conflicts: web/react/components/setting_upload.jsx web/react/components/team_import_tab.jsx
| * | MM-1696 - Improvements for Slack ImportAsaad Mahmood2015-08-213-9/+37
| | |
* | | Merge pull request #420 from asaadmahmoodspin/ui-changesJoram Wilander2015-08-2112-30/+76
|\ \ \ | |_|/ |/| | Multiple UI Improvements
| * | Solving conflicts and also fixing css for MM-1752Asaad Mahmood2015-08-213-2/+5
| | |
| * | 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-2111-30/+73
| | |
* | | 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-212-35/+91
|\ \ \ \ | |/ / / |/| | | 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-202-13/+35
| | | | | | | | | | | | | | | | '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
| | |/ | |/|
* | | Merge pull request #424 from mattermost/mm-1987Joram Wilander2015-08-201-2/+2
|\ \ \ | | | | | | | | MM-1987 Fixing posts not being able to upload
| * | | Fixing posts not being able to uploadChristopher Speller2015-08-201-2/+2
| | | |
* | | | Merge pull request #422 from mattermost/ampm-fixJoram Wilander2015-08-201-1/+1
|\ \ \ \ | |/ / / |/| | | Fixing AM-PM issue
| * | | Fixing AM-PM issueChristopher Speller2015-08-201-1/+1
| | |/ | |/|
* | | 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.