summaryrefslogtreecommitdiffstats
path: root/web/react
Commit message (Collapse)AuthorAgeFilesLines
* 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-146-24/+37
|\ | | | | Multiple UI Improvements
| * Multiple UI ImprovementsAsaad Mahmood2015-10-146-24/+37
| |
* | 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-143-3/+3
|\ \ | | | | | | Use help-block class from Bootstrap
| * | Use help-block class from BootstrapAntti Ahti2015-10-093-3/+3
| | | | | | | | | | | | | | | | | | 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-131-6/+8
|\ \ \ | | | | | | | | 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-131-6/+8
| | | |
* | | | 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-137-57/+71
| |\ \ \ \
| * \ \ \ \ 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-125-11/+9
| |\ \ \ \ \ \
| * | | | | | | changed Admin to Team Admin in Manage Team membersStas Vovk2015-10-121-1/+3
| | | | | | | |
* | | | | | | | Merge pull request #1038 from asaadmahmoodspin/ui-improvementsJoram Wilander2015-10-133-2/+11
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Multiple Ui Improvements
| * | | | | | | | Multiple Ui ImprovementsAsaad Mahmood2015-10-133-2/+11
| | | | | | | | |
* | | | | | | | | 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
| * | | | | | | | 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"
| * | | | | | | | | 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
| |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 787d2ef7bca7f411b18d1d13561d61d7e95c81a7.
* | | | | | | | | Merge pull request #1027 from mattermost/check-httpsCorey Hulen2015-10-131-3/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Updating SSO help on HTTP/HTTPS
| * | | | | | | | Update gitlab_settings.jsxit332015-10-131-3/+3
| | | | | | | | |
* | | | | | | | | Merge pull request #1026 from asaadmahmoodspin/masterJoram Wilander2015-10-131-0/+1
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | Fixing code block markdown
| * | | | | | | | 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 flow
| * | | | | | | | PLT-486: Remove spell check feature from input boxes during signup flowFlorian Orben2015-10-1214-0/+19
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Add spellcheck="false" attribute to login and signup form inputs
* | | | | | | | Merge pull request #987 from hmhealey/plt521Joram Wilander2015-10-132-8/+39
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | PLT-521 Modified markdown lexer to not break up words written in snake_case
| * | | | | | | | 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-1314-71/+81
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge pull request #1022 from mattermost/release-1.1.0Corey Hulen2015-10-122-35/+36
| |\| | | | | | | | | | | | | | | | | | | Release 1.1.0rc merging to master
| | * | | | | 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-125-22/+35
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | Other UI Improvements
| | * | | | Merge branch 'master' of https://github.com/mattermost/platform into ui-fixesAsaad Mahmood2015-10-125-11/+9
| | |\ \ \ \ | | | | |_|/ | | | |/| |
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-10-30 23:23:34 +0000