summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #993 from apaatsio/bootstrap-help-blockChristopher Speller2015-10-145-9/+8
|\
| * Use help-block class from BootstrapAntti Ahti2015-10-095-9/+8
* | Update SMTP-Email-Setup.mdit332015-10-131-2/+2
* | Merge pull request #1042 from hmhealey/plt322-followupJoram Wilander2015-10-133-6/+17
|\ \
| * | 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
|\ \ \
| * \ \ 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 Utils.isAdmin(user.role...Stas Vovk2015-10-132-4/+4
| |/ / / / /
| * | | | | 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 ImprovementsAsaad Mahmood2015-10-137-13/+40
* | | | | | | | Merge pull request #968 from hmhealey/plt322Harrison Healey2015-10-1317-148/+1260
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | 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 rig...hmhealey2015-10-131-2/+2
| * | | | | | | 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
| * | | | | | | Added Preferences table to store user preferenceshmhealey2015-10-135-13/+325
| * | | | | | | Added model class for user preferences objecthmhealey2015-10-132-0/+136
* | | | | | | | Merge pull request #1034 from mattermost/PRs-to-masterCorey Hulen2015-10-131-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Update Code-Contribution-Guidelines.mdit332015-10-131-1/+1
| * | | | | | | | Update Code-Contribution-Guidelines.mdit332015-10-131-1/+1
| * | | | | | | | Clarifying PRs should go to masterit332015-10-131-1/+1
* | | | | | | | | 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
| |/ / / / / / / /
* | | | | | | | | Merge pull request #1029 from mattermost/Slack-import-help-updateChristopher Speller2015-10-131-5/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update help text for Slack Importit332015-10-131-5/+9
| |/ / / / / / / /
* | | | | | | | | Merge pull request #1037 from hmhealey/revert987Joram Wilander2015-10-132-39/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Revert "Modified markdown lexer to not break up words written in snake_case"hmhealey2015-10-132-39/+8
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #1039 from mattermost/incoming-docJoram Wilander2015-10-131-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Minor updates to incoming webhook documenatationJoramWilander2015-10-131-1/+1
* | | | | | | | | Merge pull request #1027 from mattermost/check-httpsCorey Hulen2015-10-133-13/+15
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update Configuration-Settings.mdit332015-10-131-5/+5
| * | | | | | | | | Update gitlab_settings.jsxit332015-10-131-3/+3
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-07-05 14:01:41 +0000