summaryrefslogtreecommitdiffstats
path: root/web/templates
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1247 from hmhealey/startswithChristopher Speller2015-11-021-0/+1
|\
| * Added Babel ES6 polyfill to the html headerhmhealey2015-11-021-0/+1
* | Creating hierarchyChristopher Speller2015-11-021-18/+1
|/
* code style theme chooserFlorian Orben2015-10-291-1/+1
* highlight code in markdown blocksFlorian Orben2015-10-291-0/+1
* Revert "PLT-395: Add syntax highlighting to Markdown code blocks"Christopher Speller2015-10-281-1/+0
* Merge branch 'master' into PLT-25=Corey Hulen2015-10-261-0/+1
|\
| * code style theme chooserFlorian Orben2015-10-241-1/+1
| * highlight code in markdown blocksFlorian Orben2015-10-241-0/+1
* | PLT-25 adding analytics panel=Corey Hulen2015-10-231-0/+1
|/
* Updating logo image url in authoriseAsaad Mahmood2015-10-231-1/+1
* Multi-session login=Corey Hulen2015-10-201-4/+7
* Adding multi-session cookie=Corey Hulen2015-10-201-7/+10
* Merging from master=Corey Hulen2015-10-191-1/+1
|\
| * change url when a user navigates between tabs [#962]Stas Vovk2015-10-181-1/+1
* | Refactoring web classes to use multi-session=Corey Hulen2015-10-161-1/+1
* | Inital support for multi-tab loging=Corey Hulen2015-10-164-6/+9
|/
* Upgrading react and react-bootstrap. 0.13.3 to 0.14 and 0.25.1 to 0.27.1Christopher Speller2015-10-151-2/+3
* Upgrading perfect scrollbar from 0.6.5 to 0.6.7Christopher Speller2015-10-151-1/+1
* Upgrading jquery from 1.11.1 to 2.1.4Christopher Speller2015-10-151-1/+1
* Multiple UI ImprovementsAsaad Mahmood2015-10-151-1/+1
* Multiple UI ImprovementsAsaad Mahmood2015-10-121-1/+1
* Fixing broken travis release buildChristopher Speller2015-10-081-1/+1
* Changing SpinPunch to Mattermost in copyrightChristopher Speller2015-10-081-1/+1
* Merge pull request #959 from mattermost/build-fixCorey Hulen2015-10-071-11/+10
|\
| * Moving external libraries to the install step and into a seperate bundleChristopher Speller2015-10-071-11/+10
* | Merge pull request #938 from mattermost/plt-111Corey Hulen2015-10-061-10/+15
|\ \
| * | Combining email verification confirmation screen with login screen.Christopher Speller2015-10-061-10/+15
| |/
* / Admin console UI ImprovementsAsaad Mahmood2015-10-061-4/+4
|/
* Update allow/deny oauth page UI, and add ouath as reserved word.JoramWilander2015-10-021-20/+20
* PLT-345 adding client side logging=Corey Hulen2015-09-291-0/+19
* fixing segment bug=Corey Hulen2015-09-231-1/+1
* fixing segment bug=Corey Hulen2015-09-231-1/+0
* Merge branch 'master' into PLT-11-email=Corey Hulen2015-09-232-5/+3
|\
| * Merge pull request #759 from mattermost/plt-242-3Harrison Healey2015-09-232-0/+3
| |\
| | * Implement UI theme colors.JoramWilander2015-09-232-0/+3
| * | Restored changes which remove emojify and switch to our own versionhmhealey2015-09-221-5/+0
| |/
| * Revert "PLT-289 Properly removed lingering references to emojify"Christopher Speller2015-09-221-0/+5
| * Properly removed lingering references to emojifyhmhealey2015-09-221-5/+0
* | Adding service settings to admin console=Corey Hulen2015-09-221-23/+0
|/
* Fixing css=Corey Hulen2015-09-161-1/+0
* PLT-40 adding experimental support for emojis=Corey Hulen2015-09-161-0/+5
* Implement OAuth2 service provider functionality.JoramWilander2015-09-162-0/+27
* Merge branch 'master' into PLT-93=Corey Hulen2015-09-161-1/+1
|\
| * Merge pull request #686 from hmhealey/plt172Joram Wilander2015-09-161-1/+1
| |\
| | * PLT-172 Updated perfect-scrollbar to 0.6.5hmhealey2015-09-151-1/+1
* | | PLT-93 cleaing up client side configs=Corey Hulen2015-09-1511-33/+25
* | | removing loggly=Corey Hulen2015-09-151-11/+0
|/ /
* | Merge pull request #678 from mattermost/mm-1589Corey Hulen2015-09-141-3/+4
|\ \ | |/ |/|
| * New add channel modal using react-bootstrap.Christopher Speller2015-09-141-3/+4