summaryrefslogtreecommitdiffstats
path: root/web
Commit message (Collapse)AuthorAgeFilesLines
* Merging release branch 'release-0.7.0'Christopher Speller2015-09-015-4/+7
|\
| * 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 #528 from mattermost/MM-2056Christopher Speller2015-09-011-1/+2
| |\ | | | | | | HOTFIX MM-2056 fixes problem with creating team
| | * MM-2056 fixes problem with creating team=Corey Hulen2015-08-311-1/+2
| | |
| * | Fix missing forgot password link.JoramWilander2015-08-311-1/+3
| |/
* | Removing complexity rule. Removing check of camel case from property namesChristopher Speller2015-08-311-2/+2
| |
* | 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
| | | | | |
| * | | | | MM-1899 - Updating UI for commands in input boxAsaad Mahmood2015-08-272-6/+18
| | |/ / / | |/| | |
* | | | | 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-311-3/+15
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | MM-1773a Add wildcard searching for postgresql
| * | | | | | | | Added wildcard highlighting and removed redundant whitespace parsingnickago2015-08-271-3/+15
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | 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
| |/ / / / / / / /
* | | | | | | | | Merge pull request #518 from asaadmahmoodspin/MM-2046Corey Hulen2015-08-301-0/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | MM-2046 - Updating postHolder scroll
| * | | | | | | | | MM-2046 - Updating postHolder scrollAsaad Mahmood2015-08-281-0/+1
| |/ / / / / / / /
* / / / / / / / / First post list on page load will show loading screen until latest posts are ↵JoramWilander2015-08-281-2/+24
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | grabbed from the server.
* | | | | | | | Merge pull request #514 from mattermost/mm-2039Corey Hulen2015-08-286-58/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | MM-2039 Remove Google as a SSO service.
| * | | | | | | | Remove Google as a SSO service.JoramWilander2015-08-286-58/+0
| | | | | | | | |
* | | | | | | | | Merge pull request #513 from mattermost/mm-1861Corey Hulen2015-08-282-5/+16
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | MM-1861 Fixes root images not loading when switching RHS threads.
| * | | | | | | | | Fixes root images not loading when switich RHS threads.JoramWilander2015-08-282-5/+16
| | | | | | | | | |
* | | | | | | | | | Merge pull request #512 from mattermost/mm-1870Corey Hulen2015-08-2852-1/+190472
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | MM-1870 Creating local version of fonts retrieved from Google with compatibility with all browsers.
| * | | | | | | | | Creating local version of fonts retrieved from Google with compatibilityChristopher Speller2015-08-2852-1/+190472
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | with all browsers.
* | | | | | | | | Merge pull request #496 from mattermost/mm-2015Christopher Speller2015-08-2816-253/+534
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | MM-2015 Added the ability to create a team with SSO services and added the ability to turn off email sign up.
| * | | | | | | | Added the ability to create a team with SSO services and added the ability ↵JoramWilander2015-08-2816-253/+534
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to turn off email sign up.
* | | | | | | | | Merge pull request #510 from rgarmsen2295/remove-rename-mobileJoram Wilander2015-08-281-7/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Removes old rename team option from mobile sidebar
| * | | | | | | | | Removes rename team option from mobile sidebarReed Garmsen2015-08-271-7/+0
| | | | | | | | | |
* | | | | | | | | | Revert "MM-1870 Creating local version of fonts retrieved from Google"Corey Hulen2015-08-2723-169/+1
| | | | | | | | | |
* | | | | | | | | | Merge pull request #504 from mattermost/MM-1032Corey Hulen2015-08-271-17/+21
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | MM-1032 auto-login after tream creation
| * | | | | | | | | MM-1032 auto-login after tream creation=Corey Hulen2015-08-271-17/+21
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* / | | | | | | | removed vestigial perfect Scrollbar commandnickago2015-08-271-1/+0
|/ / / / / / / /
* | | | | | | | Merge pull request #498 from mattermost/it33-patch-1Christopher Speller2015-08-271-6/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Updating help text for Slack Import screen
| * | | | | | | Updating help text for Slack Import screenit332015-08-271-6/+4
| | | | | | | |