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

7458 Коммитов

Автор SHA1 Сообщение Дата
Reed Garmsen
0dd73fb9b3 Changed file preview removal from using dataset which is unsupported in ie10 to using the getAttribute method which is backwards and forwards compatible 2015-06-29 15:04:08 -07:00
Asaad Mahmood
1e0161e4c6 MM-1268 - Updating button in email template 2015-06-30 01:07:23 +05:00
Asaad Mahmood
7f8c2a9c83 Merge branch 'master' of https://github.com/mattermost/platform 2015-06-30 01:07:00 +05:00
Joram Wilander
e6b5bdef82 Merge pull request #99 from rgarmsen2295/mm-1303
MM-1303
2015-06-29 15:21:51 -04:00
JoramWilander
2d3ef0b051 @all and @channel now auto-complete 2015-06-29 15:20:49 -04:00
Corey Hulen
5a1562cafb Merge pull request #51 from rgarmsen2295/mm-1287
MM-1287
2015-06-29 11:08:42 -08:00
JoramWilander
7b7e73fb92 added team-wide and channel-wide mentions 2015-06-29 14:37:59 -04:00
Reed Garmsen
6cfccf63d5 Changed invite email to reflect the sender's status in the team (e.g. admin v.s. plain member) 2015-06-29 09:42:12 -07:00
Asaad Mahmood
fce4ad42cb Merge branch 'master' of https://github.com/mattermost/platform 2015-06-29 20:38:02 +05:00
JoramWilander
ba998db099 update unit tests for default channels 2015-06-29 11:14:12 -04:00
JoramWilander
72d54e427c add intro text specific to off-topic channel 2015-06-29 10:31:56 -04:00
JoramWilander
d00f90d10c new users now join off-topic defaultly 2015-06-29 10:24:45 -04:00
JoramWilander
cebb4bef84 move default channel creation to seperate func and add off-topic 2015-06-29 09:07:13 -04:00
Joram Wilander
0792eb18d5 Merge pull request #49 from mattermost/mm-1316
fixes mm-1316 improves channel notifications UI and updates channellist etag
2015-06-29 08:14:02 -04:00
JoramWilander
366557b101 rebase touch-ups 2015-06-29 08:10:59 -04:00
JoramWilander
a8089fec3a fixed CSS indenting 2015-06-29 07:52:12 -04:00
JoramWilander
ffe1e36a55 make channel notifications modal visible in mobile mode 2015-06-29 07:52:12 -04:00
JoramWilander
d090f5698a update etag version 2015-06-29 07:45:13 -04:00
JoramWilander
c3ebd3e6be updated channel unit test 2015-06-29 07:45:12 -04:00
JoramWilander
5ebeaffe64 fix more indenting 2015-06-29 07:45:12 -04:00
JoramWilander
b3168a6db8 fix indenting 2015-06-29 07:45:12 -04:00
JoramWilander
2b4888d062 fixes mm-1316 improves channel notifications UI and updates channellist etag 2015-06-29 07:45:12 -04:00
Joram Wilander
afb62bb40a Merge pull request #93 from rgarmsen2295/mm-1317
MM-1317 Fixed typo in team domain look-up page
2015-06-29 07:43:19 -04:00
Joram Wilander
bcc48ae210 Merge pull request #87 from asaadmahmoodspin/settings-ui
Updating settings UI
2015-06-29 07:42:06 -04:00
Joram Wilander
a1448a4e26 Merge pull request #79 from asaadmahmoodspin/master
Improving image preview modal and channel info modal
2015-06-29 07:41:44 -04:00
Reed Garmsen
e621950364 Removed test code 2015-06-28 19:38:19 -07:00
Reed Garmsen
2cd5f3629f Fixed typo in team domain look-up page 2015-06-28 19:36:41 -07:00
ralder
ce74e4a728 fix pr #82 mention list inside modal 2015-06-29 01:39:31 +03:00
Corey Hulen
bf8511fa47 Merge pull request #83 from ralder/fix-broken-mailto-user-popover
gui: Fix broken mailto link in user-popover
2015-06-27 21:50:30 -08:00
Corey Hulen
acc809ca88 Merge pull request #82 from ralder/fix-mentions-dropdown
gui: fix mentions dropdown list for pc browsers
2015-06-27 21:50:03 -08:00
Asaad Mahmood
e1714eaa3f Updating settings UI 2015-06-28 04:18:24 +05:00
Asaad Mahmood
86f774e1b0 Merge branch 'master' of https://github.com/mattermost/platform 2015-06-28 04:10:55 +05:00
Corey Hulen
b1c3bd37ad Merge pull request #66 from adamenger/patch-1
IAM not AIM
2015-06-27 06:08:16 -04:00
Corey Hulen
5ff8b54920 Merge pull request #59 from haikoschol/master
Fix typo in function name
2015-06-27 06:07:47 -04:00
ralder
f25cdbdb08 gui: fix broken mailto link in user-popover 2015-06-26 15:58:34 -07:00
Asaad Mahmood
9e7ba4aa5d Removing relative from span 2015-06-27 00:29:37 +05:00
test
0104bf822c gui: fix mentions dropdown 2015-06-26 11:38:27 -07:00
Asaad Mahmood
febb6e3b65 mm-1256 - Improving view modal and close modal button 2015-06-26 23:19:29 +05:00
Asaad Mahmood
f2401dd91f MM-1184 - Updating image preview 2015-06-26 03:07:20 +05:00
=Corey Hulen
ba1feac08c adding mysql 5.6 2015-06-25 17:00:10 -04:00
=Corey Hulen
937d2c65fb adding mysql 5.6 2015-06-25 16:53:53 -04:00
=Corey Hulen
bc88328aeb adding api unit tests 2015-06-25 16:42:40 -04:00
=Corey Hulen
e5586142a5 adding servies 2015-06-25 16:38:10 -04:00
=Corey Hulen
fac113a76d updating build script 2015-06-25 16:25:53 -04:00
=Corey Hulen
d51767fe78 updating services 2015-06-25 16:19:50 -04:00
=Corey Hulen
ac5ea20c3c adding services to build 2015-06-25 16:11:22 -04:00
=Corey Hulen
8e6609d177 updating build 2015-06-25 15:33:39 -04:00
=Corey Hulen
8eab243172 updating build 2015-06-25 15:27:57 -04:00
=Corey Hulen
e411a3ba7e adding the missing package 2015-06-25 15:18:53 -04:00
Corey Hulen
ac56304bc7 Merge pull request #67 from firstrow/patch-1
Update README.md - make it little user friendly
2015-06-25 13:23:43 -04:00