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

3279 Коммитов

Автор SHA1 Сообщение Дата
JoramWilander
cc25355af7 Fix websocket not connecting when session index is 0 2015-10-23 08:55:45 -04:00
Corey Hulen
02a6f6b2cd Merge pull request #1153 from mattermost/fixing-eslint
Fixing merge
2015-10-22 22:20:43 -07:00
=Corey Hulen
8291d0285e Fixing merge 2015-10-22 22:10:16 -07:00
Corey Hulen
304f99b3e3 Merge pull request #1150 from hmhealey/plt689
PLT-689 Fixed handling of whitespace surrounding emoticons
2015-10-22 21:39:40 -07:00
Corey Hulen
826c04732e Merge pull request #1147 from hmhealey/plt721
PLT-721 Changed Direct Channel modal to only show active users
2015-10-22 21:39:12 -07:00
Corey Hulen
020e139447 Merge pull request #1146 from hmhealey/plt759
PLT-759 Made searching case insensitive in Direct Messages modal
2015-10-22 21:39:00 -07:00
Corey Hulen
2dd28dbb5f Merge pull request #1145 from hmhealey/plt719
PLT-719 Added help popover to search box
2015-10-22 21:38:49 -07:00
Corey Hulen
22d7f0f116 Merge pull request #1143 from mattermost/plt-803
PLT-803 Prevent users from resetting their password when the user is using SSO
2015-10-22 21:38:31 -07:00
Corey Hulen
640176bd4c Merge pull request #1142 from mattermost/plt-414
PLT-414 Fix direct channel creation.
2015-10-22 21:37:41 -07:00
Corey Hulen
0ed40545d0 Merge pull request #1137 from mattermost/email-trouble
Update email setup instructions
2015-10-22 21:35:44 -07:00
Corey Hulen
6a1934192f Merge pull request #1129 from mattermost/PLT-44
PLT-44 Inital support for multi-tab multi-team login
2015-10-22 21:35:29 -07:00
=Corey Hulen
7384b0791e Fixing merge 2015-10-22 20:52:31 -07:00
=Corey Hulen
562f21c037 Merge branch 'master' into PLT-44 2015-10-22 20:51:21 -07:00
=Corey Hulen
079f047540 Fixing code review issues 2015-10-22 18:06:22 -07:00
it33
5ecf45e109 Create API.md 2015-10-22 16:20:35 -07:00
Harrison Healey
2ccf80d91d Merge pull request #1138 from rgarmsen2295/plt-777
PLT-777 Convert window resizing in post_list.jsx to React based implementation
2015-10-22 16:29:42 -04:00
hmhealey
50579f71bc Fixed handling of whitespace surrounding emoticons 2015-10-22 15:28:55 -04:00
=Corey Hulen
ab18616725 Fixing group code review issues 2015-10-22 10:17:25 -07:00
hmhealey
9483ef66d3 Changed Direct Channel modal to only show active users 2015-10-22 12:55:35 -04:00
hmhealey
4411a21ca7 Made searching case insensitive in Direct Messages modal 2015-10-22 12:51:32 -04:00
=Corey Hulen
cbbee5cadb Addressing issues from group code review 2015-10-22 09:36:46 -07:00
hmhealey
47d519927a Added help popover to search box 2015-10-22 12:22:21 -04:00
=Corey Hulen
54894e90ac Fixing merge conflict 2015-10-22 09:19:18 -07:00
it33
649f42e3fc Update Troubleshooting.md 2015-10-22 08:06:45 -07:00
JoramWilander
4734912c52 Prevent users from resetting their password when the user is using SSO 2015-10-22 10:53:39 -04:00
Harrison Healey
20a5380746 Merge pull request #1141 from hmhealey/plt521b
PLT-521 Changed markdown renderer to only parse emoticons twice
2015-10-22 09:56:22 -04: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
Christopher Speller
6cc3bfe7a9 Refactoring direct channel creation to use transaction to avaoid state where channel is created without both users 2015-10-22 09:31:27 -04:00
Joram Wilander
2d922fde7e Merge pull request #1094 from trashcan/slash-shrug
Add a /shrug command
2015-10-22 08:11:26 -04:00
=Corey Hulen
391023339a tweaking formatting 2015-10-21 15:53:01 -07:00
=Corey Hulen
903324c09b tweaking formatting 2015-10-21 15:51:32 -07:00
Reed Garmsen
4129b204c3 Fixed typos in create_post.jsx resizing code 2015-10-21 15:50:46 -07:00
=Corey Hulen
446e17a21e Removing old dock 2015-10-21 15:48:52 -07:00
=Corey Hulen
9172ab33e4 Updating email guide 2015-10-21 15:48:18 -07:00
it33
d8f6cb939f Update Upgrade-Guide.md 2015-10-21 14:53:22 -07:00
it33
01a2ad2ccf Update Upgrade-Guide.md 2015-10-21 14:52:55 -07:00
Reed Garmsen
27a8169ae8 Changed post list resize code to use react state; fixed various eslint warnings 2015-10-21 14:07:40 -07: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
=Corey Hulen
a8d74e9ebb WIP 2015-10-21 11:31:22 -07:00
Harrison Healey
7d94eb1dca Merge pull request #1098 from florianorben/PLT-616
PLT-616: Enable playing of animated GIF in thumbnails and preview
2015-10-21 12:26:07 -04: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
62a32f7187 always show stop gif button on small screen sizes 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