2590 Commits

Author	SHA1	Message	Date
psychobunny	641ec3ef82	moved duplicate upload validation code into its own fn	2014-03-12 17:46:03 -04:00
psychobunny	0bbff06cfa	use middleware.authenticate instead of checking in each fn	2014-03-12 17:39:10 -04:00
psychobunny	01cda60704	moved admin upload functions into controllers/admin; re-organized routes/admin to look like routes/index; removed unused deps	2014-03-12 17:34:59 -04:00
Julian Lam	4da1a2da97	Merge branch 'master' of github.com:designcreateplay/NodeBB	2014-03-12 16:11:49 -04:00
Julian Lam	1e0ec5dd47	appending relative path to user images for subfolder installs	2014-03-12 16:11:33 -04:00
psychobunny	8e4c23149c	more re-organization of routes/index.js	2014-03-12 16:07:54 -04:00
barisusakli	2220483915	notifications	2014-03-12 15:59:02 -04:00
Julian Lam	5647354421	Merge branch 'master' of github.com:designcreateplay/NodeBB	2014-03-12 15:51:49 -04:00
Julian Lam	ca2e9d7d9e	linting and moving xregexp back to .js	2014-03-12 15:51:24 -04:00
psychobunny	bff722925f	Merge pull request #1206 from BitBangersCode/plugin-templates-fix ... Fix importing of templates served by plugins	2014-03-12 15:46:53 -04:00
MrWaffle	c1a580c51d	Fix importing of templates served by plugins	2014-03-12 20:45:07 +01:00
Julian Lam	816d9e5d12	minifying xregext lib	2014-03-12 15:41:21 -04:00
barisusakli	7b409c095c	mongo callback refactor	2014-03-12 13:38:25 -04:00
barisusakli	4f72513f19	removed keys	2014-03-12 12:46:34 -04:00
barisusakli	6eff7d4c51	mongo cleanup	2014-03-12 02:04:31 -04:00
barisusakli	a0222b69bb	closes #1200	2014-03-12 00:45:15 -04:00
barisusakli	e9ab9dcce2	search cleanup	2014-03-12 00:13:42 -04:00
barisusakli	33e34ca864	change getRecentPosts to take count	2014-03-11 23:31:28 -04:00
Julian Lam	caa9c17bc2	fixed login routes on subfolder installs	2014-03-11 23:26:33 -04:00
Julian Lam	9bf1d345e2	adding relative path to a category image for subfolder installs	2014-03-11 23:19:48 -04:00
barisusakli	6e6c5688d9	more cleanup	2014-03-11 22:31:09 -04:00
barisusakli	2befa06a33	some cleanup to socket posts	2014-03-11 21:52:22 -04:00
barisusakli	92267de9d8	feeds	2014-03-11 20:48:06 -04:00
barisusakli	3a42200e24	refactored feeds	2014-03-11 20:10:09 -04:00
Julian Lam	bf8f91f0d9	'less bad' handling of background image in home.tpl	2014-03-11 20:08:52 -04:00
Julian Lam	82a3415ab1	fixing admin routes on subfolder installs	2014-03-11 19:46:33 -04:00
Julian Lam	f28c690f2f	fixing up robots.txt	2014-03-11 19:44:48 -04:00
Julian Lam	08b2106e0f	Merge branch 'master' of github.com:designcreateplay/NodeBB	2014-03-11 19:42:18 -04:00
Julian Lam	7111adb3c2	fixed subfolder installs again (a bit), also stopped apple-touch-icon from clobbering /apple-touch-icon	2014-03-11 19:41:58 -04:00
barisusakli	d4556d4da3	added minifed js files ... replace jquery form and timeago with minified versions	2014-03-11 19:31:30 -04:00
barisusakli	813b3d6fcc	changes for live streaming of posts	2014-03-11 18:46:27 -04:00
psychobunny	5dc5eb41df	fixed ajaxify bug introduced in last commit	2014-03-11 18:33:19 -04:00
psychobunny	e451a145dd	Merge branch 'master' of https://github.com/designcreateplay/NodeBB	2014-03-11 18:10:11 -04:00
psychobunny	c8bf617f4b	allow plugins to override any route (except for admin routes)	2014-03-11 18:09:56 -04:00
Julian Lam	41116bc0b2	Merge branch 'master' of github.com:designcreateplay/NodeBB	2014-03-11 15:51:29 -04:00
Julian Lam	4bb6d89e83	fixed #1172	2014-03-11 15:51:25 -04:00
Julian Lam	b259c3d422	categoryData should return better topics (non-anon uid passed in now)	2014-03-11 15:48:29 -04:00
Julian Lam	82a82afe99	updated the way privileges were handled in the .get() category controller	2014-03-11 15:32:32 -04:00
barisusakli	350070339b	added home room emit	2014-03-11 15:18:14 -04:00
barisusakli	a5f4135c62	added socket listeners to home	2014-03-11 15:15:54 -04:00
psychobunny	5abc96399e	Merge branch 'master' of https://github.com/designcreateplay/NodeBB	2014-03-11 14:48:38 -04:00
psychobunny	5f7f5a37c1	linting	2014-03-11 14:48:35 -04:00
barisusakli	76037a5f14	closes #1191 ... added a new method called isSetMembers takes in an array of values to test if they are members of a set	2014-03-11 14:43:42 -04:00
Julian Lam	21d28b0f58	Merge branch 'master' of github.com:designcreateplay/NodeBB	2014-03-11 11:26:22 -04:00
Julian Lam	de6f58842b	fixed issue where events page would error out if log was not already created.	2014-03-11 11:26:06 -04:00
barisusakli	88c4b90fc8	accounts controller removed duplication	2014-03-11 04:33:08 -04:00
barisusakli	037e8943a8	removed left over	2014-03-11 04:10:39 -04:00
barisusakli	9564b6fda2	closes #1165	2014-03-11 04:10:00 -04:00
barisusakli	3d68c7c6b6	added getObjectsFields methods to db class, changed getUsers methods to use the new method, refactor to user.js and mongo.js	2014-03-11 03:39:41 -04:00
Julian Lam	8873963946	Merge branch 'master' of github.com:designcreateplay/NodeBB	2014-03-10 21:55:57 -04:00