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
3,037 Commits 845 Branches 1,202 Tags
76e278a13de936c09068ad1c2c2a16be0c419249
Commit Graph

328 Commits

Author SHA1 Message Date
Stas Vovk
76e278a13d added display tab under account settings. added 24h time option 2015-10-14 20:36:12 +03:00
Asaad Mahmood
99f243b444 Multiple UI Improvements 2015-10-14 17:04:13 +05:00
Harrison Healey
56b02f2eba Merge pull request #968 from hmhealey/plt322 
PLT-322 Updated Direct Messages menu
 2015-10-13 18:23:53 -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
hmhealey
2a39e8dbfa Removed Preference.AltId 2015-10-13 12:29:31 -04:00
Joram Wilander
f641f83ff9 Merge pull request #1026 from asaadmahmoodspin/master 
Fixing code block markdown
 2015-10-13 10:11:03 -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
599644fb2f Renamed show_hide preference to show 2015-10-13 09:42:25 -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
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
Asaad Mahmood
527e99f8d2 Fixing code block markdown 2015-10-13 14:33:37 +05:00
Asaad Mahmood
fd4bfee6ea Multiple UI Improvements 2015-10-12 19:22:05 +05:00
hmhealey
787d2ef7bc Modified markdown lexer to not break up words written in snake_case 2015-10-09 16:30:57 -04:00
hmhealey
3c489518e6 Fixed html used for autolinking 2015-10-08 15:59:21 -04:00
Harrison Healey
7dde0211c5 Merge pull request #982 from hmhealey/plt547 
PLT-547 Changed emoticons so that they must be surrounded by whitespace
 2015-10-08 13:19:39 -04:00
Christopher Speller
806fd77ec9 Merge pull request #981 from mattermost/plt-517 
PLT-517 Changing SpinPunch to Mattermost in copyright
 2015-10-08 12:55:11 -04:00
hmhealey
fa8a1ca098 Fixed parsing of :'( emoticon 2015-10-08 12:43:25 -04:00
hmhealey
5bcba280c6 Changed emoticons so that they much be surrounded by whitespace 2015-10-08 12:43:25 -04:00
hmhealey
c25d2d1e99 Switched :p emoticon 2015-10-08 12:43:25 -04:00
=Corey Hulen
e640bf7b6c Fixing issue with lastIndexOf 2015-10-08 09:34:49 -07:00
Christopher Speller
b85b529373 Changing SpinPunch to Mattermost in copyright 2015-10-08 12:27:09 -04:00
=Corey Hulen
d412144f88 Adding removing blank target for browser links 2015-10-08 09:14:13 -07:00
=Corey Hulen
f548e0ffb9 PLT-567 auto join open channels 2015-10-07 17:13:55 -07:00
Corey Hulen
c189e2bb76 Merge pull request #951 from mattermost/PLT-500 
PLT-500 fixing connection msg issues
 2015-10-07 09:33:59 -07: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
Asaad Mahmood
698ca63d99 PLT-522 - Adding option for mentionHighlightLink for themes 2015-10-07 14:41:24 +05:00
=Corey Hulen
4345dce3b8 PLT-500 fixing connection msg issues 2015-10-06 16:17:27 -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
Asaad Mahmood
d452523b07 PLT-451 - Adding visual effect for logout active sessions button 2015-10-06 21:34:16 +05: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
3a9140761b Updating form-control focus 2015-10-06 17:29:50 +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
Harrison Healey
da61bb38ff Merge pull request #925 from asaadmahmoodspin/ui-improvements 
Multiple UI Improvements
 2015-10-05 16:12:29 -04:00
Asaad Mahmood
e7d7892fd7 Multiple UI Improvements 2015-10-05 22:32:26 +05: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
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
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
hmhealey
fe8c04c973 Added emailto: to the beginning of email links 2015-10-02 09:18:45 -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
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
9ce826863b Merge pull request #866 from mattermost/PLT-345 
PLT-345 adding client side logging
 2015-10-01 07:26:54 -04:00
Asaad Mahmood
813792dd60 pot-375 - Making modals compatible with themes 2015-10-01 09:33:21 +05:00
Asaad Mahmood
62f7e7c03e Adding a quick fix for search bar bg related to themes 2015-09-30 19:45:06 +05:00
hmhealey
1010681407 Added channel id to updateLastViewed api calls to prevent multiple updates to different channels from clashing 2015-09-30 09:59:59 -04:00