summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add create_at back to profile fields to fix analyticsJoramWilander2016-01-225-3/+20
* Add system analytics pageJoramWilander2016-01-215-81/+266
* Generalize analytics server functions and begin componentizing client analyti...JoramWilander2016-01-219-256/+407
* Merge pull request #1922 from cloudron-io/check_auth_serviceHarrison Healey2016-01-211-2/+2
|\
| * Check auth_service for constructing messagegirish@cloudron.io2016-01-191-1/+1
| * Check auth_service to describe user login messagegirish@cloudron.io2016-01-191-1/+1
* | Merge pull request #1882 from trashcan/PLT-1232-more-channel-infoHarrison Healey2016-01-211-2/+10
|\ \
| * | Show correct channel URL in channel info modalPat Lathem2016-01-131-1/+4
| * | Rename 'Channel Handle' to Channel URL'Pat Lathem2016-01-131-1/+1
| * | Add channel purposePat Lathem2016-01-131-0/+5
* | | Merge pull request #1893 from asaadmahmoodspin/ui-improvementsJoram Wilander2016-01-2130-15/+55
|\ \ \
| * | | Fixing height for iconAsaad Mahmood2016-01-201-1/+1
| * | | Updating status icon cssAsaad Mahmood2016-01-201-1/+3
| * | | Fixing status icon in IE11Asaad Mahmood2016-01-201-0/+1
| * | | Merge branch 'master' of https://github.com/mattermost/platform into ui-impro...Asaad Mahmood2016-01-2058-41/+12444
| |\ \ \
| * | | | Updating favicon fileAsaad Mahmood2016-01-151-1/+1
| * | | | Updating favicon fileAsaad Mahmood2016-01-151-1/+1
| * | | | Adding gradient bg behind logoAsaad Mahmood2016-01-1518-0/+0
| * | | | Adding bg behind logosAsaad Mahmood2016-01-1518-0/+0
| * | | | Updating logoAsaad Mahmood2016-01-1528-14/+51
| | |_|/ | |/| |
* | | | Merge pull request #1891 from trashcan/PLT-1515-password-change-wordingJoram Wilander2016-01-212-2/+2
|\ \ \ \
| * | | | Improve wording of password change email to indicate that it might not have b...Pat Lathem2016-01-142-2/+2
| | |_|/ | |/| |
* | | | Merge pull request #1886 from rgarmsen2295/plt-549cJoram Wilander2016-01-211-2/+10
|\ \ \ \
| * | | | Fixed react warning issue with setState in RHSReed Garmsen2016-01-131-2/+10
* | | | | Merge pull request #1885 from rgarmsen2295/plt-406Joram Wilander2016-01-212-0/+5
|\ \ \ \ \
| * | | | | Fix issue with file overlay getting stuck in ie11Reed Garmsen2016-01-131-0/+1
| * | | | | Fix issue with drag n drop overlay in ie11Reed Garmsen2016-01-121-0/+4
* | | | | | Merge pull request #1884 from hmhealey/plt1403Joram Wilander2016-01-211-1/+0
|\ \ \ \ \ \
| * | | | | | Removed incorrect test case for autolinking urls with angle bracketshmhealey2016-01-201-1/+0
* | | | | | | Merge pull request #1883 from rosskusler/masterJoram Wilander2016-01-211-1/+1
|\ \ \ \ \ \ \
| * | | | | | | fixed typo in URL to emoji.codesRoss Kusler2016-01-131-1/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #1867 from apskim/patch-1Joram Wilander2016-01-211-0/+22
|\ \ \ \ \ \ \
| * | | | | | | Parse Slack links in the attachment fieldsAlex Polozov2016-01-111-0/+16
| * | | | | | | Parse Slack links in the attachment pretextAlex Polozov2016-01-111-0/+6
* | | | | | | | Merge pull request #1934 from mattermost/PLT-7-server-dbCorey Hulen2016-01-206-13/+47
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | tweaking=Corey Hulen2016-01-201-6/+5
| * | | | | | | tweak=Corey Hulen2016-01-201-1/+1
| * | | | | | | PLT-7-server-db=Corey Hulen2016-01-207-13/+48
|/ / / / / / /
* | | | | | | Merge pull request #1932 from mattermost/revert-1930-PLT-7-server-dbCorey Hulen2016-01-2056-1297/+1255
|\ \ \ \ \ \ \
| * | | | | | | Revert " PLT-7 adding loc for db calls"Corey Hulen2016-01-2056-1297/+1255
|/ / / / / / /
* | | | | | | Merge pull request #1930 from mattermost/PLT-7-server-dbCorey Hulen2016-01-2056-1255/+1297
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | PLT-7 adding loc db calls for users table=Corey Hulen2016-01-2033-320/+323
| * | | | | | PLT-7 adding loc db calls for posts table=Corey Hulen2016-01-2010-181/+182
| * | | | | | PLT-7 adding loc db calls for session table=Corey Hulen2016-01-2011-72/+75
| * | | | | | PLT-7 adding loc db calls for oauth table=Corey Hulen2016-01-2019-292/+303
| * | | | | | PLT-7 adding loc db calls for oauth table=Corey Hulen2016-01-207-67/+71
| * | | | | | PLT-7 adding loc db calls for webhooks table=Corey Hulen2016-01-208-86/+88
| * | | | | | PLT-7 adding loc db calls for team table=Corey Hulen2016-01-2012-109/+113
| * | | | | | PLT-7 adding loc db calls for system table=Corey Hulen2016-01-205-20/+22
| * | | | | | PLT-7 adding loc for db calls audits and prefs=Corey Hulen2016-01-2015-108/+120
|/ / / / / /