summaryrefslogtreecommitdiffstats
path: root/web
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #968 from hmhealey/plt322Harrison Healey2015-10-136-137/+378
|\
| * 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 rig...hmhealey2015-10-131-2/+2
| * Renamed show_hide preference to showhmhealey2015-10-134-7/+15
| * Made direct channels visible when receiving a message on onehmhealey2015-10-131-0/+12
| * Changed direct messages channels so users can show/hide themhmhealey2015-10-135-164/+143
| * Changed direct channels in the sidebar to be displayed based on user preferenceshmhealey2015-10-135-37/+308
* | Merge pull request #1030 from mattermost/Slack-import-UI-updateChristopher Speller2015-10-131-3/+3
|\ \
| * | Slack Import changing "Preview" label to "Beta"it332015-10-131-3/+3
* | | Revert "Modified markdown lexer to not break up words written in snake_case"hmhealey2015-10-132-39/+8
* | | Merge pull request #1027 from mattermost/check-httpsCorey Hulen2015-10-131-3/+3
|\ \ \ | |/ / |/| |
| * | Update gitlab_settings.jsxit332015-10-131-3/+3
* | | Merge pull request #1026 from asaadmahmoodspin/masterJoram Wilander2015-10-131-0/+1
|\ \ \ | |_|/ |/| |
| * | Fixing code block markdownAsaad Mahmood2015-10-131-0/+1
* | | Merge pull request #1007 from florianorben/PLT-486Joram Wilander2015-10-1314-0/+19
|\ \ \
| * | | PLT-486: Remove spell check feature from input boxes during signup flowFlorian Orben2015-10-1214-0/+19
| |/ /
* | | Merge pull request #987 from hmhealey/plt521Joram Wilander2015-10-132-8/+39
|\ \ \
| * | | Modified markdown lexer to not break up words written in snake_casehmhealey2015-10-092-8/+39
* | | | Merge release branch 'release-1.1.0'Christopher Speller2015-10-131-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | PLT-596 - Update to email verification titleit332015-10-121-1/+1
* | | | Merge branch 'master' into PLT-590Maxim2015-10-1323-83/+108
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge pull request #1022 from mattermost/release-1.1.0Corey Hulen2015-10-122-35/+36
| |\| |
| | * | Merge branch 'release-1.1.0' into PLT-586=Corey Hulen2015-10-122-2/+2
| | |\ \
| | * | | PLT-586 fixing issues with security alert=Corey Hulen2015-10-092-35/+36
| | | |/ | | |/|
| * | | Merge pull request #1018 from asaadmahmoodspin/ui-fixesCorey Hulen2015-10-1211-25/+53
| |\ \ \
| | * \ \ Merge branch 'master' of https://github.com/mattermost/platform into ui-fixesAsaad Mahmood2015-10-129-20/+18
| | |\ \ \
| | * | | | Removing padding from post comment cell in RHSAsaad Mahmood2015-10-121-0/+3
| | * | | | Other UI ImprovementsAsaad Mahmood2015-10-1210-25/+50
| | | |_|/ | | |/| |
| * | | | Merge pull request #1009 from mattermost/update-help-textCorey Hulen2015-10-121-1/+0
| |\ \ \ \
| | * | | | Update get_link_modal.jsxit332015-10-111-1/+0
| | |/ / /
| * | | | Merge pull request #989 from mattermost/typosCorey Hulen2015-10-121-2/+1
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Merge branch 'master' into typosJoram Wilander2015-10-123-3/+3
| | |\| |
| | * | | Fixed typosit332015-10-081-2/+1
| * | | | Multiple UI ImprovementsAsaad Mahmood2015-10-129-20/+18
| | |/ / | |/| |
* / | | PLT-590: Change "Manage Team" to "Manage Members"Potapov Max2015-10-122-2/+2
|/ / /
* | | Update manage_incoming_hooks.jsxit332015-10-091-1/+1
* | | Update user_settings_integrations.jsxit332015-10-091-1/+1
* | | Update manage_incoming_hooks.jsxit332015-10-091-1/+1
| |/ |/|
* | Fixing broken travis release buildChristopher Speller2015-10-081-1/+1
|/
* Fixed html used for autolinkinghmhealey2015-10-081-1/+1
* Merge pull request #982 from hmhealey/plt547Harrison Healey2015-10-081-24/+24
|\
| * Fixed parsing of :'( emoticonhmhealey2015-10-081-1/+1
| * Changed emoticons so that they much be surrounded by whitespacehmhealey2015-10-081-24/+24
| * Switched :p emoticonhmhealey2015-10-081-1/+1
* | Merge pull request #981 from mattermost/plt-517Christopher Speller2015-10-08160-160/+160
|\ \
| * | Changing SpinPunch to Mattermost in copyrightChristopher Speller2015-10-08160-160/+160
| |/
* | Merge pull request #978 from mattermost/plt-355Corey Hulen2015-10-083-6/+8
|\ \
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-07-08 14:53:49 +0000