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

4535 Коммитов

Автор SHA1 Сообщение Дата
Joram Wilander
17788fb47f Merge pull request #1654 from hmhealey/plt1421
PLT-1421 Changed ordering of emoticon suggestions
2015-12-08 11:51:52 -05:00
lfbrock
9ab6ddfb45 Update Messaging.md 2015-12-08 11:50:28 -05:00
JoramWilander
5d79497c09 Update incoming hook documentation to more clearly state the direct message functionality 2015-12-08 11:49:43 -05:00
Corey Hulen
e2fc28b1f3 Merge pull request #1651 from mattermost/plt-1399
PLT-1399 Fix username on commented on message for webhooks
2015-12-08 08:41:30 -08:00
Corey Hulen
f449a4a073 Merge pull request #1650 from mattermost/plt-1389
PLT-1389 Fix edited posts not updating by websocket
2015-12-08 08:41:10 -08:00
it33
0d69151052 Update CONTRIBUTING.md 2015-12-08 08:34:50 -08:00
lfbrock
fcd7800bdc Update Messaging.md 2015-12-08 11:30:15 -05:00
it33
e2a240941d Update overview.md 2015-12-08 08:20:29 -08:00
it33
a2f8c4caca Update overview.md 2015-12-08 08:19:32 -08:00
JoramWilander
0c09cec7d9 Fix email error not showing up on team signup page 2015-12-08 11:05:23 -05:00
lfbrock
6b6c555d6f Update CHANGELOG.md 2015-12-08 10:49:46 -05:00
lfbrock
cca7e02ce8 Update Account-Settings.md 2015-12-08 10:16:03 -05:00
lfbrock
5192d65ab0 Update Markdown.md 2015-12-08 10:07:41 -05:00
hmhealey
47c51dbcf0 Changed ordering of emoticon suggestions 2015-12-08 10:07:21 -05:00
lfbrock
ab728f05b3 Update Messaging 2015-12-08 10:03:46 -05:00
hmhealey
c55e7895d9 Changed Sidebar direct channel list to be driven by preferences 2015-12-08 09:45:21 -05:00
JoramWilander
702489ca58 Fix username on commented on message for webhooks 2015-12-08 09:10:52 -05:00
JoramWilander
71dd5b68cc Fix edited posts not updating by websocket 2015-12-08 08:41:22 -05:00
Joram Wilander
a686bcc19a Merge pull request #1646 from mattermost/PLT-1302
PLT-1302 fixing hiding email adddress
2015-12-08 08:29:27 -05:00
Christopher Speller
8cd3e225c9 Merge pull request #1647 from mattermost/PLT-564
PLT-564 fixing error bar
2015-12-08 08:21:00 -05:00
Christopher Speller
cf25825b04 Merge pull request #1645 from mattermost/plt-1365
PLT-1365 Don't display system console on mobile
2015-12-08 08:20:36 -05:00
Christopher Speller
a0491b592e Merge pull request #1644 from mattermost/plt-1279-1
PLT-1279 Make sure posts in common threads are included in getPosts DB query
2015-12-08 08:20:17 -05:00
Christopher Speller
5e4be8b0d4 Merge pull request #1639 from hmhealey/plt1063
PLT-1063 Switched marked to forked version
2015-12-08 08:19:08 -05:00
Christopher Speller
d7df0695e3 Merge pull request #1636 from mattermost/plt-1354
PLT-1354 Show channel member count up to 100 now
2015-12-08 08:18:17 -05:00
Joram Wilander
38c313c934 Merge pull request #1628 from florianorben/fix-font-load-on-first-page-visit
fix font not being changed on first page visit (if preferences havent been loaded before)
2015-12-08 08:16:15 -05:00
Joram Wilander
c67c937388 Merge pull request #1640 from florianorben/collapse_fix
fix a typo that was breaking combination of sequential messages
2015-12-08 08:14:53 -05:00
Joram Wilander
eb465501f9 Merge pull request #1641 from florianorben/display_system_username
Display username 'System' for system messages
2015-12-08 08:14:25 -05:00
Joram Wilander
2a9fbd7a26 Merge pull request #1642 from florianorben/print_style
Add print stylesheet
2015-12-08 08:11:45 -05:00
Joram Wilander
92c6eceb0f Merge pull request #1637 from asaadmahmoodspin/ui-improvements
Multiple UI Improvements
2015-12-08 08:08:46 -05:00
Asaad Mahmood
3265a545cf Fixing es lint error 2015-12-08 12:23:52 +05:00
Yi EungJun
b8efeb2e72 Use local timezone for notification email
Local timezone is better default than UTC because it is common that all
users of a mattermost server live near the server.
2015-12-08 13:18:00 +09:00
it33
2bf13c91fa Merge pull request #1643 from mattermost/lfbrock-patch-3
Update NOTICE.txt
2015-12-07 18:59:00 -08:00
=Corey Hulen
75a2ce062a PLT-564 fixing error bar 2015-12-07 16:03:42 -08:00
=Corey Hulen
4d6c8a20ee PLT-1302 fixing hiding email adddress 2015-12-07 15:14:25 -08:00
hmhealey
4b51490a38 Moved logic for making direct channels visible to both members on post to the server 2015-12-07 18:14:07 -05:00
=Corey Hulen
2ab13b7ad3 PLT-1302 fixing hiding email adddress 2015-12-07 15:13:31 -08:00
hmhealey
7d4a9ad376 Added preference_changed web socket event 2015-12-07 18:13:14 -05:00
JoramWilander
57fac4ec08 Don't display system console on mobile 2015-12-07 15:40:33 -05:00
JoramWilander
2b0cd7e619 Return 100 channel users in extra info call 2015-12-07 15:22:50 -05:00
JoramWilander
910b3216fe Update unit test 2015-12-07 15:10:03 -05:00
JoramWilander
1e34cf8ab0 Make sure posts in threads are included in getPosts DB query 2015-12-07 14:56:46 -05:00
hmhealey
51b5ffd72b Removed special handling of snake_case words since that's now done by marked 2015-12-07 14:24:52 -05:00
hmhealey
65d8e3aeed Switched marked to mattermost/marked 2015-12-07 14:24:46 -05:00
hmhealey
2c832e8f96 Removed :* smiley since it conflicts heavily with the markdown parser 2015-12-07 14:24:45 -05:00
lfbrock
0dd4ea1016 Update NOTICE.txt 2015-12-07 14:15:38 -05:00
Florian Orben
bcc826acf8 add print stylesheet 2015-12-07 19:27:53 +01:00
Florian Orben
7d3b3869c9 Display username 'System' for system messages 2015-12-07 18:40:56 +01:00
Florian Orben
760f49d924 fix that was breaking combination of sequential messages 2015-12-07 18:23:13 +01:00
Asaad Mahmood
f5c72e23d5 Updating archive footer 2015-12-07 22:09:46 +05:00
Asaad Mahmood
901b830f2d Multiple UI Improvements 2015-12-07 21:18:03 +05:00