155 Commits

Author	SHA1	Message	Date
nickago	1f0b4a39b0	redirected channel name 404's to town square	2015-07-06 13:15:09 -07:00
Corey Hulen	75c1938077	Merge pull request #110 from nickago/MM-1430 ... MM-1430 Added the ability to have hashtags with dashes in them	2015-06-30 19:46:25 -08:00
Corey Hulen	1200f76484	Merge pull request #102 from nickago/MM-1328 ... MM-1328 Now limits domain to just alphanumeric	2015-06-30 19:44:38 -08:00
Reed Garmsen	71d0a9472f	Removed unnecessary loop copying	2015-06-30 15:00:57 -07:00
Reed Garmsen	ae77db2145	Changed keyword logic to use arrays rather than maps to remove highlighting of js object properties like constructor and __proto__	2015-06-30 12:30:11 -07:00
nickago	018f6d96ba	Aligned front end and back end domain requirements	2015-06-30 12:08:53 -07:00
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	3943d6a209	Revert "MM-1289 Sorted the channel members popover lexigraphically"	2015-06-30 10:23:46 -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
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
JoramWilander	2d3ef0b051	@all and @channel now auto-complete	2015-06-29 15:20:49 -04:00
JoramWilander	7b7e73fb92	added team-wide and channel-wide mentions	2015-06-29 14:37:59 -04:00
JoramWilander	72d54e427c	add intro text specific to off-topic channel	2015-06-29 10:31:56 -04:00
JoramWilander	cebb4bef84	move default channel creation to seperate func and add off-topic	2015-06-29 09:07:13 -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	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
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
Asaad Mahmood	e1714eaa3f	Updating settings UI	2015-06-28 04:18:24 +05: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
Joram Wilander	7904ea2738	Merge pull request #46 from mattermost/mm-1318 ... fixes mm-1318 only allow 5 files to be uploaded at a time	2015-06-25 12:28:34 -04:00
Corey Hulen	49baf73918	Merge pull request #45 from rgarmsen2295/mm-1309 ... MM-1309	2015-06-25 11:42:25 -04:00
Corey Hulen	d146916f39	Merge pull request #43 from rgarmsen2295/mm-1202 ... MM-1202	2015-06-25 11:42:11 -04:00
Corey Hulen	d9dfb2cbd1	Merge pull request #41 from asaadmahmoodspin/master ... MM-1253 - Fixing new message and date separator corner case	2015-06-25 11:41:33 -04:00
Asaad Mahmood	e454cf54fa	MM-1253 - Fixing new message and date separator corner case	2015-06-28 20:53:26 +05:00
Corey Hulen	0537e87a90	Merge pull request #34 from rgarmsen2295/mm-1288 ... MM-1288	2015-06-25 11:36:57 -04:00