nickago
|
bcc31b714b
|
Added the ability to have hashtags with dashes in them
|
2015-06-30 11:57:57 -07:00 |
|
Christopher Speller
|
7a7be75e74
|
Merge pull request #109 from nickago/MM-1289
Mm 1289 Now sorts extra channel members lexigraphically
|
2015-06-30 14:06:00 -04:00 |
|
Christopher Speller
|
aa023c8b08
|
Merge pull request #108 from rgarmsen2295/mm-1309
MM-1309 Fixed grammmatical issue in error message
|
2015-06-30 14:03:23 -04:00 |
|
Joram Wilander
|
a00b4e00ad
|
Merge pull request #106 from mattermost/mm-1119
fixes mm-1119 adds @all and @channel mention capabilites
|
2015-06-30 11:58:22 -04:00 |
|
nickago
|
4022ab5ce0
|
Added extra precaution to avoid null error
|
2015-06-30 07:59:31 -07:00 |
|
nickago
|
ab154d50ea
|
MM-1289 Now sorts users in lexigraphical order in extra members popover
|
2015-06-30 07:47:46 -07:00 |
|
Reed Garmsen
|
c1d1386122
|
Fixed grammmatical issue in error message
|
2015-06-30 07:46:43 -07:00 |
|
Christopher Speller
|
ae21685e35
|
Merge pull request #107 from mattermost/revert-91-MM-1289
Revert "MM-1289 Sorted the channel members popover lexigraphically"
|
2015-06-30 10:24:15 -04:00 |
|
Christopher Speller
|
3943d6a209
|
Revert "MM-1289 Sorted the channel members popover lexigraphically"
|
2015-06-30 10:23:46 -04:00 |
|
JoramWilander
|
8be4df00b4
|
added mentioned username to default mention keys
|
2015-06-30 09:11:06 -04:00 |
|
JoramWilander
|
f030476ff5
|
@all and @channel now highlight like other mentions
|
2015-06-30 09:06:10 -04:00 |
|
JoramWilander
|
495b0e4523
|
add default icon for non-user autocompletes
|
2015-06-30 08:42:08 -04:00 |
|
Christopher Speller
|
236f7a9bd2
|
Merge pull request #101 from rgarmsen2295/mm-983
MM-983 Fixed file preview removal in IE10
|
2015-06-30 08:07:13 -04:00 |
|
Christopher Speller
|
ae86eab289
|
Merge pull request #91 from nickago/MM-1289
MM-1289 Sorted the channel members popover lexigraphically
|
2015-06-30 08:06:05 -04:00 |
|
Joram Wilander
|
884df23881
|
Merge pull request #103 from nickago/MM-1293
MM-1293 Updated file display key to avoid child flattening
|
2015-06-30 08:03:58 -04:00 |
|
Corey Hulen
|
74081b7fdc
|
Merge pull request #100 from asaadmahmoodspin/master
MM-1268 - Updating button in email template
|
2015-06-29 21:16:25 -08:00 |
|
Corey Hulen
|
4d2ca8881b
|
Merge pull request #98 from mattermost/mm-1199
fixes mm-1199 adds off-topic as a default channel
|
2015-06-29 21:16:07 -08:00 |
|
nickago
|
351068491e
|
Changed the style of key-assignment to allow for more assured variance
|
2015-06-29 17:19:00 -07:00 |
|
nickago
|
6df00cadb5
|
Updated file display key to avoid child flattening
|
2015-06-29 17:06:04 -07:00 |
|
nickago
|
e41e7a27cf
|
Added semicolons
|
2015-06-29 15:27:53 -07:00 |
|
nickago
|
9afbc9c206
|
Sorted the channel members popover lexigraphically
|
2015-06-29 15:25:51 -07:00 |
|
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 |
|