IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity
2,817 Commits 845 Branches 1,202 Tags
1421e1ec4aa09c0e7094643d342d095cdd91d506
Commit Graph

1315 Commits

Author SHA1 Message Date
JoramWilander
1421e1ec4a Fix user_added websocket event and update websocket channel access cache on add/remove member. 2015-10-07 11:39:45 -04:00
Christopher Speller
08496a7c14 Merge pull request #949 from mattermost/PLT-478 
PLT-478 partial fix for local storage getting filled up.  This will b…
 2015-10-07 08:31:50 -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
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
=Corey Hulen
8de30c804f PLT-478 partial fix for local storage getting filled up. This will be fixed for good with multi-login stuff 2015-10-06 13:20:46 -07:00
Asaad Mahmood
d99aea1502 Removing sidebar text hover color 2015-10-06 22:33:30 +05:00
Asaad Mahmood
15269c539a Changing link colour opacity LHS 2015-10-06 22:27:05 +05:00
Asaad Mahmood
a0a32bb608 Updating link color opacity in LHS 2015-10-06 22:25:22 +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
Corey Hulen
c71f56a666 Merge pull request #941 from hmhealey/plt515 
PLT-515 Hide Copy Link button when unable to copy the team signup link
 2015-10-06 08:47:49 -07: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
3d8de4c435 PLT-432 - Status icon for active LHS item the same as text color 2015-10-06 19:27:21 +05:00
Asaad Mahmood
74b3338bc7 Admin console UI Improvements 2015-10-06 19:14:35 +05:00
Christopher Speller
22c18b5ff6 Merge pull request #935 from mattermost/remove-zeroclipboard 
Remove npm reference to unused zeroclipboard.
 2015-10-06 09:35:14 -04:00
Christopher Speller
32db91463b Merge pull request #934 from asaadmahmoodspin/ui-improvements 
Multiple UI Improvements
 2015-10-06 09:34:36 -04: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
Asaad Mahmood
3a9140761b Updating form-control focus 2015-10-06 17:29:50 +05:00
JoramWilander
43760503e7 Remove npm reference to unused zeroclipboard. 2015-10-06 08:16:20 -04:00
Asaad Mahmood
17681c2b18 Merge branch 'master' of https://github.com/mattermost/platform into ui-improvements 2015-10-06 17:10:27 +05:00
Asaad Mahmood
06fbb8b7df Adding mention highlight setting and improving search highlight too 2015-10-06 10:04:39 +05:00
Asaad Mahmood
8c7f4672eb Multiple UI Improvements 2015-10-06 09:37:11 +05: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
515d709c2e Merge pull request #915 from mattermost/plt-300 
PLT-300 Update allow/deny oauth page UI, and add ouath as reserved word.
 2015-10-05 10:32:27 -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
89d6613b93 Updating theme colours for popovers, drop downs etc 2015-10-05 08:04:32 +05:00
Asaad Mahmood
74fecd1952 Updating search colours 2015-10-05 06:43:08 +05: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
JoramWilander
6221927351 Update allow/deny oauth page UI, and add ouath as reserved word. 2015-10-02 12:47:54 -04: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