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

4161 Коммитов

Автор SHA1 Сообщение Дата
JoramWilander
7eca077877 Prevent SSO users from changing their email 2015-11-06 08:56:13 -05:00
Joram Wilander
6417d4728d Merge pull request #1321 from hmhealey/plt911
PLT-911 Search autocomplete improvements
2015-11-06 08:13:03 -05:00
Joram Wilander
23a8dbca9f Merge pull request #1325 from hmhealey/plt618
PLT-618 Ignore formatting markdown lists containing only one element
2015-11-06 08:12:25 -05:00
Joram Wilander
85ff23f823 Merge pull request #1329 from florianorben/no_panic_on_webhook_err
don't panic if incoming webhook contains invalid json
2015-11-06 07:56:44 -05:00
Jason
335e9ece6b Update to proxy_pass
Changed proxy_pass to the mattermost server rather than pointing at the nginx server(localhost)
2015-11-06 07:10:15 -05:00
it33
de5e97167d Rename tests-emoticons.md to test-emoticons.md 2015-11-05 23:57:35 -08:00
it33
ef1926abb5 Create tests-emoticons.md 2015-11-05 23:57:13 -08:00
Corey Hulen
247da8523d Merge pull request #1330 from mattermost/revert-1324-PLT-480
Revert 59581c3850
2015-11-05 23:08:20 -08:00
Corey Hulen
6af93e2a1b Revert 59581c3850 2015-11-05 22:58:33 -08:00
Florian Orben
c1baee3984 don't panic if incoming webhook contains invalid json 2015-11-06 00:42:12 +01:00
Florian Orben
195728b949 remove max column size from 'props' 2015-11-06 00:37:21 +01:00
Florian Orben
7e3b53c37b fix alter table command for postgres 2015-11-06 00:24:39 +01:00
Florian Orben
17a17c336c fix logging statement not to post nonsense 2015-11-06 00:00:11 +01:00
Florian Orben
4dedb14467 remove two unused assignments 2015-11-05 23:57:01 +01:00
Florian Orben
e00836f8df postgres needs another query to get table information... 2015-11-05 23:55:31 +01:00
Florian Orben
b085bc2d56 PLT-857: Support for Incoming Webhooks - Try #2 2015-11-05 23:33:21 +01:00
Florian Orben
4b6eb56415 collapse text after 700 chars or 5 line breaks 2015-11-05 23:33:21 +01:00
Florian Orben
d3ed791ab5 attachments frontend 2015-11-05 23:33:21 +01:00
Harrison Healey
d96cb50b68 Merge pull request #1320 from mattermost/PLT-1040
PLT-1040 changing ding
2015-11-05 17:26:42 -05:00
it33
aac931461d Update Release-Numbering.md 2015-11-05 14:24:32 -08:00
it33
b1f1c0aaf8 Adding doc links 2015-11-05 14:21:37 -08:00
Joram Wilander
59581c3850 Merge pull request #1324 from gabel/PLT-480
PLT-480 Use `Utils.displayUsername` for username renderings
2015-11-05 17:11:47 -05:00
Corey Hulen
7b7491a438 Merge pull request #1302 from mattermost/it33-patch-1
Noting random build failures
2015-11-05 14:04:47 -08:00
hmhealey
431cb089ed Changed markdown lexer to ignore lists containing only one item 2015-11-05 16:49:43 -05:00
it33
7ccb4037ab Update CONTRIBUTING.md 2015-11-05 13:37:31 -08:00
hmhealey
f0578868ed Cleaned up Markedown Lexer for eslint 2015-11-05 16:19:53 -05:00
=Corey Hulen
3c16cffea2 Switching to mp3 2015-11-05 13:18:30 -08:00
Martin Fischer
08e03e615c PLT-480: Use Utils.displayUsername for username renderings. (fixes #874) 2015-11-05 22:15:07 +01:00
hmhealey
fedfeb67aa Copied part of the marked lexer into markdown.jsx 2015-11-05 15:53:10 -05:00
=Corey Hulen
17cd95ae05 Fixing issue with safari private mode 2015-11-05 12:14:27 -08:00
=Corey Hulen
5dbefdecfe PLT-1016 force logout on other browsers 2015-11-05 11:54:40 -08:00
hmhealey
9b218c1af1 Moved highlighting code out of markdown.jsx 2015-11-05 14:47:16 -05:00
hmhealey
e29342d426 Moved public and private channels into separate sections in the search autocomplete 2015-11-05 14:12:31 -05:00
Corey Hulen
6418b78f1c Merge pull request #1319 from asaadmahmoodspin/ui-improvements
UI Improvements for Slack and post dropdown
2015-11-05 10:24:03 -08:00
=Corey Hulen
a28441be7e PLT-1040 changing ding 2015-11-05 10:23:06 -08:00
Asaad Mahmood
dc677bc88b UI Improvements for Slack and post dropdown 2015-11-05 23:08:25 +05:00
Corey Hulen
1578f6ca91 Merge pull request #1317 from hmhealey/scroll
Re-added changes made in ac052fb9 to perfect scrollbar
2015-11-05 09:54:30 -08:00
Corey Hulen
57f0cde207 Merge pull request #1315 from mattermost/plt-996
PLT-996 Prevent tutorial showing up a second before post list loads
2015-11-05 09:53:58 -08:00
Corey Hulen
1e63d268c2 Merge pull request #1314 from mattermost/plt-829
PLT-829 Only allow one ding every 3s
2015-11-05 09:53:39 -08:00
hmhealey
52e75012c3 Fixed search autocomplete click handling 2015-11-05 12:24:54 -05:00
JoramWilander
2c271d1514 Use state for current screen in turotial intro 2015-11-05 12:22:40 -05:00
JoramWilander
0bf92c8ada Make dots in tutorial intro clickable and always at the same spot 2015-11-05 12:20:55 -05:00
hmhealey
c1ae28cc10 Changed search autocomplete to scroll when making a selection using the keyboard 2015-11-05 12:15:18 -05:00
Harrison Healey
ff38c402cb Merge pull request #1316 from asaadmahmoodspin/ui-improvements
Modal improvements for members
2015-11-05 12:08:34 -05:00
hmhealey
febf0fd436 Re-added changes made in ac052fb9 to perfect scrollbar 2015-11-05 12:01:40 -05:00
Asaad Mahmood
bc1820a498 Modal improvements for members 2015-11-05 21:43:41 +05:00
Joram Wilander
0e72831639 Merge pull request #1313 from mattermost/plt-992
PLT-992 / PLT-984 Fixed center channel height magic. Fixes tutorial.
2015-11-05 11:12:24 -05:00
JoramWilander
3927891827 Update tutorial to not show by default 2015-11-05 10:49:43 -05:00
JoramWilander
c41dd77b29 Only allow one ding every 3s 2015-11-05 10:44:38 -05:00
Christopher Speller
b8a1bd03cc Merge pull request #1310 from mattermost/plt-697
PLT-697 Don't send welcome emails for users signing up from an email invite and update email content
2015-11-05 10:33:30 -05:00