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

1496 Коммитов

Автор SHA1 Сообщение Дата
=Corey Hulen
b9ce4a644d PLT-350 allow ability to disable restricted team names 2015-10-20 17:30:24 -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
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
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
Asaad Mahmood
b950d99b3a Updating direct messages title 2015-10-19 23:59:17 +05: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
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
Joram Wilander
7e457dd8d9 Merge pull request #1090 from jvasallo/master
Updated Email Check Regex to handle some extra cases
2015-10-17 12:24:45 -04: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
Joel Vasallo
6e350cb9b9 Updated Email Check Regex to RFC5322 Standard 2015-10-16 11:36:07 -05:00
JoramWilander
93eaa80a3b Remove unnecessary bind 2015-10-16 11:48:56 -04: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
Asaad Mahmood
e840cb612f Fixing more direct channel modal scrolling 2015-10-16 18:49:10 +05:00
Asaad Mahmood
0fbe63eb37 Merge branch 'master' of https://github.com/mattermost/platform into ui-improvements 2015-10-16 18:06:40 +05:00
Asaad Mahmood
b00ffa83e7 Multiple UI Improvements 2015-10-16 18:06:22 +05:00
Christopher Speller
89716cb046 Merge pull request #1054 from stasvovk/PLT-637
PLT-638: added display tab under account settings. added 24h time option
2015-10-16 08:22:37 -04:00
Christopher Speller
099d853877 Merge pull request #1079 from hmhealey/initprefs
Added an initial call to get all user preferences on page load
2015-10-16 08:16:40 -04:00
Joram Wilander
7718783d0c Merge pull request #1049 from apaatsio/full-teams-data
Use display name instead of name in team switcher menu
2015-10-16 07:57:38 -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
fcce3168b2 PLT-74: Enable Up Arrow keyboard shortcut to edit your last message
- fix bug where channel_id was not set if update_post ajax was "too fast"
- fix bug js error if there is no last post, i.e. empty channel
- renamed lastPostId to postId so it has a nicer api to be triggered from everywhere
- fix a typo
- automatically focus textarea on modal open
2015-10-15 21:25:31 +02:00
Florian Orben
551b07960e PLT-74: Enable Up Arrow keyboard shortcut to edit your last message 2015-10-15 21:25:31 +02:00
hmhealey
327b0b5a21 Added an initial call to get all user preferences on page load 2015-10-15 15:17:07 -04:00
Christopher Speller
8d630fc3ee Adding ReactDOM as a global 2015-10-15 15:00:28 -04:00
Christopher Speller
1571a9a2df Fixing most deprication warnings 2015-10-15 15:00:28 -04:00