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

4900 Коммитов

Автор SHA1 Сообщение Дата
Corey Hulen
060e38ef86 Merge pull request #1935 from hmhealey/plt1664
PLT-1664 Fix unread channel indicators so that they work on IE11
2016-01-21 09:02:36 -06:00
Corey Hulen
9aa23c1994 Merge pull request #1933 from hmhealey/plt1661
PLT-1661/PLT-1745 Scrolling fixes
2016-01-21 09:02:10 -06:00
Christopher Speller
c7faefbedc Merge pull request #1924 from loafoe/master
[#1923] Make Websocket ports configurable
2016-01-21 10:01:15 -05:00
Christopher Speller
868eece987 Merge pull request #1927 from rgarmsen2295/plt-1668
PLT-1668 Removes duplicate short username error message
2016-01-21 09:59:38 -05:00
Harrison Healey
2fdfdaeff7 Merge pull request #1922 from cloudron-io/check_auth_service
Check auth_service when constructing messages
2016-01-21 09:30:14 -05:00
Harrison Healey
c9c40bcb20 Merge pull request #1882 from trashcan/PLT-1232-more-channel-info
PLT-1232: More channel info
2016-01-21 09:25:08 -05:00
Joram Wilander
da7adcf0db Merge pull request #1893 from asaadmahmoodspin/ui-improvements
Updating logo
2016-01-21 07:09:02 -05:00
Joram Wilander
45e3a133f2 Merge pull request #1891 from trashcan/PLT-1515-password-change-wording
Improve wording of password change email to indicate that it might not be user initiated
2016-01-21 07:08:48 -05:00
Joram Wilander
45457a9d59 Merge pull request #1886 from rgarmsen2295/plt-549c
PLT-549 Fixed react warning issue with setState in RHS
2016-01-21 07:08:31 -05:00
Joram Wilander
202e00d8df Merge pull request #1885 from rgarmsen2295/plt-406
PLT-406 Fixes issues with drag and drop overlay in IE11
2016-01-21 07:08:17 -05:00
Joram Wilander
9163cd2548 Merge pull request #1884 from hmhealey/plt1403
PLT-1403 Removed incorrect test case for autolinking urls with angle brackets
2016-01-21 07:08:03 -05:00
Joram Wilander
7a25672dec Merge pull request #1883 from rosskusler/master
fixed typo in URL to emoji.codes
2016-01-21 07:07:47 -05:00
Joram Wilander
dd0f49e5ff Merge pull request #1867 from apskim/patch-1
Parse Slack links in the attachment pretext and fields (Fix #1868)
2016-01-21 07:07:28 -05:00
hmhealey
6b26aa9413 Changed UnreadChannelIndicator display style so that it uses a value that IE11 supports 2016-01-20 16:29:06 -05:00
Corey Hulen
9f526555df Merge pull request #1934 from mattermost/PLT-7-server-db
PLT-7-server-db
2016-01-20 15:14:31 -06:00
=Corey Hulen
d74e2f3e11 tweaking 2016-01-20 14:53:12 -06:00
=Corey Hulen
e70428c1bd tweak 2016-01-20 14:38:17 -06:00
=Corey Hulen
984fa7f1ca PLT-7-server-db 2016-01-20 14:36:34 -06:00
hmhealey
d72c7fd26b Removed incorrect test case for autolinking urls with angle brackets 2016-01-20 15:06:47 -05:00
hmhealey
e4cea41cbf Added a small margin where the PostsView will be considered to be at the bottom even if it's not exactly at the bottom 2016-01-20 14:58:32 -05:00
hmhealey
d8149fb269 Removed some vestigial code from the post textbox 2016-01-20 14:58:32 -05:00
hmhealey
e4e3178e94 Changed the post textbox resizing code to be more reliable and not rely on magic numbers 2016-01-20 14:58:32 -05:00
Corey Hulen
d703d09063 Merge pull request #1932 from mattermost/revert-1930-PLT-7-server-db
Revert "	PLT-7 adding loc for db calls"
2016-01-20 13:36:27 -06:00
Corey Hulen
aefbb541d0 Revert " PLT-7 adding loc for db calls" 2016-01-20 13:36:16 -06:00
Corey Hulen
0b1aff3b24 Merge pull request #1930 from mattermost/PLT-7-server-db
PLT-7 adding loc for db calls
2016-01-20 13:12:19 -06:00
=Corey Hulen
75f8729e2d PLT-7 adding loc db calls for users table 2016-01-20 12:43:44 -06:00
Reed Garmsen
76f0000565 Removed extraneous error when providing a short username 2016-01-20 08:43:14 -08:00
=Corey Hulen
aac8d121a0 PLT-7 adding loc db calls for posts table 2016-01-20 10:34:31 -06:00
=Corey Hulen
3ac5ecf0e9 PLT-7 adding loc db calls for session table 2016-01-20 10:18:11 -06:00
=Corey Hulen
11c035aef4 PLT-7 adding loc db calls for oauth table 2016-01-20 10:04:17 -06:00
=Corey Hulen
640d3018c9 PLT-7 adding loc db calls for oauth table 2016-01-20 08:56:09 -06:00
=Corey Hulen
ef11df7532 PLT-7 adding loc db calls for webhooks table 2016-01-20 08:44:05 -06:00
=Corey Hulen
5b2ec62347 PLT-7 adding loc db calls for team table 2016-01-20 08:33:26 -06:00
=Corey Hulen
ca33812cb5 PLT-7 adding loc db calls for system table 2016-01-20 08:07:52 -06:00
=Corey Hulen
f5eb3c1bcb PLT-7 adding loc for db calls audits and prefs 2016-01-20 07:59:56 -06:00
Asaad Mahmood
2f562dc477 Fixing height for icon 2016-01-20 10:48:04 +05:00
Asaad Mahmood
335123dc68 Updating status icon css 2016-01-20 10:42:11 +05:00
Asaad Mahmood
f85eb5613e Fixing status icon in IE11 2016-01-20 10:38:59 +05:00
Asaad Mahmood
547ad113c1 Merge branch 'master' of https://github.com/mattermost/platform into ui-improvements 2016-01-20 10:38:13 +05:00
Corey Hulen
1acd38b7b1 Merge pull request #1926 from mattermost/PLT-7-context
PLT-7 Adding translation function to context
2016-01-19 22:14:26 -06:00
=Corey Hulen
96f8394bf4 Fxing version 2016-01-19 22:03:53 -06:00
=Corey Hulen
8e404c1dcf PLT-7 Adding translation function to context 2016-01-19 22:00:01 -06:00
Andy Lo-A-Foe
ff8df5bf7d Update documentation for WebsocketSecurePort 2016-01-20 01:26:16 +01:00
Andy Lo-A-Foe
b870c0117f Fix indentation 2016-01-20 01:03:17 +01:00
girish@cloudron.io
6f866f8c03 Check auth_service for constructing message 2016-01-19 14:09:10 -08:00
girish@cloudron.io
e5471e09cd Check auth_service to describe user login message 2016-01-19 13:13:56 -08:00
Corey Hulen
36c5c46e24 Merge pull request #1921 from mattermost/PLT-7-server-libs
PLT-7 adding server side libraries
2016-01-19 13:33:57 -06:00
Andy Lo-A-Foe
6faabe34e8 Optionally specify ws:// and wss:// port in config 2016-01-19 19:41:39 +01:00
=Corey Hulen
4389571ded PLT-7 adding server side libraries 2016-01-19 10:54:19 -06:00
Corey Hulen
80bfdf71f2 Merge pull request #1915 from pawelad/patch-1
Update Amazon-Elastic-Beanstalk.md
2016-01-19 10:21:10 -06:00