Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #79 from asaadmahmoodspin/master | Joram Wilander | 2015-06-29 | 3 | -19/+43 |
|\ | | | | | Improving image preview modal and channel info modal | ||||
| * | Removing relative from span | Asaad Mahmood | 2015-06-27 | 1 | -2/+1 |
| | | |||||
| * | mm-1256 - Improving view modal and close modal button | Asaad Mahmood | 2015-06-26 | 3 | -12/+37 |
| | | |||||
| * | MM-1184 - Updating image preview | Asaad Mahmood | 2015-06-26 | 2 | -7/+7 |
| | | |||||
* | | Merge pull request #83 from ralder/fix-broken-mailto-user-popover | Corey Hulen | 2015-06-27 | 1 | -6/+4 |
|\ \ | | | | | | | gui: Fix broken mailto link in user-popover | ||||
| * | | gui: fix broken mailto link in user-popover | ralder | 2015-06-26 | 1 | -6/+4 |
| |/ | |||||
* / | gui: fix mentions dropdown | test | 2015-06-26 | 2 | -13/+16 |
|/ | |||||
* | Merge pull request #46 from mattermost/mm-1318 | Joram Wilander | 2015-06-25 | 4 | -32/+49 |
|\ | | | | | fixes mm-1318 only allow 5 files to be uploaded at a time | ||||
| * | fixes mm-1318 only allow 5 files to be uploaded at a time | JoramWilander | 2015-06-22 | 4 | -32/+49 |
| | | |||||
* | | Merge pull request #45 from rgarmsen2295/mm-1309 | Corey Hulen | 2015-06-25 | 1 | -2/+7 |
|\ \ | | | | | | | MM-1309 | ||||
| * | | Made it so the team creator can no longer use the same email used at signup ↵ | Reed Garmsen | 2015-06-19 | 1 | -2/+7 |
| |/ | | | | | | | to send an invitation to | ||||
| * | fixes mm-1315 adds confirmation dialog when closing invite dialog with typed ↵ | JoramWilander | 2015-06-19 | 2 | -38/+113 |
| | | | | | | | | in emails | ||||
* | | Merge pull request #43 from rgarmsen2295/mm-1202 | Corey Hulen | 2015-06-25 | 2 | -2/+3 |
|\ \ | | | | | | | MM-1202 | ||||
| * | | Readded error checking for for first and last names but made the requirement ↵ | Reed Garmsen | 2015-06-19 | 2 | -2/+20 |
| | | | | | | | | | | | | a config toggle instead of always required | ||||
| * | | Removed checking for first and last name in invite member form, should not ↵ | Reed Garmsen | 2015-06-19 | 1 | -19/+2 |
| |/ | | | | | | | be required even if they are allowed | ||||
| * | fixes br tags causing new lines | JoramWilander | 2015-06-18 | 2 | -7/+2 |
| | | |||||
* | | Merge pull request #41 from asaadmahmoodspin/master | Corey Hulen | 2015-06-25 | 2 | -44/+54 |
|\ \ | | | | | | | MM-1253 - Fixing new message and date separator corner case | ||||
| * | | MM-1253 - Fixing new message and date separator corner case | Asaad Mahmood | 2015-06-28 | 2 | -38/+52 |
| | | | |||||
| * | | Removed extraneous post control from within new message separator | Reed Garmsen | 2015-06-18 | 1 | -3/+1 |
| | | | |||||
| * | | Merge pull request #9 from rgarmsen2295/master | Reed Garmsen | 2015-06-18 | 6 | -9/+23 |
| |\ \ | | | | | | | | | to me | ||||
| * | | | Removed extraneous code | Reed Garmsen | 2015-06-18 | 1 | -1/+1 |
| | | | | |||||
| * | | | Changed the new messages separator location in the markup to be at the same ↵ | Reed Garmsen | 2015-06-18 | 2 | -8/+6 |
| | | | | | | | | | | | | | | | | level as the date seperator | ||||
* | | | | Merge pull request #34 from rgarmsen2295/mm-1288 | Corey Hulen | 2015-06-25 | 1 | -5/+5 |
|\ \ \ \ | | | | | | | | | | | MM-1288 | ||||
| * | | | | Removed extraneous conditional | Reed Garmsen | 2015-06-18 | 1 | -2/+0 |
| | | | | | |||||
| * | | | | Fixed ability to be able to delete a specific invite field within the invite ↵ | Reed Garmsen | 2015-06-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | new member form instead of just removing the bottom one every time | ||||
| * | | | | Merge pull request #13 from rgarmsen2295/master | Reed Garmsen | 2015-06-18 | 4 | -11/+23 |
| |\ \ \ \ | | | |_|/ | | |/| | | Remerge | ||||
| * | | | | Added ability to remove the first entry of a Invite New Members list (or ↵ | Reed Garmsen | 2015-06-17 | 1 | -3/+5 |
| | |_|/ | |/| | | | | | | | | | | clear it if there's only one entry | ||||
* | | | | Merge pull request #32 from rgarmsen2295/mm-1282 | Corey Hulen | 2015-06-25 | 3 | -1/+40 |
|\ \ \ \ | | | | | | | | | | | MM-1282 | ||||
| * | | | | Added a util function that checks that local/session storage is enabled. ↵ | Reed Garmsen | 2015-06-18 | 3 | -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/dockerhost | Joram Wilander | 2015-06-18 | 2 | -2/+12 |
| |\ \ \ | | | | | | | | | | | fix for dockerhost HELIUM | ||||
| | * | | | fix for dockerhost HELIUM | =Corey Hulen | 2015-06-18 | 2 | -2/+12 |
| | | | | | |||||
| * | | | | fixes mm-1297 can now scroll through more than 5 images | JoramWilander | 2015-06-18 | 1 | -7/+9 |
| |/ / / | |||||
| * | | | Changed "Theme Color Option" to "Theme Color" | it33 | 2015-06-18 | 1 | -2/+2 |
| | | | | |||||
| * | | | Update "Theme" to "Theme Color Options" | it33 | 2015-06-18 | 1 | -2/+2 |
| |/ / | | | | | | | Needed to make marketing screen look nice. | ||||
* | | | Merge pull request #28 from rgarmsen2295/mm-1290 | Corey Hulen | 2015-06-25 | 2 | -4/+7 |
|\ \ \ | | | | | | | | | MM-1290 | ||||
| * | | | Added logic to clear error messages that are not relevant to the current ↵ | Reed Garmsen | 2015-06-18 | 2 | -4/+7 |
| |/ / | | | | | | | | | | error (or to remove error messagesthat no longer apply) for user creation | ||||
* | | | Merge pull request #27 from mattermost/mm-1240 | Corey Hulen | 2015-06-25 | 14 | -18/+419 |
|\ \ \ | | | | | | | | | fixes mm-1240 adds ability to turn valet feature on | ||||
| * | | | fix command comparator and team store | JoramWilander | 2015-06-18 | 2 | -26/+22 |
| | | | | |||||
| * | | | added team store, team settings menu, and the ability to turn on valet ↵ | JoramWilander | 2015-06-18 | 14 | -18/+423 |
| | | | | | | | | | | | | | | | | feature from client | ||||
* | | | | Merge pull request #26 from rgarmsen2295/mm-454 | Corey Hulen | 2015-06-25 | 2 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | MM-454 | ||||
| * | | | | Changed Invite Members to Add Members in channel options for mobile and browser | Reed Garmsen | 2015-06-17 | 2 | -2/+2 |
| | |/ / | |/| | | |||||
| * | | | Merge pull request #6 from rgarmsen2295/master | Reed Garmsen | 2015-06-17 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | Remerging | ||||
| | * | | | fix an auto-complete bug for mentions | JoramWilander | 2015-06-17 | 1 | -1/+1 |
| | |/ / | |||||
| * | | | Removed unnecessary comma | Reed Garmsen | 2015-06-17 | 1 | -1/+1 |
| | | | | |||||
| * | | | Simplified code changes | Reed Garmsen | 2015-06-17 | 2 | -4/+2 |
| | | | | |||||
| * | | | Added in basic changes necessary to fix some typos. Needs further tests and ↵ | Reed Garmsen | 2015-06-17 | 2 | -5/+7 |
| |/ / | | | | | | | | | | changes to other config files | ||||
* | | | Merge pull request #19 from mattermost/mm-1235 | Corey Hulen | 2015-06-25 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | fixes mm-1235 clicking on mentions now works properly | ||||
| * | | | fixes mm-1235 clicking on mentions now works properly | JoramWilander | 2015-06-17 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge pull request #18 from mattermost/mm-1269 | Corey Hulen | 2015-06-25 | 1 | -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 issue | JoramWilander | 2015-06-17 | 1 | -0/+2 |
| |/ / |