Граф коммитов

4161 Коммитов

Автор SHA1 Сообщение Дата
JoramWilander
05c4a889c1 Minor updates to incoming webhook documenatation 2015-10-13 15:15:01 -04:00
hmhealey
17d37816d4 Revert "Modified markdown lexer to not break up words written in snake_case"
This reverts commit 787d2ef7bc.
2015-10-13 14:36:58 -04:00
Asaad Mahmood
4cfe8ce699 Multiple Ui Improvements 2015-10-13 23:28:00 +05:00
Corey Hulen
a2979924a4 Merge pull request #1027 from mattermost/check-https
Updating SSO help on HTTP/HTTPS
2015-10-13 09:51:55 -07:00
Corey Hulen
1dbc6c5d0e Merge pull request #1033 from mattermost/trouble-shooting
Create Troubleshooting.md
2015-10-13 09:50:01 -07:00
=Corey Hulen
0187e702ea PLT-602 combining welcome and verify email 2015-10-13 09:47:31 -07:00
Joram Wilander
d08b3e9d38 Merge pull request #1035 from mattermost/incoming-doc
Minor changes to incoming webhook doc
2015-10-13 12:46:12 -04:00
JoramWilander
fbeb7b33db Minor changes to incoming webhook doc 2015-10-13 12:45:19 -04:00
hmhealey
2a39e8dbfa Removed Preference.AltId 2015-10-13 12:29:31 -04:00
Joram Wilander
5828a296c2 Merge pull request #1032 from mattermost/incoming-doc
Update incoming webhook documentation
2015-10-13 12:26:01 -04:00
it33
ee85f6512f Update Code-Contribution-Guidelines.md 2015-10-13 09:06:27 -07:00
it33
fabff38463 Clarifying PRs should go to master 2015-10-13 09:04:04 -07:00
it33
09acf949c3 Create Troubleshooting.md 2015-10-13 08:55:57 -07:00
JoramWilander
b42d7a03c7 Minor doc updates 2015-10-13 11:39:56 -04:00
JoramWilander
151b929c91 Update incoming webhook doc 2015-10-13 11:37:10 -04:00
Christopher Speller
e60fb1dfd7 Fixing user settings dialog so it desn't ask you to check your email unless you changed it 2015-10-13 11:31:57 -04:00
it33
62bbf11224 Slack Import changing "Preview" label to "Beta" 2015-10-13 08:22:22 -07:00
it33
89dca4eacc Update help text for Slack Import 2015-10-13 08:06:53 -07:00
Joram Wilander
f641f83ff9 Merge pull request #1026 from asaadmahmoodspin/master
Fixing code block markdown
2015-10-13 10:11:03 -04:00
hmhealey
5cecf1afcd Made structural changes to server-side Preference code based on feedback 2015-10-13 09:42:27 -04:00
hmhealey
8a7aa7f66f Rewrote PreferenceStore.SaveOrUpdate to work on Postgres within a transaction 2015-10-13 09:42:26 -04:00
hmhealey
a2517ee991 Cleaned up JSX errors 2015-10-13 09:42:26 -04:00
hmhealey
097d236f43 Fixed edge cases with leaving a direct channel while viewing that channel 2015-10-13 09:42:26 -04:00
hmhealey
ed6b2cd164 Removed setting direct channels for a new user at creation time 2015-10-13 09:42:26 -04:00
hmhealey
a6cd2a7961 Moved saving multiple user preferences into a database transaction 2015-10-13 09:42:26 -04:00
hmhealey
5832232b6d Fixed preference tests 2015-10-13 09:42:25 -04:00
hmhealey
ae0eb91180 Hid the close button when the unread badge is visible and moved it to the right side of the sidebar 2015-10-13 09:42:25 -04:00
hmhealey
a11421c74b Added default direct channels for previously existing users 2015-10-13 09:42:25 -04:00
hmhealey
599644fb2f Renamed show_hide preference to show 2015-10-13 09:42:25 -04:00
hmhealey
415f959614 Made direct channels visible when receiving a message on one 2015-10-13 09:42:25 -04:00
hmhealey
4678794133 Re-added default direct channels for new users 2015-10-13 09:42:24 -04:00
hmhealey
ed31538893 Changed direct messages channels so users can show/hide them 2015-10-13 09:42:24 -04:00
hmhealey
7d03c24b44 Changed direct channels in the sidebar to be displayed based on user preferences 2015-10-13 09:42:24 -04:00
hmhealey
a087403e9f Added api to get and set preferences 2015-10-13 09:42:23 -04:00
hmhealey
da66599fa3 Added Preferences table to store user preferences 2015-10-13 09:42:23 -04:00
hmhealey
3229457de0 Added model class for user preferences object 2015-10-13 09:42:23 -04:00
Joram Wilander
eb0c0fea35 Merge pull request #1007 from florianorben/PLT-486
PLT-486: Remove spell check feature from input boxes during signup flow
2015-10-13 08:46:48 -04:00
Joram Wilander
e67043f4f4 Merge pull request #987 from hmhealey/plt521
PLT-521 Modified markdown lexer to not break up words written in snake_case
2015-10-13 08:43:57 -04:00
Christopher Speller
ffdeba70ef Merge release branch 'release-1.1.0' 2015-10-13 08:39:27 -04:00
Christopher Speller
6bf3383bce Updating dockerfile for release v1.1.0-rc2 2015-10-13 08:35:43 -04:00
Christopher Speller
f268c2aa21 Merge pull request #1025 from mattermost/PLT-596
PLT-596 - Update to email verification title
2015-10-13 08:21:17 -04:00
it33
b2b641bb11 Update Configuration-Settings.md 2015-10-13 05:20:20 -07:00
it33
5c3a1ae57f Update gitlab_settings.jsx 2015-10-13 05:16:04 -07:00
it33
315924d41c Update Gitlab.md 2015-10-13 05:13:03 -07:00
Joram Wilander
2663cede2b Merge pull request #1013 from optimistiks/PLT-590
PLT-590: Change "Manage Team" to "Manage Members"
2015-10-13 08:00:15 -04:00
Stas Vovk
a1328fc8b5 Merge branch 'master' into PLT-589 2015-10-13 14:52:29 +03:00
Stas Vovk
822881e51a Merge branch 'PLT-589' of github.com:stasvovk/platform into PLT-589 2015-10-13 13:27:34 +03:00
Stas Vovk
450b56c1bd replaced constructions like user.roles === 'admin' by Utils.isAdmin(user.roles) in manage members 2015-10-13 13:20:56 +03:00
Asaad Mahmood
527e99f8d2 Fixing code block markdown 2015-10-13 14:33:37 +05:00
Maxim
9d3248ccec Merge branch 'master' into PLT-590 2015-10-13 10:15:44 +03:00