summaryrefslogtreecommitdiffstats
path: root/web
Commit message (Expand)AuthorAgeFilesLines
* Fix typing socket constantJoramWilander2015-10-162-3/+3
* Small refactor of websocket code on client and serverJoramWilander2015-10-166-150/+229
* Merge pull request #1054 from stasvovk/PLT-637Christopher Speller2015-10-167-14/+220
|\
| * Merge remote-tracking branch 'upstream/master' into PLT-637Stas Vovk2015-10-16118-16980/+14346
| |\
| * | update posts time in the right sidebar when user changes time formatStas Vovk2015-10-151-0/+14
| * | fixed style guide errorStas Vovk2015-10-151-1/+1
| * | added file with display settingsStas Vovk2015-10-141-0/+168
| * | added display tab under account settings. added 24h time optionStas Vovk2015-10-145-14/+38
* | | Merge pull request #1083 from asaadmahmoodspin/ui-improvementsJoram Wilander2015-10-163-3/+6
|\ \ \
| * | | Adding momentum scrolling on IOSAsaad Mahmood2015-10-163-3/+6
| | |/ | |/|
* | | Merge pull request #1079 from hmhealey/initprefsChristopher Speller2015-10-165-13/+25
|\ \ \
| * | | Added an initial call to get all user preferences on page loadhmhealey2015-10-155-13/+25
* | | | Merge pull request #1049 from apaatsio/full-teams-dataJoram Wilander2015-10-161-4/+21
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix lintAntti Ahti2015-10-151-5/+4
| * | | Treat teams as an array instead of objectAntti Ahti2015-10-151-8/+5
| * | | Sort teams by display nameAntti Ahti2015-10-151-1/+19
| * | | Use team display name in team switcher menuAntti Ahti2015-10-141-5/+8
| | |/ | |/|
* | | PLT-74: Enable Up Arrow keyboard shortcut to edit your last messageFlorian Orben2015-10-152-5/+16
* | | PLT-74: Enable Up Arrow keyboard shortcut to edit your last messageFlorian Orben2015-10-155-3/+97
* | | Adding ReactDOM as a globalChristopher Speller2015-10-152-6/+1
* | | Fixing most deprication warningsChristopher Speller2015-10-1579-377/+423
* | | Upgrading react and react-bootstrap. 0.13.3 to 0.14 and 0.25.1 to 0.27.1Christopher Speller2015-10-159-13768/+11448
* | | Upgrading perfect scrollbar from 0.6.5 to 0.6.7Christopher Speller2015-10-154-53/+168
* | | Upgrading jquery from 1.11.1 to 2.1.4Christopher Speller2015-10-154-2541/+1443
| |/ |/|
* | Merge pull request #1077 from mattermost/mark-testsChristopher Speller2015-10-151-4/+7
|\ \
| * | Marking when user ran the unit tests=Corey Hulen2015-10-151-4/+7
* | | Removing my navbar popover changes since Chris has already done the popover c...Asaad Mahmood2015-10-151-15/+16
* | | Changing user popover trigger from hover click to just clickAsaad Mahmood2015-10-151-1/+1
* | | Multiple UI ImprovementsAsaad Mahmood2015-10-1522-82/+112
* | | Merge pull request #1057 from hmhealey/plt520Christopher Speller2015-10-155-137/+346
|\ \ \ | |/ / |/| |
| * | Updated More Direct Channels modal and converted it to ReactBootstraphmhealey2015-10-145-137/+346
| |/
* | Merge pull request #1055 from florianorben/PLT-42Christopher Speller2015-10-152-0/+17
|\ \
| * | PLT-42: Add "File uploading" text left of "Add Comment" when file is uploadingFlorian Orben2015-10-142-0/+17
| |/
* | Merge pull request #1065 from apaatsio/clarify-system-menuHarrison Healey2015-10-151-1/+5
|\ \
| * | Add titles to clarify icons in system consoleAntti Ahti2015-10-151-1/+5
* | | Merge pull request #1058 from rgarmsen2295/plt-434Joram Wilander2015-10-151-20/+279
|\ \ \ | |/ / |/| |
| * | Properly handle missing session IDs regardless of caseReed Garmsen2015-10-141-5/+9
| * | Added all remaining audit descriptions to supported auditsReed Garmsen2015-10-141-47/+59
| * | Added more individual audit handling, primarily involving the userReed Garmsen2015-10-141-5/+51
| * | Added more supported audits to audit logReed Garmsen2015-10-141-73/+140
| * | Finished structure for formatting audits and began writing individual formatt...Reed Garmsen2015-10-141-61/+132
| * | Initial changes to audit log along with structure for handling different audi...Reed Garmsen2015-10-141-16/+75
| |/
* / Don't auto-add http:// to mailto: and ftp: markdown linksFlorian Orben2015-10-142-2/+2
|/
* Fixed overwritten CSS class in the sidebarhmhealey2015-10-141-1/+1
* Merge pull request #1046 from asaadmahmoodspin/ui-improvementsHarrison Healey2015-10-1415-42/+74
|\
| * Multiple UI ImprovementsAsaad Mahmood2015-10-1415-42/+74
* | Merge release branch 'release-1.1.0'Christopher Speller2015-10-143-18/+50
|\ \ | |/ |/|
| * Fix webhook name not overriding in LHS and update webhook help text.JoramWilander2015-10-132-8/+40
| * Fixing user settings dialog so it desn't ask you to check your email unless y...Christopher Speller2015-10-131-10/+10
* | Merge pull request #993 from apaatsio/bootstrap-help-blockChristopher Speller2015-10-145-9/+8
|\ \