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

290 Коммитов

Автор SHA1 Сообщение Дата
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
hmhealey
7c319f0524 Removed UI for quiet mode and added UI to set when a channel will be marked unread in the sidebar 2015-09-30 09:59:58 -04:00
=Corey Hulen
0da42c5559 PLT-345 adding client side logging 2015-09-29 15:55:19 -07:00
=Corey Hulen
0c4227994b PLT-435 adding system console link to RHS 2015-09-29 13:16:55 -07:00
Christopher Speller
942702ff1a Merge release branch 'release-1.0.0' 2015-09-29 15:34:21 -04:00
Corey Hulen
e937beb51b Merge pull request #848 from mattermost/plt-488
PLT-488 Update incoming webhooks to hide DMs and accept direct JSON payloads.
2015-09-29 11:31:54 -07:00
Asaad Mahmood
1a12d409fa Removing command styles 2015-09-29 23:28:37 +05:00
Asaad Mahmood
0f2959922c Removing mentions changes since they're for a master 2015-09-29 23:27:29 +05:00
Asaad Mahmood
189dc12146 Updating placeholder text in responsive 2015-09-29 23:21:45 +05:00
Corey Hulen
317dc0ea26 Merge pull request #843 from rgarmsen2295/plt-138
PLT-138 Better parsing of the site's title when viewing a channel
2015-09-29 09:46:37 -07:00
Reed Garmsen
558f8a322f Removed unused title update code 2015-09-29 08:51:36 -07:00
Asaad Mahmood
3e77df8532 plt-479 - Fixing command lists and also making them theme compatible 2015-09-29 19:23:21 +05:00
JoramWilander
a9f5918a9d Update incoming webhooks to hide DMs and accept direct JSON payloads. 2015-09-29 08:38:26 -04:00
hmhealey
fdc0851be5 Changed mobile search bar to use the colour of the sidebar header 2015-09-28 15:47:32 -04:00
JoramWilander
102b3b5ae6 Fix youtube minor scrolling bug. 2015-09-28 08:33:23 -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