summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Adjusting formattingit332015-10-141-1/+1
|
* Update Slack-Import.mdit332015-10-141-6/+11
|
* Update Slack-Import.mdit332015-10-141-8/+10
|
* Update Slack-Import.mdit332015-10-141-1/+1
|
* Merge pull request #1047 from hmhealey/sidebarJoram Wilander2015-10-141-1/+1
|\ | | | | Fixed overwritten CSS class in the sidebar
| * 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-146-24/+70
|\ \ | |/ |/|
| * Updating dockerfile for release v1.1.0-rc3Christopher Speller2015-10-141-1/+1
| |
| * Merge pull request #1041 from mattermost/plt-603Christopher Speller2015-10-142-8/+40
| |\ | | | | | | RC3 - PLT-603 Fix webhook name not overriding in RHS and update webhook help text.
| | * Fix webhook name not overriding in LHS and update webhook help text.JoramWilander2015-10-132-8/+40
| |/
| * Merge pull request #1040 from mattermost/plt-601Christopher Speller2015-10-131-10/+10
| |\ | | | | | | PLT-601 Fixing user settings modal general tab.
| | * Merge branch 'release-1.1.0' into plt-601Christopher Speller2015-10-132-5/+19
| | |\ | | |/ | |/|
| * | Merge pull request #1036 from mattermost/PLT-602Christopher Speller2015-10-132-5/+19
| |\ \ | | | | | | | | PLT-602 combining welcome and verify email
| | * | PLT-602 combining welcome and verify email=Corey Hulen2015-10-132-5/+19
| |/ /
| | * 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.
* | | Update SMTP-Email-Setup.mdit332015-10-131-2/+2
| | |
* | | 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-1327-102/+491
| |\ \ \ \
| * \ \ \ \ Merge branch 'PLT-589' of github.com:stasvovk/platform into PLT-589Stas Vovk2015-10-136-6/+21
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' into PLT-589Stas Vovk2015-10-126-6/+21
| | |\ \ \ \ \
| * | | | | | | 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-1210-22/+20
| |\ \ \ \ \ \
| * | | | | | | 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-1317-148/+1260
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | PLT-322 Updated Direct Messages menu
| * | | | | | | | Made further changes based on feedbackhmhealey2015-10-138-54/+56
| | | | | | | | |
| * | | | | | | | Removed Preference.AltIdhmhealey2015-10-1315-166/+246
| | | | | | | | |
| * | | | | | | | Made structural changes to server-side Preference code based on feedbackhmhealey2015-10-139-362/+227
| | | | | | | | |
| * | | | | | | | Rewrote PreferenceStore.SaveOrUpdate to work on Postgres within a transactionhmhealey2015-10-132-8/+57
| | | | | | | | |
| * | | | | | | | Cleaned up JSX errorshmhealey2015-10-132-56/+51
| | | | | | | | |
| * | | | | | | | Fixed edge cases with leaving a direct channel while viewing that channelhmhealey2015-10-134-21/+11
| | | | | | | | |
| * | | | | | | | Removed setting direct channels for a new user at creation timehmhealey2015-10-132-50/+42
| | | | | | | | |
| * | | | | | | | Moved saving multiple user preferences into a database transactionhmhealey2015-10-135-48/+144
| | | | | | | | |
| * | | | | | | | Fixed preference testshmhealey2015-10-131-18/+7
| | | | | | | | |
| * | | | | | | | 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
| * | | | | | | | Added default direct channels for previously existing usershmhealey2015-10-132-29/+45
| | | | | | | | |
| * | | | | | | | Renamed show_hide preference to showhmhealey2015-10-139-26/+34
| | | | | | | | |
| * | | | | | | | Made direct channels visible when receiving a message on onehmhealey2015-10-131-0/+12
| | | | | | | | |
| * | | | | | | | Re-added default direct channels for new usershmhealey2015-10-131-0/+42
| | | | | | | | |
| * | | | | | | | 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
| | | | | | | | |
| * | | | | | | | Added api to get and set preferenceshmhealey2015-10-135-0/+278
| | | | | | | | |
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-10-31 14:34:04 +0000