summaryrefslogtreecommitdiffstats
path: root/web
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Fixes mm-2021 removes hard coded port=Corey Hulen2015-08-241-1/+0
| | |
* | | Merge pull request #464 from rgarmsen2295/mm-1895Joram Wilander2015-08-254-5/+28
|\ \ \ | | | | | | | | MM-1895 Adds email help text
| * | | Added email help text and added licensing infoReed Garmsen2015-08-244-5/+28
| | | |
* | | | Merge pull request #445 from rgarmsen2295/mm-1995Joram Wilander2015-08-257-134/+236
|\ \ \ \ | | | | | | | | | | MM-1995 Moved the ability to rename a team into the team settings modal and fixed valet regression
| * | | | Moved the ability to rename a team into the team settings modal; fixed ↵Reed Garmsen2015-08-247-134/+236
| | | | | | | | | | | | | | | | | | | | issues with valet settings
* | | | | Merge pull request #460 from nickago/MM-1996Joram Wilander2015-08-251-9/+8
|\ \ \ \ \ | | | | | | | | | | | | MM-1996 exapnded form tag to include submission button
| * | | | | exapnded form tag to include submission buttonnickago2015-08-241-9/+8
| |/ / / /
* | | | | Merge pull request #458 from rgarmsen2295/mm-1983Christopher Speller2015-08-251-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | MM-1983 Fixed issue with timestamp incorrectly displaying single digit minutes
| * | | | Fixed issue with timestamp incorrectly displaying single digit minutesReed Garmsen2015-08-241-1/+1
| | | | |
* | | | | Merge pull request #463 from mattermost/mm-1991Corey Hulen2015-08-241-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fixes mm-1991 Allow ability to white label
| * | | | | Fixes mm-1991 Allow ability to white label=Corey Hulen2015-08-241-1/+1
| | |_|/ / | |/| | |
* | | | | Merge pull request #459 from nickago/MM-1966Corey Hulen2015-08-241-0/+17
|\ \ \ \ \ | |_|_|_|/ |/| | | | MM-1966 Re-enabled enter key submission for send invites page
| * | | | Re-enabled enter key submission for send invites pagenickago2015-08-241-0/+17
| | |_|/ | |/| |
* | | | Merge pull request #465 from rgarmsen2295/prof-img-fixCorey Hulen2015-08-241-1/+6
|\ \ \ \ | | | | | | | | | | Fixes issue with site trying to load profile pictures without having profile information
| * | | | Fixed issue with site tryinng to load profile pictures without having ↵Reed Garmsen2015-08-241-1/+6
| | |/ / | |/| | | | | | | | | | profile information
* | | | Merge pull request #441 from nickago/MM-1893Joram Wilander2015-08-243-5/+7
|\ \ \ \ | | | | | | | | | | MM-1893 Upon exiting edit post modal, focus is placed on the respective text input field
| * | | | Upon exiting edit post modal, foucs is placed on the respective text input fieldnickago2015-08-213-5/+7
| | | | |
* | | | | Merge pull request #446 from rgarmsen2295/mm-1999Joram Wilander2015-08-241-1/+6
|\ \ \ \ \ | |_|/ / / |/| | | | MM-1999 Removes 'for' from the edit channel description title when the channel has no title
| * | | | Removes 'for' from the edit channel description modal title when editing the ↵Reed Garmsen2015-08-241-1/+6
| | |_|/ | |/| | | | | | | | | | description of a private message channel
* | | | Merge pull request #449 from rgarmsen2295/mm-1933Corey Hulen2015-08-242-7/+12
|\ \ \ \ | | | | | | | | | | Multiple fixes for IE10 & Edge browsers primarily due to aggressive ajax call caching on the browser
| * | | | Fixes issue with profile pictures not updating w/o refresh and prevents more ↵Reed Garmsen2015-08-222-1/+6
| | | | | | | | | | | | | | | | | | | | ie10 ajax caching issues
| * | | | Fixed issue with logout in active sessions not working in ie10Reed Garmsen2015-08-221-0/+2
| | | | |
| * | | | Added cache: false to ajax calls that caused problems with ie10Reed Garmsen2015-08-221-6/+4
| | | | |
* | | | | Merge pull request #457 from rgarmsen2295/mm-1833Corey Hulen2015-08-241-2/+2
|\ \ \ \ \ | | | | | | | | | | | | MM-1833 Changes the max number of characters for a channel title/handle to 22
| * | | | | Changes the max number of characters for a channel title/handle to 22Reed Garmsen2015-08-241-2/+2
| | |_|_|/ | |/| | |
* | | | | Merge pull request #455 from nickago/MM-1604Corey Hulen2015-08-241-6/+7
|\ \ \ \ \ | |_|_|/ / |/| | | | MM-1604 Changed 1 hour expire time to 30 days
| * | | | Changed 1 hour expire time to 30 daysnickago2015-08-241-6/+7
| |/ / /
* / / / 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