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

105 Коммитов

Автор SHA1 Сообщение Дата
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
Christopher Speller
1571a9a2df Fixing most deprication warnings 2015-10-15 15:00:28 -04:00
Stas Vovk
76e278a13d added display tab under account settings. added 24h time option 2015-10-14 20:36:12 +03: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
Christopher Speller
b85b529373 Changing SpinPunch to Mattermost in copyright 2015-10-08 12:27:09 -04:00
it33
b7897ac331 Tweaking welcome text in Town-Square 2015-10-08 08:42:45 -07:00
Harrison Healey
e2e00d9d43 Merge pull request #922 from mattermost/plt-360
PLT-360 Upgrade and changes to ESLint
2015-10-05 16:02:09 -04: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
JoramWilander
2a23d90ca6 Add config options for overriding username and icon, and add BOT indicator next to webhook posts. 2015-10-05 08:46:23 -04:00
JoramWilander
11903a3834 Add ability to override username and icon for posts from incoming webhooks. 2015-10-02 11:08:00 -04:00
JoramWilander
c17310d011 Fix scrolling related to RHS. 2015-09-29 07:54:55 -04:00
Christopher Speller
425797eb38 Partial fix to scrolling issues. No longer jumps up from the bottom when RHS opens 2015-09-25 12:30:36 -04:00
Chengwei Yang
f7a32fa38a PLT-126: Change 'Private Messages' to 'Direct Messages'
Signed-off-by: Chengwei Yang <yangchengwei@qiyi.com>
2015-09-23 22:43:14 +08:00
JoramWilander
3e868a6042 Fix first channel load scrolling issue on Windows and iOS and add emoji to RHS. 2015-09-21 11:30:08 -04:00
=Corey Hulen
804b696bdc PLT-11 adding config for logs to UI 2015-09-17 22:00:33 -07:00
=Corey Hulen
b2a679c25d PLT-93 cleaing up client side configs 2015-09-15 18:59:14 -07:00
JoramWilander
83931da9f2 Fix load more posts bug. 2015-09-11 08:38:18 -04:00
JoramWilander
d30426ce17 Fix race condition where switching between two channels that both had new messages sometimes caused improper scrolling. 2015-09-09 11:28:53 -04: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
Christopher Speller
4b22c1f99c Upgrading ESLint and adding some more rules. Refactoring to meet these new rules 2015-09-03 15:00:47 -04:00
Reed Garmsen
96aa78c971 Fixed some react warnings involving missing keys in render arrays 2015-09-02 15:57:32 -07:00
Christopher Speller
f79eea1854 Moving config.js to /web/react/utils/ Including in every file needed 2015-09-02 16:49:32 -04:00
hmhealey
a020391d93 Replaced broken remaining calls to getDOMNode with React.findDOMNode 2015-09-02 15:56:13 -04:00
=Corey Hulen
f578bb1e48 MM-2065 style refactoring 2015-09-01 17:06:31 -07:00
Christopher Speller
b2cc9da96e Merge pull request #497 from nickago/MM-1842
MM-1842 Added invite link to off-topic channel
2015-08-31 09:04:03 -04:00
Christopher Speller
227e27f2da Revert "MM-2046 - Updating postHolder scroll" 2015-08-31 07:39:06 -04:00
Corey Hulen
d7164fdd47 Merge pull request #521 from rgarmsen2295/mm-2044
MM-2044 Removes ability to auto-scroll to new messages in ie10/11 to fix rendering issue
2015-08-30 20:58:56 -07:00
Corey Hulen
9ed32b2128 Merge pull request #518 from asaadmahmoodspin/MM-2046
MM-2046 - Updating postHolder scroll
2015-08-30 20:57:37 -07:00
Reed Garmsen
d295e94c3a Removes ability to auto-scroll to new messages in ie10/11 to fix rendering issue 2015-08-30 10:26:15 -07:00
Asaad Mahmood
5588a2a909 MM-2046 - Updating postHolder scroll 2015-08-28 22:38:52 +05:00
JoramWilander
aa27bdc297 First post list on page load will show loading screen until latest posts are grabbed from the server. 2015-08-28 12:52:11 -04:00
nickago
aafe39bd66 Added invite link to off-topic channel 2015-08-27 10:24:31 -07:00
JoramWilander
041d89b85a Refactored post handling/updating on both the client and server. 2015-08-27 08:21:26 -04:00
Asaad Mahmood
3a76e82cdb Updating intro text for channels 2015-08-21 15:41:10 +05:00
Asaad Mahmood
701cbfa94a Multiple UI Improvements 2015-08-21 15:41:10 +05:00
Joram Wilander
343ff54a32 Revert "Multiple UI Improvements" 2015-08-20 11:58:50 -04:00
Asaad Mahmood
1fd26d25f2 Multiple UI Improvements 2015-08-20 19:22:56 +05:00
Christopher Speller
65f1d0297e Merge pull request #406 from mattermost/mm-1281
MM-1281 Track channel creator in DB and show in channel intro message
2015-08-19 14:15:01 -04:00
Joram Wilander
a0a951a069 Merge pull request #398 from mattermost/mm-1593
MM-1593 Added a message deleted indicator
2015-08-19 11:15:58 -04: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
a6fea82786 Fixes new message indicator not appearing. 2015-08-19 09:37:53 -04:00
JoramWilander
11247061b5 Track channel creator in DB and show in channel intro message. 2015-08-19 08:31:20 -04:00
JoramWilander
8fa7a4251a Fix a bad merge that had edited posts being handled sloppily. 2015-08-18 12:08:53 -04:00
JoramWilander
f4c2a9244c reformat post_list.jsx to match style guide more closely 2015-08-18 09:02:00 -04:00
JoramWilander
c9bb7e85f7 fix minor issues caused by rebase 2015-08-18 08:59:27 -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
32f7b50bb5 adds predictive posting on the client 2015-08-18 08:58:02 -04:00
Christopher Speller
4805608cc9 Merge pull request #391 from asaadmahmoodspin/master
Multiple UI changes
2015-08-18 08:56:24 -04:00
Asaad Mahmood
f68a8c8de3 Multiple UI changes 2015-08-18 11:58:15 +05:00
nickago
602bcc4f38 Moved controlling CSS into post list so it always shows up 2015-08-17 13:23:58 -07:00