summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | 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
| |/ / / / / / / /
* | | | | | | | | 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
| |/ / / / / / / /
* | | | | | | | | Merge pull request #517 from mattermost/mm-1634Corey Hulen2015-08-301-2/+24
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | MM-1634 Load posts for first channel before removing loading screen
| * | | | | | | | 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-2810-141/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | MM-2039 Remove Google as a SSO service.
| * | | | | | | | Remove Google as a SSO service.JoramWilander2015-08-2810-141/+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-2830-345/+883
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | 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-2830-345/+883
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to turn off email sign up.
* | | | | | | | | | Merge pull request #511 from mattermost/MM-1698Christopher Speller2015-08-286-100/+96
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | MM-1698 Fixes upgrade db from 0.6 for postgres
| * | | | | | | | | Fixing bug where the err msg gets gobbled up=Corey Hulen2015-08-271-1/+1
| | | | | | | | | |
| * | | | | | | | | Adding ability to upgrade postgres schema=Corey Hulen2015-08-275-99/+95
| | | | | | | | | |
* | | | | | | | | | Merge pull request #486 from asubset/masterJoram Wilander2015-08-283-4/+5
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fix getParentsPosts() query
| * | | | | | | | | | fix GetParentPosts() queryJason Rossman2015-08-273-5/+5
| | | | | | | | | | |
| * | | | | | | | | | Fix getParentsPosts for postgresqlJason Rossman2015-08-261-0/+1
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | 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
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #509 from mattermost/revert-490-mm-1870Corey Hulen2015-08-2723-169/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Revert "MM-1870 Creating local version of fonts retrieved from Google"
| * | | | | | | | | | 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
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #507 from mattermost/post-limitCorey Hulen2015-08-271-3/+5
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | Change GetPostsSince limit to 1000 and only add updated posts to post list order
| * | | | | | | | | | Change GetPostsSince limit to 1000 and only add updated posts to post list ↵JoramWilander2015-08-271-3/+5
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | order.
* | | | | | | | | | Merge pull request #506 from nickago/hotfixCorey Hulen2015-08-271-1/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | hotfix: removed vestigial perfect Scrollbar command
| * | | | | | | | | removed vestigial perfect Scrollbar commandnickago2015-08-271-1/+0
| | | | | | | | | |
* | | | | | | | | | Merge pull request #505 from mattermost/post-create-timeCorey Hulen2015-08-271-3/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | Force fresh timestamp for CreateAt field of Posts before saving to DB.
| * | | | | | | | | Force fresh timestamp for CreateAt field of Posts before saving to DB.JoramWilander2015-08-271-3/+1
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #499 from mattermost/MM-2033Joram Wilander2015-08-271-0/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | MM-2033 fixes img showing infinity progress
| * | | | | | | | | MM-2033 fixes img showing infinity progress=Corey Hulen2015-08-271-1/+0
| | | | | | | | | |
| * | | | | | | | | MM-2033 fixes img showing infinity progress=Corey Hulen2015-08-272-0/+2
| |/ / / / / / / /
* | | | | | | | | Merge pull request #503 from willstacey/patch-1Corey Hulen2015-08-271-4/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Spelling error
| * | | | | | | | | Spelling errorwillstacey2015-08-271-4/+4
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | somthing -> something
* | | | | | | | | Merge pull request #502 from jasonblais/patch-1Corey Hulen2015-08-271-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add missing period
| * | | | | | | | | Add missing periodjasonblais2015-08-271-1/+1
| |/ / / / / / / /
* | | | | | | | | Merge pull request #501 from doosp/patch-1Corey Hulen2015-08-271-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Adding Periods
| * | | | | | | | | Adding Periodsdoosp2015-08-271-2/+2
| |/ / / / / / / /