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 |
|
it33
|
525a48fe27
|
PLT-596 - Update to email verification title
|
2015-10-12 22:33:43 -07:00 |
|
Corey Hulen
|
0144b6fd8a
|
Merge pull request #1024 from mattermost/release-1.1.0
Merging docs Release 1.1.0rc
|
2015-10-12 21:50:52 -07:00 |
|
Corey Hulen
|
9bd9af4f19
|
Merge pull request #1023 from mattermost/fix-config
Fixing document
|
2015-10-12 20:55:40 -07:00 |
|
=Corey Hulen
|
a492206e38
|
Fixing document
|
2015-10-12 20:42:58 -07:00 |
|
it33
|
9485ab944a
|
Update Configuration-Settings.md
Adjusting format so variables are on their own line
|
2015-10-12 18:53:38 -07:00 |
|
it33
|
efea7eca38
|
Update Configuration-Settings.md
Minor corrections
|
2015-10-12 18:49:11 -07:00 |
|
it33
|
7181e667d1
|
Update Configuration-Settings.md
Clarifying config.json settings not in System Console and updating formatting.
|
2015-10-12 18:41:14 -07:00 |
|
Florian Orben
|
69a7363990
|
PLT-486: Remove spell check feature from input boxes during signup flow
Add spellcheck="false" attribute to login and signup form inputs
|
2015-10-12 23:24:16 +02:00 |
|
Corey Hulen
|
191e248b0f
|
Merge pull request #1022 from mattermost/release-1.1.0
Release 1.1.0rc merging to master
|
2015-10-12 14:22:05 -07:00 |
|
Corey Hulen
|
a6a3c351a8
|
Merge pull request #997 from mattermost/PLT-586
PLT-586 fixing issues with security alert
|
2015-10-12 13:56:21 -07:00 |
|
Corey Hulen
|
246c7414bd
|
Merge pull request #1018 from asaadmahmoodspin/ui-fixes
Other UI Improvements
|
2015-10-12 13:18:47 -07:00 |
|
=Corey Hulen
|
9f83a72f73
|
Merge branch 'release-1.1.0' into PLT-586
|
2015-10-12 13:16:46 -07:00 |
|
Corey Hulen
|
7a469c8fc1
|
Merge pull request #999 from rgarmsen2295/plt-610
PLT-610 Fix broken image in change email verification email
|
2015-10-12 13:15:30 -07:00 |
|
Stas Vovk
|
f4f4335797
|
Merge branch 'master' into PLT-589
|
2015-10-12 22:39:04 +03:00 |
|
Stas Vovk
|
8d8e8ec41e
|
changed Admin to Team Admin in admin console
|
2015-10-12 22:04:00 +03:00 |
|
=Corey Hulen
|
51f41bffec
|
Merge branch 'release-1.1.0' into PLT-586
|
2015-10-12 11:58:48 -07:00 |
|
Stas Vovk
|
bafb341015
|
Merge remote-tracking branch 'upstream/master' into PLT-589
|
2015-10-12 21:54:51 +03:00 |
|
Corey Hulen
|
1ce37c316a
|
Merge pull request #1015 from mattermost/trouble-shooting-tip
Adding troubleshooting tip
|
2015-10-12 11:52:42 -07:00 |
|
Corey Hulen
|
535164b5b6
|
Merge pull request #1009 from mattermost/update-help-text
Updating help text
|
2015-10-12 11:50:42 -07:00 |
|
Corey Hulen
|
9e002f3566
|
Merge pull request #994 from mattermost/mkdocs-strict
Turning on strict mode for mkdocs
|
2015-10-12 11:49:29 -07:00 |
|
Corey Hulen
|
8d193da296
|
Merge pull request #992 from mattermost/fast-obvious-forgiving
Adding link to "Fast, Obvious, Forgiving"
|
2015-10-12 11:49:09 -07:00 |
|