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

3470 Коммитов

Автор SHA1 Сообщение Дата
Reed Garmsen
b2cbb956a7 Fixed issue with refocusing not working after editing a post in the RHS 2015-10-28 16:12:45 -07:00
Corey Hulen
5c03f3aad8 Merge pull request #1214 from mattermost/outgoing-hook-fix
Pass in iter vars to closures properly for outgoing webhooks
2015-10-28 14:45:08 -07:00
Corey Hulen
5f2e01a938 Merge pull request #1213 from mattermost/plt-836
PLT-836 Prevent markdown styled links from embedding gifs
2015-10-28 14:44:53 -07:00
Corey Hulen
89f67cd11d Merge pull request #1199 from hmhealey/plt600
PLT-600 Renamed channel description to channel header and added channel purpose field
2015-10-28 14:44:02 -07:00
Corey Hulen
9312272234 Merge pull request #1219 from asaadmahmoodspin/ui-improvements
Ui improvements
2015-10-28 14:42:58 -07:00
Asaad Mahmood
110bc3e7e9 Multiple UI changes 2015-10-29 00:02:17 +05:00
Asaad Mahmood
2935e7c1bf Merge branch 'master' of https://github.com/mattermost/platform into ui-improvements 2015-10-29 00:02:01 +05:00
Joram Wilander
ccf9e0cabd Merge pull request #1196 from florianorben/send-on-ctrl
allow messages to be send on ctrl+enter
2015-10-28 14:09:01 -04:00
Christopher Speller
bf8dd9d3c8 Merge pull request #1216 from mattermost/revert-1170-PLT-395
Revert "PLT-395: Add syntax highlighting to Markdown code blocks"
2015-10-28 13:26:45 -04:00
Christopher Speller
c86df0f0c6 Revert "PLT-395: Add syntax highlighting to Markdown code blocks" 2015-10-28 13:09:39 -04:00
JoramWilander
35d1ac80dd Pass in iter vars to closure properly 2015-10-28 10:37:33 -04:00
JoramWilander
46613a1679 Prevent markdown styled links from embedding gifs 2015-10-28 09:13:41 -04:00
Asaad Mahmood
e104829dcd Merge branch 'master' of https://github.com/mattermost/platform into ui-improvements 2015-10-28 18:04:27 +05:00
Christopher Speller
c6f3361d3c Merge pull request #1210 from mattermost/PLT-25
PLT-25 fixing issues with stats page
2015-10-28 08:34:57 -04:00
Christopher Speller
5322112045 Merge pull request #1187 from mattermost/code-contribution-guidelines-update
Code contribution guidelines update
2015-10-28 08:28:10 -04:00
Joram Wilander
32978e59f9 Merge pull request #1205 from florianorben/fix-relative-time
Dont display '1 minute ago' timestamps for post posted < than 1 minute ago
2015-10-28 08:07:39 -04:00
=Corey Hulen
36308f949d PLT-25 fixing issues with stats page 2015-10-27 22:55:10 -07:00
it33
570b54bbfc Typo fix 2015-10-27 17:29:54 -07:00
it33
5871452ccb Adding "Solution" sections to guide 2015-10-27 17:29:35 -07:00
Florian Orben
f7808d1172 add new user-setting section 'advanced' and remove ctrl-send setting from general tab 2015-10-28 01:26:10 +01:00
Florian Orben
0e5612a7db allow messages to be send on ctrl+enter 2015-10-28 01:26:10 +01:00
it33
87514f34bb Update Troubleshooting.md 2015-10-27 17:24:34 -07:00
Florian Orben
c91f4f8ab1 Dont display '1 minute ago' timestamps for post posted < than 1 minute ago 2015-10-28 01:19:57 +01:00
it33
ede80afe4c Update Administration.md 2015-10-27 17:05:20 -07:00
it33
a899b7ef65 Update Troubleshooting.md 2015-10-27 16:59:24 -07:00
it33
078fb4e5c0 Update Outgoing-Webhooks.md 2015-10-27 16:53:30 -07:00
it33
e0ce72b071 Update Outgoing-Webhooks.md 2015-10-27 16:51:31 -07:00
Corey Hulen
e0f69060fa Merge pull request #1190 from mattermost/PLT-25
PLT-25 adding stats to admin console
2015-10-27 11:40:49 -07:00
it33
4dbde3e1d8 Update Troubleshooting.md 2015-10-27 11:02:52 -07:00
=Corey Hulen
399e9c6f4b PLT-25 fixing stats for postgres 2015-10-27 09:55:19 -07:00
hmhealey
019bf6a7fe Added ability to see/edit channel purpose in the client 2015-10-27 12:46:31 -04:00
hmhealey
61da22ea32 Added Channel.Purpose on the server 2015-10-27 12:46:31 -04:00
hmhealey
887d205b1f Renamed Channel.Description to Channel.Header on the client 2015-10-27 12:46:31 -04:00
hmhealey
09b38404fa Renamed Channel.Description to Channel.Header on the server 2015-10-27 12:46:30 -04:00
it33
95c464b167 Create Administration.md 2015-10-27 08:54:24 -07:00
it33
bfb53fc3e0 Update Troubleshooting.md 2015-10-27 08:50:04 -07:00
it33
b1d4e65ebb Update Troubleshooting.md 2015-10-27 08:48:28 -07:00
Corey Hulen
01c622b9a3 Merge pull request #1195 from mattermost/plt-822
PLT-822 Refactoring post_store into post_store and search_store
2015-10-27 08:22:13 -07:00
Asaad Mahmood
179c4ea684 Merge branch 'master' of https://github.com/mattermost/platform into ui-improvements 2015-10-27 20:15:33 +05:00
it33
50eb3d9fe4 Added known issue for deleted channels 2015-10-27 08:05:02 -07:00
it33
34fff89e9d Update Code-Contribution-Guidelines.md 2015-10-27 07:10:32 -07:00
Christopher Speller
3ca8a11a43 Merge pull request #1197 from rgarmsen2295/plt-166
PLT-166 Fixed issue with missing help text for @all and @channel in mention list
2015-10-27 08:49:38 -04:00
Christopher Speller
e92af0daa2 Merge pull request #1184 from girishso/add-trailing-slash
adds trailing slash if missing from Directory in config.json
2015-10-27 08:44:19 -04:00
Christopher Speller
640a7789db Merge pull request #1174 from florianorben/member-popover
Add styling to channel member popover
2015-10-27 08:42:54 -04:00
Christopher Speller
5f42451944 Merge pull request #1154 from girishso/username_symbols
auto-link mentions with user names having symbols
2015-10-27 08:40:49 -04:00
Girish S
9de0ceb229 auto-link mentions with user names having symbols
this also handles the case where user_name having '_'
2015-10-27 18:02:07 +05:30
Girish S
bfa23b0075 adds trailing slash if missing from Directory in config.json
does it only if "DriverName" == model.IMAGE_DRIVER_LOCAL, not sure if required for other
drivers too
2015-10-27 16:48:54 +05:30
=Corey Hulen
d53de84214 Fixing postgres 2015-10-26 22:46:19 -07:00
=Corey Hulen
834e1a8b58 adding arrow notation 2015-10-26 22:13:40 -07:00
=Corey Hulen
aec99ceb9d Merge branch 'master' into PLT-25 2015-10-26 22:11:42 -07:00