mirrors/mostlymatter
1
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность
3 248 коммитов 3 Ветки 0 Теги
54894e90ac705eab3bf0f34c8dd197bb0929feae
Граф коммитов

1523 Коммитов

Автор SHA1 Сообщение Дата
=Corey Hulen
54894e90ac Fixing merge conflict 2015-10-22 09:19:18 -07:00
hmhealey
25e018ece0 Changed markdown renderer to only parse emoticons twice 2015-10-22 09:47:28 -04:00
hmhealey
74402df462 Fixed improperly quoted html attributes for emoticons 2015-10-22 09:47:04 -04:00
Harrison Healey
14e24650c5 Merge pull request #1135 from trashcan/PLT-521 
PLT-521: Fix emoji with underscores
 2015-10-22 09:39:47 -04:00
Pat Lathem
fba89915ac Pass eslint tests 2015-10-21 15:02:23 -05:00
Pat Lathem
8eb2c0266c Missing semicolon 2015-10-21 14:52:19 -05:00
Pat Lathem
9dd7a5e01e Remove stray emoticons.jsx import 2015-10-21 14:44:22 -05:00
Pat Lathem
7e24890bd3 Add a call to doFormatText inside of the markdown paragraph handler 2015-10-21 14:39:33 -05:00
Florian Orben
b9c637ec82 Change stop symbol to another one since chrome-win can't display it 2015-10-21 18:15:04 +02:00
Florian Orben
b00697a500 apply portrait/landscape/quadrat format to playing gif to always display it in best possible way 2015-10-21 18:13:59 +02:00
Florian Orben
cd5df514c7 Add stop button to stop animated gifs 2015-10-21 18:13:59 +02:00
Florian Orben
420c754ca3 Horizontally align images if image height > image width 2015-10-21 18:13:59 +02:00
Florian Orben
d167e18f00 PLT-616: Enable playing of animated GIF in thumbnails and preview 2015-10-21 18:13:59 +02:00
Christopher Speller
0e49acede9 Merge pull request #1131 from mattermost/PLT-350 
PLT-350 allow ability to disable restricted team names
 2015-10-21 11:31:31 -04:00
Harrison Healey
a4e6cce98e Merge pull request #1103 from florianorben/PLT-751 
PLT-751: Enable  arrow to edit posts in comment threads
 2015-10-21 11:27:27 -04:00
=Corey Hulen
b9ce4a644d PLT-350 allow ability to disable restricted team names 2015-10-20 17:30:24 -07:00
=Corey Hulen
c4c04e5f02 Fixing admin console 2015-10-20 16:19:41 -07:00
=Corey Hulen
636db0d2f2 fixing eslint errors 2015-10-20 15:02:15 -07:00
Corey Hulen
7ea8268ae8 Merge pull request #1120 from asaadmahmoodspin/ui-improvements 
PLT-318 - Updating files overlay design
 2015-10-20 14:52:18 -07:00
=Corey Hulen
e1f9459029 Merge branch 'master' into PLT-44 2015-10-20 14:50:03 -07:00
=Corey Hulen
1fc12dd8ba Multi-session login 2015-10-20 14:49:42 -07:00
Joram Wilander
4ed9a9ebca Merge pull request #1100 from girishso/wink_emoji 
PLT-699: translate ;) to wink emoji
 2015-10-20 12:37:51 -04:00
Asaad Mahmood
e48614d6ce PLT-318 - Updating files overlay design 2015-10-20 18:31:34 +05:00
=Corey Hulen
fa3a0df2b6 Adding multi-session cookie 2015-10-20 04:37:51 -07:00
Antti Ahti
d3f99e8217 Handle window resize events in React way 
Use the React-way of handling resize events. Essentially store the window size in component state instead of doing some custom handling.

See http://facebook.github.io/react/tips/dom-event-listeners.html
 2015-10-20 10:07:45 +03:00
Joram Wilander
b5b233f3f0 Merge pull request #1114 from asaadmahmoodspin/ui-improvements 
Ui improvements
 2015-10-19 15:35:07 -04:00
Florian Orben
27c2862c56 Allow to update root comment in RHS via arrow up shortcut 2015-10-19 21:06:09 +02:00
Florian Orben
58b57acfac PLT-751: Enable arrow to edit posts in comment threads 2015-10-19 21:04:09 +02:00
Asaad Mahmood
b950d99b3a Updating direct messages title 2015-10-19 23:59:17 +05:00
=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
Asaad Mahmood
5135986a3b Merge branch 'master' of https://github.com/mattermost/platform into ui-improvements 2015-10-19 22:59:01 +05:00
Asaad Mahmood
2d42aefeaf Multiple UI Improvements 2015-10-19 22:58:47 +05:00
=Corey Hulen
468f01dc89 Merging from master 2015-10-19 10:25:51 -07:00
Corey Hulen
ea1b312968 Merge pull request #1072 from mattermost/plt-554 
PLT-554 Small refactor of websocket code on client and server
 2015-10-19 09:56:34 -07:00
Joram Wilander
00c06fac43 Merge pull request #1107 from asaadmahmoodspin/ui-improvements 
Updating scroll on admin console
 2015-10-19 11:42:25 -04:00
Asaad Mahmood
cbbfe0112b Updating scroll on admin console 2015-10-19 20:10:33 +05:00
Harrison Healey
75da10fffa Merge pull request #1104 from florianorben/fix_arrow_left_right 
No longer try to navigate to next/prev image if image preview modal is not open
 2015-10-19 10:35:33 -04:00
Harrison Healey
9a71222db0 Merge pull request #1102 from florianorben/fix_email_tooltip 
Fixes wrong tooltip on user profile
 2015-10-19 10:10:35 -04:00
Harrison Healey
2d0b952941 Merge pull request #1101 from stasvovk/admin_console_urls 
#962: change url when a user navigates between tabs in admin console
 2015-10-19 10:10:09 -04:00
JoramWilander
182e59f2c0 Show/hide integrations properly based off config settings. 2015-10-19 09:00:30 -04:00
JoramWilander
5574151c85 Fix postgres query and minor UI updates for outgoing webhooks. 2015-10-19 09:00:30 -04:00
JoramWilander
af6e2c29eb Implement outgoing webhooks. 2015-10-19 09:00:30 -04:00
Asaad Mahmood
13a35539f3 Updating scroll on LHS 2015-10-19 14:36:31 +05:00
Florian Orben
bfba1d55ad No longer try to navigate to next/prev image if image preview modal is not open 2015-10-19 03:10:36 +02:00
Florian Orben
fd61bebe88 Fixes wrong tooltip on user profile 2015-10-19 01:22:19 +02:00
Stas Vovk
9fa3c996d5 change url when a user navigates between tabs [#962] 2015-10-18 18:55:04 +03:00
Asaad Mahmood
2a67116e71 Updating userEntries div to tr td 2015-10-18 20:03:34 +05:00
Asaad Mahmood
3a1636b7ce Merge branch 'master' of https://github.com/mattermost/platform into ui-improvements 2015-10-18 18:55:22 +05:00
Girish S
43b5f060c9 translate ;) to wink emoji 2015-10-18 09:33:47 +05:30