summaryrefslogtreecommitdiffstats
path: root/web/react
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #284 from nickago/MM-1768Joram Wilander2015-07-301-15/+15
|\ | | | | MM-1768 Updated Upload to Select in profile uploader and did cosmetic refactoring
| * Changed Update to Select, removed illegal spaces, and changed double quotes ↵nickago2015-07-291-15/+15
| | | | | | | | to single
* | Merge pull request #282 from nickago/MM-1642Christopher Speller2015-07-301-7/+12
|\ \ | | | | | | MM-1642 Updated the password error message to not contain extraneous information
| * | Stripped obfuscating information from password change error and synchronized ↵nickago2015-07-291-7/+12
| |/ | | | | | | error slots so that only one will show at once.
* | Merge pull request #281 from nickago/MM-1600Christopher Speller2015-07-301-1/+5
|\ \ | | | | | | MM-1600 Improve quality of error returned upon a duplicate username request
| * | Added error safety and a unique message for duplicate emailsnickago2015-07-291-1/+5
| | |
| * | Added a unique error message for bad username and simplified error outputed ↵nickago2015-07-291-1/+1
| |/ | | | | | | to user
* | Merge pull request #289 from mattermost/it33-patch-4Corey Hulen2015-07-301-1/+1
|\ \ | | | | | | MM-1816 Make Off-Topic description more clear
| * | MM-1816 Make Off-Topic description more clearit332015-07-291-1/+1
| | |
* | | Merge pull request #288 from mattermost/it33-patch-3Corey Hulen2015-07-301-1/+1
|\ \ \ | | | | | | | | Corrected "lower case" to "lowercase"
| * | | Corrected "lower case" to "lowercase"it332015-07-291-1/+1
| |/ /
* | | Merge pull request #287 from mattermost/it33-patch-2Corey Hulen2015-07-301-1/+1
|\ \ \ | | | | | | | | Correcting proper use of "set up" vs. "setup"
| * | | Correcting proper use of "set up" vs. "setup"it332015-07-291-1/+1
| |/ /
* | | Merge pull request #280 from mattermost/mm-1746Corey Hulen2015-07-301-1/+1
|\ \ \ | |/ / |/| | MM-1746 channel handle now populates properly on opening of channel rename modal
| * | channel handle now populates properly on opening of channel rename modalJoramWilander2015-07-291-1/+1
| | |
* | | Merge pull request #269 from rgarmsen2295/mm-1686Christopher Speller2015-07-293-7/+30
|\ \ \ | | | | | | | | MM-1686 Access History and Active Sessions now load upon opening instead of at start
| * | | Access History and Active Sessions are now lazy-loaded upon opening instead ↵Reed Garmsen2015-07-293-7/+30
| | | | | | | | | | | | | | | | of loaded at start; added loading screens to Access History and Active Sessions
* | | | Merge pull request #259 from nickago/MM-1683Christopher Speller2015-07-291-19/+17
|\ \ \ \ | |_|/ / |/| | | MM-1683 Removed a vestigial wait condition from the signup process.
| * | | Added IE friendly window origin function in place of unwrapped callnickago2015-07-291-1/+1
| | | |
| * | | Removed timeout originally set on team creationnickago2015-07-291-19/+17
| | |/ | |/|
* | | Merge pull request #256 from nickago/MM-1183Joram Wilander2015-07-292-6/+11
|\ \ \ | | | | | | | | MM-1183 Allow channel descriptions on 1-1 channels
| * | | Added a 'set description' link for private channelsnickago2015-07-281-1/+4
| | | |
| * | | Removed popover on channel name and added ability to set channel ↵nickago2015-07-271-5/+7
| | | | | | | | | | | | | | | | descritption for 1-1 channels
* | | | Removing unused id on LHS dropdownAsaad Mahmood2015-07-291-3/+1
| | | |
* | | | Fixing error markup in signup flowAsaad Mahmood2015-07-291-2/+2
| | | |
* | | | mm-1762 - Search improvements with some other minor Ui changesAsaad Mahmood2015-07-292-5/+16
| |/ / |/| |
* | | Merge pull request #268 from mattermost/mm-1358Joram Wilander2015-07-292-1/+142
|\ \ \ | | | | | | | | MM-1358, MM-1203 Adding preview of style guide and ESLint Javascript + JSX static analyzer
| * | | Adding check target to makefile to run eslint. Adding eslint to package.jsonChristopher Speller2015-07-281-1/+3
| | | |
| * | | Configuration for eslintrcChristopher Speller2015-07-281-0/+139
| | | |
* | | | Merge pull request #252 from rgarmsen2295/ie10-image-regression-fixChristopher Speller2015-07-298-15/+28
|\ \ \ \ | | | | | | | | | | Fixes issue with images not displaying in IE10 due to window.location.origin not being defined in IE10
| * | | | Removed usage of window.location.origin throughout the codebaseReed Garmsen2015-07-274-8/+15
| | | | |
| * | | | Fixes issue with images not displaying due to window.origin not being ↵Reed Garmsen2015-07-275-10/+16
| | |/ / | |/| | | | | | | | | | defined in IE10
* | | | Merge pull request #267 from nickago/MM-1652Christopher Speller2015-07-291-1/+1
|\ \ \ \ | | | | | | | | | | MM-1652 Fixed typo in delete post modal
| * | | | Fixed typo in delete_post_modalnickago2015-07-281-1/+1
| | | | |
* | | | | added use of strings.Team to replace hardcoded mentions of 'team'JoramWilander2015-07-291-3/+3
| | | | |
* | | | | updated changing email in sign up flow to work properlyJoramWilander2015-07-281-4/+8
| | | | |
* | | | | updated user sign up page and login page with new UI detailsJoramWilander2015-07-283-5/+4
| | | | |
* | | | | updates to sign-up flow, remove company name and marketing checkboxJoramWilander2015-07-284-32/+15
| | | | |
* | | | | Signup Ui changesAsaad Mahmood2015-07-284-74/+104
| |_|_|/ |/| | |
* | | | Display thumbnails for files without file extensionshmhealey2015-07-282-4/+7
|/ / /
* | | Merge pull request #260 from rgarmsen2295/mm-1724Joram Wilander2015-07-282-2/+3
|\ \ \ | |_|/ |/| | MM-1724 Changed title of Active Devices to Active Sessions and added help text explaining Active Sessions
| * | Changed title of Active Devices to Active Sessions; added help text ↵Reed Garmsen2015-07-272-2/+3
| | | | | | | | | | | | explaining Active Sessions
* | | Merge pull request #239 from nickago/MM-1295Christopher Speller2015-07-283-0/+84
|\ \ \ | |/ / |/| | MM-1295 Removal from a channel occurs in real time
| * | Changed from Jquery style modal modification to using browserStorenickago2015-07-272-9/+26
| | |
| * | Added precautions to avoid incorrect data display to the user by clearing ↵nickago2015-07-271-2/+5
| | | | | | | | | | | | modal after every close
| * | When user is removed, a modal appears, which on closing redirects thenickago2015-07-273-2/+58
| | | | | | | | | | | | user to town square.
| * | When removed from a channel, user is sent back to town square and thatnickago2015-07-271-0/+8
| |/ | | | | | | channel is removed from their sidebar
* | Merge pull request #254 from hmhealey/mm1674Joram Wilander2015-07-271-1/+1
|\ \ | | | | | | MM-1674 Replaced call to String.prototype.startsWith which only works in browsers that support ES6
| * | Replaced instance of String.prototype.startsWith which only works in ↵hmhealey2015-07-271-1/+1
| |/ | | | | | | browsers that support ES6
* | Merge pull request #246 from rgarmsen2295/mm-1657Joram Wilander2015-07-271-32/+5
|\ \ | | | | | | MM-1657 Removes tag highlighting for mentions