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

1280 Коммитов

Автор SHA1 Сообщение Дата
=Corey Hulen
54894e90ac Fixing merge conflict 2015-10-22 09:19:18 -07: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
Asaad Mahmood
e48614d6ce PLT-318 - Updating files overlay design 2015-10-20 18:31:34 +05: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
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
Joram Wilander
714bff1595 Merge pull request #1096 from rgarmsen2295/plt-153
PLT-153 Added better recognition of Android devices in the Active Sessions UI
2015-10-17 12:17:36 -04:00
Joram Wilander
7b6121eae8 Merge pull request #1097 from rgarmsen2295/plt-693
PLT-693 Fixes back button on username page during team signup when email is turned off
2015-10-17 12:15:56 -04:00
Florian Orben
aa40f88bbb PLT-463: Remove AUTHOR from YouTube preview not helpful and takes up too much room 2015-10-17 02:52:46 +02:00
Reed Garmsen
5f45556b43 Fixes back button on username page during team signup when email is turned off 2015-10-16 14:50:45 -07:00
Reed Garmsen
09514fb9f5 Added proper recognition of android devices in the Active Sessions UI 2015-10-16 14:21:46 -07:00
Asaad Mahmood
7849a48a85 Merge branch 'master' of https://github.com/mattermost/platform into ui-improvements
Conflicts:
	web/react/components/popover_list_members.jsx
	web/react/components/user_profile.jsx
2015-10-16 23:19:23 +05: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
Christopher Speller
495673d80d Fixing some client warnings 2015-10-16 10:50:10 -04:00