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 |
|
=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 |
|
hmhealey
|
2eb320f48a
|
Changed markdown link parsing to automatically add an explicit protocol to urls
|
2015-09-19 10:39:55 -04:00 |
|
hmhealey
|
efb3462a68
|
Prevented our url autolinking from breaking markdown links
|
2015-09-19 10:39:51 -04:00 |
|
hmhealey
|
bb330b662a
|
Added marked library to text_formatting.jsx
|
2015-09-19 10:08:59 -04:00 |
|
hmhealey
|
ae5a1e3ea8
|
Removed underscores surrounding formatting tokens since they won't work with markdown
|
2015-09-19 10:08:59 -04:00 |
|
hmhealey
|
208bf914b8
|
Removed unnecessary conversion of newlines to html line breaks
|
2015-09-19 10:08:59 -04:00 |
|
=Corey Hulen
|
cdf813f07b
|
merging
|
2015-09-18 09:25:47 -07:00 |
|
hmhealey
|
bc8e69d99f
|
Fixed incorrect check if a url starts with an explicit protocol
|
2015-09-18 11:56:23 -04:00 |
|
=Corey Hulen
|
804b696bdc
|
PLT-11 adding config for logs to UI
|
2015-09-17 22:00:33 -07:00 |
|
=Corey Hulen
|
44714dfcb1
|
PLT-11 Adding ability to save config file
|
2015-09-17 21:00:59 -07:00 |
|
Christopher Speller
|
b1f26540ce
|
Merge pull request #693 from mattermost/mm-1419
Implement OAuth2 service provider functionality.
|
2015-09-16 16:26:56 -04:00 |
|
JoramWilander
|
47e6a33a45
|
Implement OAuth2 service provider functionality.
|
2015-09-16 15:49:12 -04:00 |
|
Corey Hulen
|
4e11fa23d7
|
Merge pull request #695 from hmhealey/startswith
Replaced instances of startsWith with lastIndexOf in TextFormatting
|
2015-09-16 11:17:25 -07:00 |
|
hmhealey
|
60d2cff723
|
Replaced instances of startsWith with lastIndexOf in TextFormatting
|
2015-09-16 14:08:10 -04:00 |
|
=Corey Hulen
|
d625e62d96
|
Finished removing some of the last bits of client side config
|
2015-09-15 19:29:00 -07:00 |
|
=Corey Hulen
|
5e2f701e6c
|
Removing old config stuff
|
2015-09-15 19:09:50 -07:00 |
|
=Corey Hulen
|
b2a679c25d
|
PLT-93 cleaing up client side configs
|
2015-09-15 18:59:14 -07:00 |
|
=Corey Hulen
|
788fc4373b
|
removing loggly
|
2015-09-15 14:20:25 -07:00 |
|