summaryrefslogtreecommitdiffstats
path: root/web/react/components
Commit message (Collapse)AuthorAgeFilesLines
* 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-123-8/+3
| |\ \ \ \
| * | | | | 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-132-136/+171
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | PLT-322 Updated Direct Messages menu
| * | | | | | Made further changes based on feedbackhmhealey2015-10-131-1/+3
| | | | | | |
| * | | | | | Removed Preference.AltIdhmhealey2015-10-132-12/+9
| | | | | | |
| * | | | | | Cleaned up JSX errorshmhealey2015-10-132-56/+51
| | | | | | |
| * | | | | | Fixed edge cases with leaving a direct channel while viewing that channelhmhealey2015-10-132-20/+10
| | | | | | |
| * | | | | | 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-132-4/+8
| | | | | | |
| * | | | | | 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-132-159/+102
| | | | | | |
| * | | | | | Changed direct channels in the sidebar to be displayed based on user preferenceshmhealey2015-10-131-37/+129
| | | | | | |
* | | | | | | 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
| |/ / / / /
* | | | | | 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 #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 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-1312-68/+75
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | 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-123-8/+3
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | Other UI ImprovementsAsaad Mahmood2015-10-125-22/+35
| | | |_|/ | | |/| |
| * | | | Merge pull request #1009 from mattermost/update-help-textCorey Hulen2015-10-121-1/+0
| |\ \ \ \ | | | | | | | | | | | | Updating help text
| | * | | | Update get_link_modal.jsxit332015-10-111-1/+0
| | |/ / / | | | | | | | | | | Removing out-of-date text saying that anyone can join a team from invite link, since there are now options to restrict sign-up based on email domain and SSO options
| * | | | Merge pull request #989 from mattermost/typosCorey Hulen2015-10-121-2/+1
| |\ \ \ \ | | |_|/ / | |/| | | Fixed typos
| | * | | Merge branch 'master' into typosJoram Wilander2015-10-122-2/+2
| | |\| |
| | * | | Fixed typosit332015-10-081-2/+1
| | | |/ | | |/| | | | | There was no space after "user name." before the next sentence. Also, "user name" should be "username"
| * | | Multiple UI ImprovementsAsaad Mahmood2015-10-123-8/+3
| | |/ | |/|
* / | 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
|/
* Merge pull request #981 from mattermost/plt-517Christopher Speller2015-10-08131-131/+131
|\ | | | | PLT-517 Changing SpinPunch to Mattermost in copyright
| * Changing SpinPunch to Mattermost in copyrightChristopher Speller2015-10-08131-131/+131
| |
* | Merge pull request #978 from mattermost/plt-355Corey Hulen2015-10-083-6/+8
|\ \ | | | | | | PLT-355 Fixing ability to dynamicly update members list.
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-07-17 05:45:20 +0000