summaryrefslogtreecommitdiffstats
path: root/web/react
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Removed extraneous post control from within new message separatorReed Garmsen2015-06-181-3/+1
| | |
| * | Merge pull request #9 from rgarmsen2295/masterReed Garmsen2015-06-185-7/+21
| |\ \ | | | | | | | | to me
| * | | Removed extraneous codeReed Garmsen2015-06-181-1/+1
| | | |
| * | | Changed the new messages separator location in the markup to be at the same ↵Reed Garmsen2015-06-182-8/+6
| | | | | | | | | | | | | | | | level as the date seperator
* | | | Merge pull request #34 from rgarmsen2295/mm-1288Corey Hulen2015-06-251-5/+5
|\ \ \ \ | | | | | | | | | | MM-1288
| * | | | Removed extraneous conditionalReed Garmsen2015-06-181-2/+0
| | | | |
| * | | | Fixed ability to be able to delete a specific invite field within the invite ↵Reed Garmsen2015-06-181-1/+1
| | | | | | | | | | | | | | | | | | | | new member form instead of just removing the bottom one every time
| * | | | Merge pull request #13 from rgarmsen2295/masterReed Garmsen2015-06-184-11/+23
| |\ \ \ \ | | | |_|/ | | |/| | Remerge
| * | | | Added ability to remove the first entry of a Invite New Members list (or ↵Reed Garmsen2015-06-171-3/+5
| | |_|/ | |/| | | | | | | | | | clear it if there's only one entry
* | | | Merge pull request #32 from rgarmsen2295/mm-1282Corey Hulen2015-06-253-1/+40
|\ \ \ \ | | | | | | | | | | MM-1282
| * | | | Added a util function that checks that local/session storage is enabled. ↵Reed Garmsen2015-06-183-1/+40
| | |/ / | |/| | | | | | | | | | Also added tests using this function to report an error to the user if it is not enabled
| * | | Merge pull request #30 from mattermost/dockerhostJoram Wilander2015-06-182-2/+12
| |\ \ \ | | | | | | | | | | fix for dockerhost HELIUM
| | * | | fix for dockerhost HELIUM=Corey Hulen2015-06-182-2/+12
| | | | |
| * | | | fixes mm-1297 can now scroll through more than 5 imagesJoramWilander2015-06-181-7/+9
| |/ / /
| * | | Changed "Theme Color Option" to "Theme Color"it332015-06-181-2/+2
| | | |
| * | | Update "Theme" to "Theme Color Options" it332015-06-181-2/+2
| |/ / | | | | | | Needed to make marketing screen look nice.
* | | Merge pull request #28 from rgarmsen2295/mm-1290Corey Hulen2015-06-252-4/+7
|\ \ \ | | | | | | | | MM-1290
| * | | Added logic to clear error messages that are not relevant to the current ↵Reed Garmsen2015-06-182-4/+7
| |/ / | | | | | | | | | error (or to remove error messagesthat no longer apply) for user creation
* | | Merge pull request #27 from mattermost/mm-1240Corey Hulen2015-06-2512-17/+416
|\ \ \ | | | | | | | | fixes mm-1240 adds ability to turn valet feature on
| * | | fix command comparator and team storeJoramWilander2015-06-182-26/+22
| | | |
| * | | added team store, team settings menu, and the ability to turn on valet ↵JoramWilander2015-06-1812-17/+420
| | | | | | | | | | | | | | | | feature from client
* | | | Merge pull request #26 from rgarmsen2295/mm-454Corey Hulen2015-06-252-2/+2
|\ \ \ \ | | | | | | | | | | MM-454
| * | | | Changed Invite Members to Add Members in channel options for mobile and browserReed Garmsen2015-06-172-2/+2
| | |/ / | |/| |
| * | | Merge pull request #6 from rgarmsen2295/masterReed Garmsen2015-06-171-1/+1
| |\ \ \ | | | | | | | | | | Remerging
| | * | | fix an auto-complete bug for mentionsJoramWilander2015-06-171-1/+1
| | |/ /
| * | | Simplified code changesReed Garmsen2015-06-171-2/+2
| | | |
| * | | Added in basic changes necessary to fix some typos. Needs further tests and ↵Reed Garmsen2015-06-171-3/+3
| |/ / | | | | | | | | | changes to other config files
* | | Merge pull request #19 from mattermost/mm-1235Corey Hulen2015-06-251-1/+1
|\ \ \ | | | | | | | | fixes mm-1235 clicking on mentions now works properly
| * | | fixes mm-1235 clicking on mentions now works properlyJoramWilander2015-06-171-1/+1
| |/ /
* | | Merge pull request #18 from mattermost/mm-1269Corey Hulen2015-06-251-0/+2
|\ \ \ | | | | | | | | fixes mm-1269 don't show blue bar for internet connection issue
| * | | fixes mm-1269 don't show blue bar for internet connection issueJoramWilander2015-06-171-0/+2
| |/ /
| * | Fixing linkChristopher Speller2015-06-161-2/+2
| | |
| * | Switching from config file to parsing homelink from urlChristopher Speller2015-06-162-2/+14
| | |
| * | Merge pull request #12 from mattermost/mm-1285Corey Hulen2015-06-162-1/+3
| |\ \ | | | | | | | | fixes mm-1218 adds sentence describing username to sign up pages
| | * | fixes mm-1218 adds sentence describing username to sign up pagesJoramWilander2015-06-162-1/+3
| | |/
| * / fixes mm-1251 updates sign up now linkJoramWilander2015-06-161-1/+1
| |/
* | Merge pull request #13 from rgarmsen2295/mm-1215Corey Hulen2015-06-251-1/+1
|\ \ | | | | | | MM-1215
| * | Changed text when previewing an image from Downloading to PreviewingReed Garmsen2015-06-161-1/+1
| |/
* | Merge pull request #9 from mattermost/mm-1263Corey Hulen2015-06-251-2/+2
|\ \ | | | | | | fixes mm-1263 mentions are highlighted properly now
| * | fixes mm-1263 mentions are highlighted properly nowJoramWilander2015-06-161-2/+2
| | |
* | | Merge pull request #8 from rgarmsen2295/mm-1097Corey Hulen2015-06-251-2/+3
|\ \ \ | | | | | | | | MM-1097
| * | | Simplified hour conversion logicReed Garmsen2015-06-151-2/+1
| | | |
| * | | Changed format of the time in the security tab to a 12hr clock from a 24hr clockReed Garmsen2015-06-151-2/+4
| | |/ | |/|
| * | Merge pull request #7 from rgarmsen2295/mm-1004Corey Hulen2015-06-152-3/+6
| |\ \ | | | | | | | | MM-1004
| | * | Error messages revolving around comment creation appear clientside unless we ↵Reed Garmsen2015-06-151-0/+6
| | | | | | | | | | | | | | | | have a better solution in place
| | * | Invalid RootId parameter error message no longer displays on the client. ↵Reed Garmsen2015-06-152-4/+1
| | |/ | | | | | | | | | Changed acceptance of error from Agree to Okay.
| * | Merge pull request #6 from rgarmsen2295/mm-1066Corey Hulen2015-06-151-1/+1
| |\ \ | | | | | | | | MM-1066
| | * | Changed text describing the find more teams function for clarityReed Garmsen2015-06-151-1/+1
| | |/
| * | Merge pull request #4 from mattermost/mm-1245Corey Hulen2015-06-151-1/+1
| |\ \ | | | | | | | | fixes mm-1245 filenames are now url escaped
| | * | fixes mm-1245 filenames are now url escapedJoramWilander2015-06-151-1/+1
| | |/