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,584 Commits 845 Branches 1,202 Tags
e768b30e9eaa54c20199a1a8bd40bbcd9da93432
Commit Graph

265 Commits

Author SHA1 Message Date
hmhealey
fdc0851be5 Changed mobile search bar to use the colour of the sidebar header 2015-09-28 15:47:32 -04:00
it33
93255ab44b Renaming "Windows 10 Dark" to "Windows Dark" 2015-09-25 23:15:58 -07:00
Corey Hulen
4b93705579 Merge pull request #813 from asaadmahmoodspin/plt-366 
PLT-366 - Adding Windows 10 dark theme.
 2015-09-25 14:28:40 -07:00
Corey Hulen
63960fae09 Merge pull request #811 from mattermost/plt-45 
PLT-45 Force videos to be set dimensions.
 2015-09-25 11:01:31 -07:00
Asaad Mahmood
4667d8c61e Merge branch 'master' of https://github.com/mattermost/platform into plt-366 2015-09-25 22:44:55 +05:00
Asaad Mahmood
9d1dddb7f4 plt-366 - Adding Windows 8 theme 2015-09-25 22:44:36 +05:00
JoramWilander
a20c63ff35 Force videos to be set dimensions. 2015-09-25 12:55:27 -04:00
Corey Hulen
30bc17a740 Merge pull request #808 from mattermost/fixing-redirect2 
fixing more redirect places
 2015-09-25 09:54:25 -07:00
=Corey Hulen
ad346f8734 fixing more redirect places 2015-09-25 09:16:26 -07:00
Christopher Speller
e743ad483a Merge pull request #794 from mattermost/PLT-157 
PLT-157 Fixing blue bar and renders warning when mis-configured.
 2015-09-25 11:31:47 -04:00
Christopher Speller
c81fbc6d95 Merge pull request #797 from asaadmahmoodspin/bug-fixes 
Bug fixes and UI improvements for multiple tickets
 2015-09-25 11:29:11 -04:00
Corey Hulen
ab7b36089c Merge pull request #803 from mattermost/plt-405 
PLT-405 Fixes youtube videos causing random scrolling.
 2015-09-25 08:14:20 -07:00
=Corey Hulen
d989be85cb Merge branch 'master' into PLT-157 2015-09-25 08:11:01 -07:00
Asaad Mahmood
7964150cb2 Merge branch 'master' of https://github.com/mattermost/platform into bug-fixes 2015-09-25 18:15:44 +05:00
JoramWilander
a45095c0b6 Fixes youtube videos causing random scrolling. 2015-09-25 09:03:07 -04:00
mishimi
b86833f0c5 PLT 381 In Theme Color settings, change the "Button Color" to "Button Text" 
Also made the following changes
1. Capitalize all words
2. Remove the word "color" if it comes after "text"
Ex. Sidebar text color --> Sidebar Text
 2015-09-25 05:23:04 -07:00
Asaad Mahmood
b1a7225f30 Bug fixes and UI improvements for multiple tickets 2015-09-25 16:38:11 +05:00
=Corey Hulen
04c12ba58e Fixing blue bar and renders warning when mis-configured. 2015-09-24 15:06:54 -07:00
=Corey Hulen
8ad9a88bda Fixing merge 2015-09-24 12:12:27 -07:00
hmhealey
fe55c77a41 Removed smilies that start with a semicolon 2015-09-24 13:56:14 -04:00
=Corey Hulen
a374419ad5 Removing old valet crud 2015-09-24 10:52:32 -07:00
Asaad Mahmood
5183103e8f plt-363 - Adding organisation theme 2015-09-24 18:55:53 +05:00
Christopher Speller
54c7dba33d Merge pull request #765 from mattermost/PLT-349 
PLT-349 adding team mgt to admin console
 2015-09-24 08:14:30 -04:00
Joram Wilander
56f76502e3 Merge pull request #769 from hmhealey/plt334 
PLT-334 Restricted markdown output to only appear on one line when in singleline mode
 2015-09-24 08:14:25 -04:00
hmhealey
466f470ff1 Changed Markdown links to open in a new tab 2015-09-23 17:53:46 -04:00
hmhealey
511fcce553 Restricted markdown output to only appear on one line when in singleline mode 2015-09-23 17:42:57 -04:00
=Corey Hulen
7f3bfdbe0c Fixing merge 2015-09-23 14:38:34 -07:00
=Corey Hulen
2b5b8f95ed Merge branch 'master' into PLT-11-email 2015-09-23 12:55:58 -07:00
=Corey Hulen
1626a6de6f PLT-349 adding team mgt to admin console 2015-09-23 12:49:28 -07:00
Harrison Healey
15f15de8ca Merge pull request #759 from mattermost/plt-242-3 
PLT-242 Implement custom UI theme colors.
 2015-09-23 15:04:22 -04:00
JoramWilander
e4a15076f4 Implement UI theme colors. 2015-09-23 10:12:40 -04:00
hmhealey
018b036e5d Added CSS classes to markdown headings, links, and tables 2015-09-23 09:37:48 -04:00
Joram Wilander
7eef5be359 Merge pull request #740 from asaadmahmoodspin/ui-improvements 
UI Modifications for multiple tickets
 2015-09-23 08:41:17 -04:00
Christopher Speller
bdd0cfd227 Merge pull request #751 from hmhealey/plt344 
PLT-344 Restore emoticon handling to text_formatting.jsx and fix it's interaction with other formatting
 2015-09-23 08:27:12 -04:00
=Corey Hulen
6e60768abe Fixing merge conflict 2015-09-22 13:18:42 -07:00
Joram Wilander
ac7918c554 Merge pull request #715 from mattermost/plt-27 
PLT-27 Implement incoming webhooks.
 2015-09-22 15:47:57 -04:00
=Corey Hulen
88e5a71e8c Adding service settings to admin console 2015-09-22 12:12:50 -07:00
hmhealey
55f11ba871 Removed extra handling of markdown links when doing autolinking 2015-09-22 14:34:59 -04:00
hmhealey
1afa1d37c7 Moved text formatting code to only occur inside of markdown text nodes 2015-09-22 14:30:50 -04:00
hmhealey
d025da5da9 Changed hashtag regex to only accept hashtags that begin with a letter 2015-09-22 14:28:43 -04:00
hmhealey
1709532ae6 Moved emoticon parsing to happen after url parsing so that we don't have smilies accidentally occuring in urls 2015-09-22 14:14:54 -04:00
hmhealey
ffe34aa154 Restored changes which remove emojify and switch to our own version 2015-09-22 13:53:43 -04:00
Christopher Speller
e7d408585a Revert "PLT-289 Added parsing for named emojis to TextFormatting and removed emojify" 2015-09-22 13:21:58 -04:00
hmhealey
251d33ad23 Added parsing for named emojis to TextFormatting and removed dependency on emojify 2015-09-22 09:22:49 -04:00
Asaad Mahmood
38cc148574 UI Modifications for multiple tickets 2015-09-22 11:21:28 +05:00
=Corey Hulen
ed9a2da83b Adding email to admin console 2015-09-21 15:11:56 -07:00
JoramWilander
98186e5018 Implement incoming webhooks. 2015-09-21 14:22:23 -04:00
hmhealey
a2e3446e37 Added theme class to markdown links 2015-09-21 11:46:29 -04:00
hmhealey
144a277a44 Cleaned up markdown formatting code and removed debug statements 2015-09-19 11:18:37 -04:00
hmhealey
5f18c71d07 Deferred to marked.js's html sanitization when markdown is enabled 2015-09-19 11:18:32 -04:00