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

69 Коммитов

Автор SHA1 Сообщение Дата
=Corey Hulen
36658c13a4 Fixing merge conflicts 2015-10-19 11:42:40 -07:00
Harrison Healey
d139c9e825 Merge pull request #1108 from mattermost/plt-235
PLT-235 Implement outgoing webhooks.
2015-10-19 14:24:02 -04:00
=Corey Hulen
468f01dc89 Merging from master 2015-10-19 10:25:51 -07:00
JoramWilander
af6e2c29eb Implement outgoing webhooks. 2015-10-19 09:00:30 -04:00
=Corey Hulen
8b2d7f391a Fixing merge 2015-10-16 09:12:30 -07:00
=Corey Hulen
6a1755d2e3 Inital support for multi-tab loging 2015-10-16 09:10:54 -07:00
JoramWilander
20723437aa Fix typing socket constant 2015-10-16 11:48:55 -04:00
JoramWilander
2b5ec4a3c0 Small refactor of websocket code on client and server 2015-10-16 11:48:55 -04:00
Stas Vovk
79fcb98084 Merge remote-tracking branch 'upstream/master' into PLT-637
Conflicts:
	web/react/utils/constants.jsx
2015-10-16 14:21:51 +03:00
Florian Orben
551b07960e PLT-74: Enable Up Arrow keyboard shortcut to edit your last message 2015-10-15 21:25:31 +02:00
Stas Vovk
76e278a13d added display tab under account settings. added 24h time option 2015-10-14 20:36:12 +03:00
hmhealey
2a39e8dbfa Removed Preference.AltId 2015-10-13 12:29:31 -04:00
hmhealey
599644fb2f Renamed show_hide preference to show 2015-10-13 09:42:25 -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
Asaad Mahmood
fd4bfee6ea Multiple UI Improvements 2015-10-12 19:22:05 +05:00
Christopher Speller
b85b529373 Changing SpinPunch to Mattermost in copyright 2015-10-08 12:27:09 -04: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
Asaad Mahmood
d99aea1502 Removing sidebar text hover color 2015-10-06 22:33:30 +05:00
Asaad Mahmood
a0a32bb608 Updating link color opacity in LHS 2015-10-06 22:25:22 +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
Asaad Mahmood
813792dd60 pot-375 - Making modals compatible with themes 2015-10-01 09:33:21 +05:00
JoramWilander
a9f5918a9d Update incoming webhooks to hide DMs and accept direct JSON payloads. 2015-09-29 08:38:26 -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
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
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
5183103e8f plt-363 - Adding organisation theme 2015-09-24 18:55:53 +05:00
=Corey Hulen
7f3bfdbe0c Fixing merge 2015-09-23 14:38:34 -07:00
=Corey Hulen
1626a6de6f PLT-349 adding team mgt to admin console 2015-09-23 12:49:28 -07:00
JoramWilander
e4a15076f4 Implement UI theme colors. 2015-09-23 10:12:40 -04:00
=Corey Hulen
e06e292be7 PLT-12 adding log viewer 2015-09-10 18:32:22 -07:00
JoramWilander
5c0680397d Add post list container to hold mounted post lists for faster rendering/channel switching. 2015-09-08 10:11:57 -04:00
nickago
c81efd1391 Added emoji wrapper with cross platform available gliffs 2015-09-03 09:35:40 -07:00
Christopher Speller
0ffb8e6203 Cosmetic refactoring for ESLint 2015-09-02 10:49:01 -04:00
JoramWilander
4ea9635b50 Remove Google as a SSO service. 2015-08-28 10:02:45 -04:00
JoramWilander
f5fec3a157 Added the ability to create a team with SSO services and added the ability to turn off email sign up. 2015-08-28 08:37:55 -04:00
Reed Garmsen
5766bbfc65 Prevents users from typing more than 4000 characters into any 'textbox' (posts, comments, and post/comment edits). Also adds new error message for when users hit exactly 4000 characters so they know the limit. 2015-08-25 09:40:08 -07:00
JoramWilander
cc40ca1ac0 Added a message deleted indicator when a post is deleted to let the user know what's happening. 2015-08-19 09:52:03 -04:00
JoramWilander
fa1491bbfb finalize implenetation of predictive client posts so that users get immediate feedback after posting 2015-08-18 08:59:26 -04:00
JoramWilander
b704e9489b added google sign-in functionality to the client, with minor model modifications 2015-08-14 12:38:16 -04:00
Christopher Speller
92c4df5b10 Merge pull request #370 from hmhealey/mm1812
MM-1812 Provide warnings on team invite screens when email is disabled
2015-08-14 08:48:24 -04:00
Christopher Speller
a8930cbabe Merge pull request #365 from mattermost/mm-1700
MM-1700 don't pull all channel data all the time
2015-08-14 08:35:19 -04:00
hmhealey
ca919538cc Added ConfigStore that is populated from the server 2015-08-13 13:01:21 -04:00
nickago
a60d774634 Added jpeg's to list of image types 2015-08-11 11:49:13 -07:00
JoramWilander
1c0ee4d2f6 added getChannel api service and use that over getChannels where appropriate on client 2015-08-11 12:09:54 -04:00
nickago
8b11293341 Changed max number of displayed direct message channels to 20 2015-08-05 08:11:43 -07:00
Corey Hulen
2aba63df8e Merge pull request #302 from hmhealey/mm1788
MM-1788 Removed ^replying in preparation for 0.6.0
2015-08-02 09:00:13 -08:00