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

1109 Коммитов

Автор SHA1 Сообщение Дата
Harrison Healey
4d600babe8 Merge pull request #950 from mattermost/PLT-519
PLT-519 toggle team creation link based on config setting
2015-10-07 09:52:12 -04:00
Christopher Speller
4263c08c55 Merge pull request #953 from asaadmahmoodspin/plt-522
PLT-522 - Adding option for mentionHighlightLink for themes
2015-10-07 08:43:24 -04:00
Christopher Speller
cf9ce772c2 Merge pull request #947 from mattermost/PLT-435
PLT-435 adding ability to demote system admin
2015-10-07 08:30:57 -04:00
Christopher Speller
2cd546370f Merge pull request #945 from mattermost/plt-433
PLT-433 Allow team admin to delete comments.
2015-10-07 08:28:05 -04:00
Joram Wilander
3ce40d6a94 Merge pull request #946 from asaadmahmoodspin/ui-improvements
PLT-451 - Adding visual effect for logout active sessions button
2015-10-07 08:00:51 -04:00
Asaad Mahmood
698ca63d99 PLT-522 - Adding option for mentionHighlightLink for themes 2015-10-07 14:41:24 +05:00
=Corey Hulen
378d975eaa PLT-519 toggle team creation link based on config setting 2015-10-06 13:44:52 -07:00
Corey Hulen
fe802fb9c4 Merge pull request #938 from mattermost/plt-111
PLT-111 Combining email verification confirmation screen with login screen.
2015-10-06 13:24:17 -07:00
Asaad Mahmood
d99aea1502 Removing sidebar text hover color 2015-10-06 22:33:30 +05:00
=Corey Hulen
3d4220ce5f PLT-435 adding ability to demote system admin 2015-10-06 09:50:27 -07:00
Asaad Mahmood
cdb09be6d0 Removing console.log 2015-10-06 21:43:13 +05:00
Asaad Mahmood
d452523b07 PLT-451 - Adding visual effect for logout active sessions button 2015-10-06 21:34:16 +05:00
Corey Hulen
cbe1ab8dba Merge pull request #939 from asaadmahmoodspin/plt-424
Admin console UI Improvements
2015-10-06 08:54:02 -07:00
JoramWilander
384b9d592e Allow team admin to delete comments. 2015-10-06 11:52:55 -04:00
hmhealey
300f25b31b Hid Copy Link button when unable to copy the team signup link 2015-10-06 10:45:49 -04:00
Asaad Mahmood
74b3338bc7 Admin console UI Improvements 2015-10-06 19:14:35 +05:00
Christopher Speller
4311978d65 Combining email verification confirmation screen with login screen. 2015-10-06 09:18:23 -04:00
Joram Wilander
e946ef1837 Merge pull request #936 from mattermost/signup-fix
Fixing broken signup page
2015-10-06 08:59:05 -04:00
Christopher Speller
91e55e2829 Fixing broken signup page 2015-10-06 08:41:49 -04:00
hmhealey
6d50c6b2f0 Fixed Get Public Link button 2015-10-05 17:02:35 -04:00
Harrison Healey
da61bb38ff Merge pull request #925 from asaadmahmoodspin/ui-improvements
Multiple UI Improvements
2015-10-05 16:12:29 -04:00
Harrison Healey
e2e00d9d43 Merge pull request #922 from mattermost/plt-360
PLT-360 Upgrade and changes to ESLint
2015-10-05 16:02:09 -04:00
Asaad Mahmood
e7d7892fd7 Multiple UI Improvements 2015-10-05 22:32:26 +05:00
Corey Hulen
bdf0520022 Merge pull request #923 from mattermost/fix-load-scroll
Fix missed binding for youtube data callback.
2015-10-05 09:54:42 -07:00
JoramWilander
afe0d004fe Fix missed binding for youtube data callback. 2015-10-05 11:52:06 -04:00
Joram Wilander
b591c4b32e Merge pull request #914 from mattermost/plt-297
PLT-297 Add ability to override username and icon for posts from incoming webhooks.
2015-10-05 11:48:10 -04:00
JoramWilander
ef55d7f244 Update help text to mention the BOT tag for webhook posts. 2015-10-05 11:25:12 -04:00
Christopher Speller
33b957ed1a Disabling complexity warning. Allowing non-nested ternary. Upgrading ESList. Adding new ESLint rules. Fixing new ESLint errors. 2015-10-05 11:05:06 -04:00
Christopher Speller
f4afabd679 Merge pull request #903 from mattermost/PLT-44
PLT-44 allow team switching without the need to login
2015-10-05 10:20:14 -04:00
Joram Wilander
8595fd85c7 Merge pull request #887 from asaadmahmoodspin/plt-375
plt-375 - Making modals compatible with themes
2015-10-05 10:17:52 -04:00
JoramWilander
2a23d90ca6 Add config options for overriding username and icon, and add BOT indicator next to webhook posts. 2015-10-05 08:46:23 -04:00
Asaad Mahmood
fef9947757 Updating jpg to png for theme names 2015-10-05 06:34:35 +05:00
Asaad Mahmood
d8c5c4f746 Merge branch 'master' of https://github.com/mattermost/platform into plt-375
Conflicts:
	web/react/components/user_settings/user_settings_appearance.jsx
2015-10-02 22:26:28 +05:00
=Corey Hulen
4452bb7988 Fixing issues 2015-10-02 09:13:30 -07:00
=Corey Hulen
b2052de746 Merge branch 'master' into PLT-462 2015-10-02 08:36:56 -07:00
JoramWilander
11903a3834 Add ability to override username and icon for posts from incoming webhooks. 2015-10-02 11:08:00 -04:00
Harrison Healey
2f60ab82a8 Merge pull request #909 from mattermost/plt-446
PLT-446 Added help text to incoming webhooks.
2015-10-02 09:50:15 -04:00
it33
95fe16e0d9 Change text to avoid confusion with Slack Import 2015-10-02 06:23:26 -07:00
JoramWilander
28e84f1d13 Added help text for incoming webhooks. 2015-10-02 09:18:19 -04:00
hmhealey
c4203d8cd9 Removed $ from time tooltip 2015-10-02 08:54:31 -04:00
Joram Wilander
08d390953a Merge pull request #881 from hmhealey/plt194
PLT-194 Changes to ChannelMember notification settings
2015-10-02 08:45:38 -04:00
=Corey Hulen
430806301d PLT-44 allow team switching without the need to login 2015-10-01 17:52:47 -07:00
=Corey Hulen
9d688821aa PLT-462 Adding diagnostic info 2015-10-01 13:02:04 -07:00
hmhealey
c9a0030551 Moved ChannelMember.NotifyLevel into ChannelMember.NotifyProps 2015-10-01 08:31:17 -04:00
hmhealey
c16b9de8dc Replaced ChannelMember.MarkUnreadLevel with ChannelMember.NotifyProps 2015-10-01 08:31:11 -04:00
Christopher Speller
be300b7e7d Merge pull request #859 from mattermost/PLT-409
PLT-409 add warning to at rest salt gen
2015-10-01 07:27:32 -04:00
Asaad Mahmood
813792dd60 pot-375 - Making modals compatible with themes 2015-10-01 09:33:21 +05:00
Christopher Speller
46f86e7076 Merge pull request #867 from chengweiv5/team-name
Team name
2015-09-30 11:43:05 -04:00
Asaad Mahmood
71dba4abcf Updating slack import UI with states 2015-09-30 19:35:35 +05:00
Asaad Mahmood
296b930768 Merge branch 'master' of https://github.com/mattermost/platform into plt-383 2015-09-30 19:30:45 +05:00