summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
| * 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
|\ \ | | | | | | Clarifying PRs should go to master
| * | 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"
| * | | 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 Import
| * | | Update help text for Slack Importit332015-10-131-5/+9
| |/ /
* | | Merge pull request #1037 from hmhealey/revert987Joram Wilander2015-10-132-39/+8
|\ \ \ | | | | | | | | Revert #987
| * | | 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 #1039 from mattermost/incoming-docJoram Wilander2015-10-131-1/+1
|\ \ \ \ | |/ / / |/| | | Minor updates to incoming webhook documenatation
| * | | Minor updates to incoming webhook documenatationJoramWilander2015-10-131-1/+1
| | | |
* | | | Merge pull request #1027 from mattermost/check-httpsCorey Hulen2015-10-133-13/+15
|\ \ \ \ | | | | | | | | | | Updating SSO help on HTTP/HTTPS
| * | | | Update Configuration-Settings.mdit332015-10-131-5/+5
| | | | |
| * | | | Update gitlab_settings.jsxit332015-10-131-3/+3
| | | | |
| * | | | Update Gitlab.mdit332015-10-131-5/+7
| | | | |
* | | | | Merge pull request #1033 from mattermost/trouble-shootingCorey Hulen2015-10-131-0/+7
|\ \ \ \ \ | |_|/ / / |/| | | | Create Troubleshooting.md
| * | | | Create Troubleshooting.mdit332015-10-131-0/+7
| | |/ / | |/| |
* | | | Merge pull request #1035 from mattermost/incoming-docJoram Wilander2015-10-131-1/+1
|\ \ \ \ | | | | | | | | | | Minor changes to incoming webhook doc
| * | | | Minor changes to incoming webhook docJoramWilander2015-10-131-1/+1
|/ / / /
* | | | Merge pull request #1032 from mattermost/incoming-docJoram Wilander2015-10-131-27/+39
|\ \ \ \ | |/ / / |/| | | Update incoming webhook documentation
| * | | Minor doc updatesJoramWilander2015-10-131-2/+2
| | | |
| * | | Update incoming webhook docJoramWilander2015-10-131-27/+39
|/ / /
* | | 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-132-2/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | |
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-07-19 21:46:09 +0000