547 Commits

Author	SHA1	Message	Date
Julian Lam	cd6dcff38b	Split up customJS into customHTML and customJS for better organisation (#5981) ... * WIP * fixed customJS not actually working in footer * Moving scripts to footer, #5980 * Added upgrade scripts for #5980	2017-10-12 13:38:27 -04:00
Peter Jaszkowiak	da9da8190f	Bump dependencies ... Bumping eslint & configs meant making some linting fixes For future reference, the `xmlhttprequest-ssl` library must be of equal versioning to the one in `engine.io-client`, otherwise it won't be deduped which causes the socket.io tests to fail	2017-10-02 09:24:27 -04:00
Baris Usakli	8276e20254	closes #5937	2017-09-21 14:30:12 -04:00
Baris Usakli	a2508161c6	fix hover bg color	2017-09-14 15:57:22 -04:00
Baris Usakli	bf79857b7d	closes #5908	2017-09-01 17:42:55 -04:00
Julian Lam	1034626896	Merge remote-tracking branch 'origin/develop'	2017-09-01 16:07:12 -04:00
Peter Jaszkowiak	23e7222dfa	Update Nodemailer to v4 ... also filter out .jst files from email template dropdowns	2017-08-30 14:26:41 -06:00
Peter Jaszkowiak	5885e37127	Switch admin t.js usage to Benchpress	2017-08-30 10:50:28 -06:00
Julian Lam	cd60d79a13	closes #5904	2017-08-29 09:28:18 -04:00
Barış Soner Uşaklı	5cc39e8546	Merge remote-tracking branch 'refs/remotes/origin/master' into develop ... # Conflicts: # package.json # src/views/admin/manage/ip-blacklist.tpl	2017-08-24 19:29:15 -04:00
Julian Lam	53ca6d1199	closes #5889	2017-08-24 12:39:57 -04:00
psychobunny	d5db97930d	prevent "plugins" menu from being highlighted when going to Extend -> Plugins	2017-08-21 18:50:50 -04:00
psychobunny	e8c40c8dc6	scroll to the actual subsection in the ACP when clicking on links pointing to that hash	2017-08-21 18:46:03 -04:00
Baris Usakli	575c9a41cd	Merge remote-tracking branch 'refs/remotes/origin/master' into develop	2017-08-15 13:00:18 -04:00
Barış Soner Uşaklı	f161bbf956	Post queue (#5878) ... * #5876 * add user to post queue table * add time of post into queue add posting restrictions to queue * fix shouldQueueLogic for guests * add test for post-queue route	2017-08-15 12:59:40 -04:00
Baris Usakli	bc6b1a8f56	Merge remote-tracking branch 'refs/remotes/origin/master' into develop ... # Conflicts: # public/src/admin/extend/plugins.js	2017-08-11 11:33:06 -04:00
Julian Lam	7844408301	linting	2017-08-03 12:15:49 -04:00
Julian Lam	4f9cbabec3	fixes #5853	2017-08-03 12:06:15 -04:00
Baris Usakli	44353a2b39	closes #5854	2017-08-02 16:17:24 -04:00
Baris Usakli	de55c8e431	closes #4070	2017-08-02 13:03:39 -04:00
Julian Lam	84c1a182e5	Merge remote-tracking branch 'origin/master' into develop	2017-07-25 12:28:43 -04:00
Barış Soner Uşaklı	efe13e4038	closes #5827	2017-07-23 18:10:24 -04:00
Peter Jaszkowiak	ee5895f534	Fix #5488 Support scoped plugin npm packages	2017-07-13 01:43:54 -06:00
Barış Soner Uşaklı	e9360347ea	less padding, closes #5811	2017-07-09 16:08:06 -04:00
Baris Usakli	9979987342	perserve hash when switching categories	2017-06-28 13:52:46 -04:00
Baris Usakli	da8b1b605c	#5723	2017-05-30 17:21:34 -04:00
Baris Usakli	d13eb52f39	closes #5722	2017-05-30 14:10:16 -04:00
psychobunny	88d5f97280	closes #5717	2017-05-29 17:12:02 -04:00
Baris Usakli	883b35243f	fix lint	2017-05-29 15:12:22 -04:00
Baris Usakli	1fa52267d4	Merge remote-tracking branch 'origin/master' ... # Conflicts: # public/src/admin/manage/category.js	2017-05-29 14:48:25 -04:00
Baris Usakli	de5fe25e57	closes #5715	2017-05-29 14:47:01 -04:00
psychobunny	dcbe4864a9	fix bad merge / dupe code	2017-05-29 13:26:17 -04:00
psychobunny	82cab53508	fix digest scheduling information on cold load	2017-05-25 16:14:25 -04:00
psychobunny	1b98449686	closes #5704	2017-05-25 15:17:24 -04:00
Julian Lam	3e6d51fc5a	fixes #5606 :rage2:	2017-05-24 21:18:28 -04:00
Julian Lam	816809ce3c	fixes #5606	2017-05-11 16:53:35 -04:00
Julian Lam	064a8aa6d7	Allowing custom date range to be supplied in pageviews graph, closes #5541	2017-05-11 11:41:36 -04:00
Barış Soner Uşaklı	3a1eba2537	merge	2017-05-08 13:49:35 -04:00
Peter Jaszkowiak	65e31493a9	Escape ACP search values	2017-04-24 11:40:39 -06:00
barisusakli	236758b712	Merge remote-tracking branch 'refs/remotes/origin/master' into develop	2017-04-18 14:00:14 -04:00
barisusakli	20eac0de94	closes #5518	2017-04-17 12:23:05 -04:00
barisusakli	e3205bcfad	merge	2017-04-16 14:26:12 -04:00
Peter Jaszkowiak	baa2a59f4c	Fix ace editor not working	2017-04-15 16:10:28 -06:00
Julian Lam	d18cfced96	Merge remote-tracking branch 'origin/master' into develop	2017-04-12 23:57:14 -04:00
Peter Jaszkowiak	484a800327	Merge branch master into develop	2017-04-12 21:11:39 -06:00
Peter Jaszkowiak	9368e666d8	Fix failing test	2017-04-11 21:53:17 -06:00
Peter Jaszkowiak	dc4f2be156	Remove ace global for eslint	2017-04-09 21:47:05 -06:00
Peter Jaszkowiak	0ef30e91ba	Use ace-builds npm package instead of vendor ... ace can be referenced as an r.js module, reduces acp bundle size	2017-04-08 19:05:10 -06:00
Peter Jaszkowiak	1deeaaeb39	Fix #5563	2017-04-06 15:20:07 -06:00
Julian Lam	250bb4b011	fixed leftover merge conflict artifact	2017-03-15 10:23:25 -04:00