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

1659 Коммитов

Автор SHA1 Сообщение Дата
=Corey Hulen
fa3a0df2b6 Adding multi-session cookie 2015-10-20 04:37:51 -07: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
=Corey Hulen
097d17bf2c Fixing merge issue 2015-10-19 10:29:10 -07: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
JoramWilander
a3ca106740 Generalized webhook post code and added it to outgoing webhooks 2015-10-19 10:19:48 -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
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
=Corey Hulen
a8f3f76c59 Refactoring web classes to use multi-session 2015-10-16 19:05:55 -07: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
Pat Lathem
4e1e6b6354 Add semi-colon 2015-10-16 13:04:01 -05:00
Pat Lathem
6658d61e43 Add z-index to command-box so that elements behind it do not show through autocomplete popup 2015-10-16 12:54:55 -05:00
Joel Vasallo
6e350cb9b9 Updated Email Check Regex to RFC5322 Standard 2015-10-16 11:36:07 -05:00
Corey Hulen
3bd0a15341 Merge pull request #1089 from mattermost/client-warning-fixes 
Fixing some client warnings
 2015-10-16 09:15:30 -07: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
Harrison Healey
9c045f0d4b Merge pull request #1085 from mattermost/plt-633 
PLT-633 Add default username and icon to incoming webhooks.
 2015-10-16 11:59:34 -04: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
Joram Wilander
6846940abf Merge pull request #1083 from asaadmahmoodspin/ui-improvements 
Adding momentum scrolling on IOS
 2015-10-16 08:18:15 -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
JoramWilander
58c33f01d5 Add default username and icon to incoming webhooks. 2015-10-16 08:16:34 -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
Asaad Mahmood
12f47b1060 Adding momentum scrolling on IOS 2015-10-16 12:37:51 +05:00