summaryrefslogtreecommitdiffstats
path: root/web/react/components
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #510 from rgarmsen2295/remove-rename-mobileJoram Wilander2015-08-281-7/+0
|\ | | | | Removes old rename team option from mobile sidebar
| * Removes rename team option from mobile sidebarReed Garmsen2015-08-271-7/+0
| |
* | MM-1032 auto-login after tream creation=Corey Hulen2015-08-271-17/+21
|/
* Merge pull request #498 from mattermost/it33-patch-1Christopher Speller2015-08-271-6/+4
|\ | | | | Updating help text for Slack Import screen
| * Updating help text for Slack Import screenit332015-08-271-6/+4
| |
* | Merge pull request #491 from mattermost/mm-1998Joram Wilander2015-08-271-1/+2
|\ \ | |/ |/| MM-1998 Temporary PM channels now use username instead of display name
| * Temporary PM channels now use username instead of display nameChristopher Speller2015-08-271-1/+2
| |
* | Merge pull request #484 from mattermost/mm-1994Corey Hulen2015-08-272-17/+17
|\ \ | | | | | | MM-1994 Improvements to import UI
| * | Improvements to import UIChristopher Speller2015-08-262-17/+17
| | |
* | | Merge pull request #469 from mattermost/mm-1699Christopher Speller2015-08-2713-839/+1174
|\ \ \ | |_|/ |/| | MM-1699 Refactored post handling/updating on both the client and server
| * | Refactored post handling/updating on both the client and server.JoramWilander2015-08-2713-839/+1174
| | |
* | | Merge pull request #472 from rgarmsen2295/mm-1853Christopher Speller2015-08-274-8/+19
|\ \ \ | |/ / |/| | MM-1853 Prevents users from typing more than 4000 characters into any any post/comment
| * | Moved duplicate code into functions and added better handling of large paste ↵Reed Garmsen2015-08-263-31/+10
| | | | | | | | | | | | text dumps
| * | Fixed issue with carriage returns being counted improperly in non-ie ↵Reed Garmsen2015-08-253-8/+15
| | | | | | | | | | | | browsers and updated error messages to be appropriate to what is being typed (message vs. post vs. edit)
| * | Prevents users from typing more than 4000 characters into any 'textbox' ↵Reed Garmsen2015-08-254-6/+31
| | | | | | | | | | | | (posts, comments, and post/comment edits). Also adds new error message for when users hit exactly 4000 characters so they know the limit.
* | | Merge pull request #471 from nickago/MM-1803Christopher Speller2015-08-271-0/+7
|\ \ \ | |_|/ |/| | MM-1803 Added clearing of search bar on close of comment section of RHS
| * | Added clearing of search bar on close of comment section of RHSnickago2015-08-251-0/+7
| |/
* | Clears the 'new channel' dialogue box of errors and previous input on exitReed Garmsen2015-08-251-0/+11
| |
* | Added white background to non-image files (was previously transparentReed Garmsen2015-08-251-0/+1
| |
* | Merge pull request #466 from mattermost/mm-1912Corey Hulen2015-08-252-11/+21
|\ \ | |/ |/| Fixes mm-1912 move get file info into its own web service call
| * Fixes mm-1912 move get file info into its own web service call=Corey Hulen2015-08-242-11/+21
| |
* | 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-256-127/+235
|\ \ \ | | | | | | | | 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-246-127/+235
| | | | | | | | | | | | | | | | 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 #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-241-1/+1
|\ \ \ \ | | | | | | | | | | 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-221-1/+1
| | | | | | | | | | | | | | | | | | | | ie10 ajax caching issues
* | | | | 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
| | |_|/ | |/| |
* / | | 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-241-0/+4
|\ \ \ | | | | | | | | MM-1822 Added help text to profile picture screen
| * | | Added help text to profile picture screennickago2015-08-211-0/+4
| | |/ | |/|
* | | 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)
* / | Renaming "Feature Settings"->"Advanced Features"it332015-08-211-2/+2
|/ /
* | Merge pull request #427 from asaadmahmoodspin/mm-1696Harrison Healey2015-08-212-9/+27
|\ \ | |/ |/| 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-215-42/+99
| |\ | | | | | | | | | | | | | | | Conflicts: web/react/components/setting_upload.jsx web/react/components/team_import_tab.jsx