summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merging release branch 'release-0.7.0'Christopher Speller2015-09-0120-20/+325
|\
| * Also updating the position of the bottom unread indicatorAsaad Mahmood2015-09-012-2/+1
| |
| * MM-2046 - Updating momentum scroll on IOSAsaad Mahmood2015-09-011-0/+1
| |
| * Merge pull request #534 from mattermost/it33-patch-7Christopher Speller2015-09-011-0/+19
| |\ | | | | | | Adding documentation on configuring GitLab SSO
| | * Adding documentation on configuring GitLab SSOit332015-09-011-0/+19
| | |
| * | Merge pull request #528 from mattermost/MM-2056Christopher Speller2015-09-0110-18/+12
| |\ \ | | | | | | | | HOTFIX MM-2056 fixes problem with creating team
| | * | MM-2056 fixes problem with creating team=Corey Hulen2015-08-3110-18/+12
| | |/
| * | Merge pull request #527 from mattermost/mm-2082Christopher Speller2015-09-011-1/+3
| |\ \ | | |/ | |/| HOTFIX for 0.7.0 MM-2082 Fix missing forgot password link.
| | * Fix missing forgot password link.JoramWilander2015-08-311-1/+3
| |/
| * Creating dockerfiles for release 0.7.0Christopher Speller2015-08-316-0/+290
| |
* | Merge pull request #520 from zackify/masterJoram Wilander2015-08-311-1/+1
|\ \ | | | | | | Fix TLS warning due to insecure content
| * | fixed ssl warning on signup pageZach Silveira2015-08-291-1/+1
| | |
* | | Merge pull request #526 from mattermost/style-modsChristopher Speller2015-08-311-2/+2
|\ \ \ | | | | | | | | Removing complexity rule. Removing check of camel case from property names
| * | | Removing complexity rule. Removing check of camel case from property namesChristopher Speller2015-08-311-2/+2
|/ / /
* | | Merge pull request #523 from mattermost/it33-patch-6-1Christopher Speller2015-08-311-1/+1
|\ \ \ | | | | | | | | Updating text on "Find Teams" email
| * | | Updating text on "Find Teams" emailit332015-08-301-1/+1
| |/ / | | | | | | Making it clear that user requested email.
* | | Merge pull request #522 from mattermost/it33-patch-1Christopher Speller2015-08-311-1/+1
|\ \ \ | | | | | | | | Updated marketing text on email sign-up
| * | | Updated marketing text on email sign-upit332015-08-301-1/+1
| |/ /
* | | Merge pull request #508 from rgarmsen2295/reformat_user_generalChristopher Speller2015-08-312-79/+175
|\ \ \ | | | | | | | | [Cosmetic Reformatting] UserSettingsGeneralTab (and a few minor changes to PostInfo)
| * | | Reformats the user_settings_general.jsx file; also adds missing keys to ↵Reed Garmsen2015-08-272-79/+175
| | | | | | | | | | | | | | | | children in an array
* | | | Merge pull request #497 from nickago/MM-1842Christopher Speller2015-08-311-0/+8
|\ \ \ \ | | | | | | | | | | MM-1842 Added invite link to off-topic channel
| * | | | Added invite link to off-topic channelnickago2015-08-271-0/+8
| | | | |
* | | | | Merge pull request #494 from rgarmsen2295/mm-1628Christopher Speller2015-08-311-1/+1
|\ \ \ \ \ | | | | | | | | | | | | MM-1628 The navbar is no longer completely obscured by the status bar in full screen safari on iOS
| * | | | | When viewing the site on iOS from the home screen, the top of the screen is ↵Reed Garmsen2015-08-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | no longer obscured by the phone's status bar
* | | | | | Merge pull request #493 from asaadmahmoodspin/masterChristopher Speller2015-08-312-6/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | MM-1899 - Updating UI for commands in input box
| * | | | | | Removing console.log from command_listAsaad Mahmood2015-08-271-2/+0
| | | | | | |
| * | | | | | Reverting AllowTesting in config.jsAsaad Mahmood2015-08-271-1/+1
| | | | | | |
| * | | | | | MM-1899 - Updating UI for commands in input boxAsaad Mahmood2015-08-273-7/+19
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #492 from nickago/MM-1796Christopher Speller2015-08-311-1/+32
|\ \ \ \ \ \ | | | | | | | | | | | | | | MM-1796 Added parsing of the 't=' parameter on youtube videos
| * | | | | | Added parsing of the 't=' parameter on youtube videosnickago2015-08-271-1/+32
| | | | | | |
* | | | | | | Merge pull request #485 from nickago/MM-1899Christopher Speller2015-08-314-1/+23
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | MM-1899 Enabled and added help text for settings items
| * | | | | | | Enabled and added help text for settings itemsAsaad Mahmood2015-08-274-1/+23
| | | | | | | |
* | | | | | | | Merge pull request #480 from nickago/MM-1704Christopher Speller2015-08-311-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | MM-1704 Open new teams in new tab
| * | | | | | | | Open new teams in new tabnickago2015-08-261-1/+1
| | | | | | | | |
* | | | | | | | | Merge pull request #477 from nickago/MM-1794Christopher Speller2015-08-311-2/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | MM-1794 Reformatted Youtube video display
| * | | | | | | | | Reformatted Youtube video displaynickago2015-08-251-2/+5
| | | | | | | | | |
* | | | | | | | | | Merge pull request #475 from nickago/MM-1773Christopher Speller2015-08-313-13/+36
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | MM-1773a Add wildcard searching for postgresql
| * | | | | | | | | | Added unit testsnickago2015-08-272-8/+10
| | | | | | | | | | |
| * | | | | | | | | | Added wildcard highlighting and removed redundant whitespace parsingnickago2015-08-272-9/+21
| | | | | | | | | | |
| * | | | | | | | | | Added server parsing of wildcardsnickago2015-08-271-3/+12
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #468 from nickago/MM-1848Christopher Speller2015-08-313-61/+90
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | Mm 1848 Add /echo command
| * | | | | | | | | Added unit testsnickago2015-08-261-1/+36
| | | | | | | | | |
| * | | | | | | | | Added semaphore for resource allocation to echo commandnickago2015-08-251-1/+20
| | | | | | | | | |
| * | | | | | | | | Created a /echo command that will post on the user's behalf afternickago2015-08-252-64/+39
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | a specified amount of time
* | | | | | | | | Merge pull request #524 from mattermost/revert-518-MM-2046Christopher Speller2015-08-311-1/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Revert "MM-2046 - Updating postHolder scroll"
| * | | | | | | | | Revert "MM-2046 - Updating postHolder scroll"Christopher Speller2015-08-311-1/+0
|/ / / / / / / / /
* | | | | | | | | Merge pull request #521 from rgarmsen2295/mm-2044Corey Hulen2015-08-301-1/+7
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | MM-2044 Removes ability to auto-scroll to new messages in ie10/11 to fix rendering issue
| * | | | | | | | | Removes ability to auto-scroll to new messages in ie10/11 to fix rendering issueReed Garmsen2015-08-301-1/+7
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge pull request #519 from rgarmsen2295/fix-slow-typeCorey Hulen2015-08-304-51/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | [Performance Fix] Removes warning message when at the max character limit
| * | | | | | | | | Removed warning message when at the max character limitReed Garmsen2015-08-284-51/+6
| |/ / / / / / / /