summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | Removed checking for first and last name in invite member form, should not ↵Reed Garmsen2015-06-191-19/+2
| |/ / / / | | | | | | | | | | | | | | | be required even if they are allowed
| * | | | Merge pull request #14 from mattermost/masterReed Garmsen2015-06-196-51/+146
| |\ \ \ \ | | | | | | | | | | | | to me
* | \ \ \ \ Merge pull request #41 from asaadmahmoodspin/masterCorey Hulen2015-06-252-44/+54
|\ \ \ \ \ \ | | | | | | | | | | | | | | MM-1253 - Fixing new message and date separator corner case
| * | | | | | MM-1253 - Fixing new message and date separator corner caseAsaad Mahmood2015-06-282-38/+52
| | | | | | |
| * | | | | | Merge pull request #1 from rgarmsen2295/mm-1253asaadmahmoodspin2015-06-1918-62/+489
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | MM-1253
| | * | | | | | Removed extraneous post control from within new message separatorReed Garmsen2015-06-181-3/+1
| | | | | | | |
| | * | | | | | Merge pull request #9 from rgarmsen2295/masterReed Garmsen2015-06-1816-35/+469
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | 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-1810-19/+49
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | | Remerge
| | * | | | | | | | Merge pull request #12 from mattermost/masterReed Garmsen2015-06-182-4/+10
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | to me
| * | | | | | | | | | 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 #11 from mattermost/masterReed Garmsen2015-06-186-11/+28
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | to me
| * \ \ \ \ \ \ \ \ \ \ Merge pull request #10 from mattermost/masterReed Garmsen2015-06-181-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | to me
* | | | | | | | | | | | 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 #8 from mattermost/masterReed Garmsen2015-06-181-2/+9
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | | to me
* | | | | | | | | | | | Merge pull request #27 from mattermost/mm-1240Corey Hulen2015-06-2525-36/+664
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | fixes mm-1240 adds ability to turn valet feature on
| * | | | | | | | | | | | revert debug config changesJoramWilander2015-06-181-2/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | fix command comparator and team storeJoramWilander2015-06-183-31/+28
| | | | | | | | | | | | |
| * | | | | | | | | | | | added unit tests for new team API servicesJoramWilander2015-06-182-0/+121
| | | | | | | | | | | | |
| * | | | | | | | | | | | added team store, team settings menu, and the ability to turn on valet ↵JoramWilander2015-06-1816-20/+445
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature from client
| * | | | | | | | | | | | add API service to turn on valet featureJoramWilander2015-06-181-0/+51
| | | | | | | | | | | | |
| * | | | | | | | | | | | move valet feature switch to DB from configJoramWilander2015-06-179-17/+51
| | | | | | | | | | | | |
* | | | | | | | | | | | | 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 #7 from mattermost/masterReed Garmsen2015-06-172-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | to me
* | \ \ \ \ \ \ \ \ \ \ \ \ 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
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | updating ding=Corey Hulen2015-06-231-0/+0
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/mattermost/platform=Corey Hulen2015-06-230-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Correcting capitalization typo, f -> Fit332015-06-231-1/+1
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge pull request #54 from asaadmahmoodspin/masterCorey Hulen2015-06-234-4/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MM-1339 - Updating Ui for sign up page
| | * | | | | | | | | | | | | | | Updating spellingAsaad Mahmood2015-06-231-1/+1
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | MM-1339 - Updating Ui for sign up pageAsaad Mahmood2015-06-234-4/+9
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Listing golang-lruit332015-06-231-0/+8
| |/ / / / / / / / / / / / / / /