summaryrefslogtreecommitdiffstats
path: root/web
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * 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 ↵Asaad Mahmood2015-10-151-15/+16
| | | | | | | | changes in his PR
* | 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
|\ \ | |/ |/| PLT-520 Updated More Direct Channels modal and converted it to ReactBootstrap
| * 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 uploading
| * | 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 console
| * | Add titles to clarify icons in system consoleAntti Ahti2015-10-151-1/+5
| | | | | | | | | | | | | | | | | | The + and x icons in the team section can easily be misinterpreted as "Create team" and "Delete team". Added clarifying title text that the user can see when hovering on the icon.
* | | Merge pull request #1058 from rgarmsen2295/plt-434Joram Wilander2015-10-151-20/+279
|\ \ \ | |/ / |/| | PLT-434 Improve Audit History Format
| * | 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 ↵Reed Garmsen2015-10-141-61/+132
| | | | | | | | | | | | formatting for each audit
| * | Initial changes to audit log along with structure for handling different ↵Reed Garmsen2015-10-141-16/+75
| |/ | | | | | | audit types
* / 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 Improvements
| * 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 ↵Christopher Speller2015-10-131-10/+10
| | | | | | | | you changed it
* | Merge pull request #993 from apaatsio/bootstrap-help-blockChristopher Speller2015-10-145-9/+8
|\ \ | | | | | | Use help-block class from Bootstrap
| * | Use help-block class from BootstrapAntti Ahti2015-10-095-9/+8
| | | | | | | | | | | | | | | | | | Use help-block class provided by Bootstrap instead of using a custom form__hint class. We still override some styles from the Bootstrap class, though.
* | | Merge pull request #1042 from hmhealey/plt322-followupJoram Wilander2015-10-133-6/+17
|\ \ \ | | | | | | | | PLT-322 Fixed leave direct channel button for users with a long username
| * | | Fixed leave direct channel button for users with a long usernamehmhealey2015-10-133-6/+17
| | | |
* | | | Merge pull request #1017 from stasvovk/PLT-589Joram Wilander2015-10-132-4/+8
|\ \ \ \ | | | | | | | | | | PLT-589: changed Admin to Team Admin in Manage Team members
| * \ \ \ Merge branch 'master' into PLT-589Stas Vovk2015-10-1313-60/+89
| |\ \ \ \
| * \ \ \ \ Merge branch 'PLT-589' of github.com:stasvovk/platform into PLT-589Stas Vovk2015-10-132-3/+1
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' into PLT-589Stas Vovk2015-10-122-3/+1
| | |\ \ \ \ \
| * | | | | | | replaced constructions like user.roles === 'admin' by ↵Stas Vovk2015-10-132-4/+4
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Utils.isAdmin(user.roles) in manage members
| * | | | | | changed Admin to Team Admin in admin consoleStas Vovk2015-10-121-1/+3
| | | | | | |
| * | | | | | Merge remote-tracking branch 'upstream/master' into PLT-589Stas Vovk2015-10-129-20/+18
| |\ \ \ \ \ \
| * | | | | | | changed Admin to Team Admin in Manage Team membersStas Vovk2015-10-121-1/+3
| | | | | | | |
* | | | | | | | Merge pull request #1038 from asaadmahmoodspin/ui-improvementsJoram Wilander2015-10-137-13/+40
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Multiple Ui Improvements
| * | | | | | | | Multiple Ui ImprovementsAsaad Mahmood2015-10-137-13/+40
| | | | | | | | |
* | | | | | | | | Merge pull request #968 from hmhealey/plt322Harrison Healey2015-10-136-137/+378
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | PLT-322 Updated Direct Messages menu
| * | | | | | | | Made further changes based on feedbackhmhealey2015-10-132-12/+14
| | | | | | | | |
| * | | | | | | | Removed Preference.AltIdhmhealey2015-10-136-50/+34
| | | | | | | | |
| * | | | | | | | Cleaned up JSX errorshmhealey2015-10-132-56/+51
| | | | | | | | |
| * | | | | | | | Fixed edge cases with leaving a direct channel while viewing that channelhmhealey2015-10-134-21/+11
| | | | | | | | |
| * | | | | | | | Hid the close button when the unread badge is visible and moved it to the ↵hmhealey2015-10-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | right side of the sidebar
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-10-30 07:29:31 +0000