5675 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
barisusakli	0f19578523	removed dupe body	2014-03-12 17:08:06 -04:00
psychobunny	bdc7a19bd7	don't attempt to parse a non-existing widget area	2014-03-12 16:51:59 -04:00
psychobunny	58fe16e15c	Merge branch 'master' of https://github.com/designcreateplay/NodeBB	2014-03-12 16:31:29 -04:00
psychobunny	7fc2e627c5	linting templates.js; got rid of some unused server-side code	2014-03-12 16:31:26 -04:00
Julian Lam	e611a8174e	linting setting.js again and abstracting out saveField	2014-03-12 16:21:19 -04:00
psychobunny	0a293be823	linting categories.js and footer.js	2014-03-12 16:18:48 -04:00
psychobunny	d183e58771	linting admin/groups	2014-03-12 16:17:00 -04:00
psychobunny	6ea760d636	linting admin/index; admin/languages	2014-03-12 16:15:39 -04:00
psychobunny	2d65a746e4	linting admin/settings	2014-03-12 16:14:18 -04:00
psychobunny	81de895c0e	Merge branch 'master' of https://github.com/designcreateplay/NodeBB	2014-03-12 16:12:27 -04:00
psychobunny	b515995432	removed unnecessary switch case	2014-03-12 16:12:23 -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
psychobunny	e9fb2f4135	Merge branch 'master' of https://github.com/designcreateplay/NodeBB	2014-03-12 16:02:03 -04:00
psychobunny	44a91fe9ea	linting admin/themes	2014-03-12 16:01:58 -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	738ada9b16	Merge branch 'master' of github.com:designcreateplay/NodeBB	2014-03-12 15:41:26 -04:00
Julian Lam	816d9e5d12	minifying xregext lib	2014-03-12 15:41:21 -04:00
psychobunny	fdb9b889ec	Merge branch 'master' of https://github.com/designcreateplay/NodeBB	2014-03-12 15:20:23 -04:00
psychobunny	fb1ddc3d9b	minifying colorpicker.js	2014-03-12 15:20:20 -04:00
Julian Lam	b525d95915	Merge branch 'master' of github.com:designcreateplay/NodeBB	2014-03-12 15:18:22 -04:00
Julian Lam	6aa8df1d24	removed unminified buzz library, keeping minified version	2014-03-12 15:18:16 -04:00
psychobunny	da0355ef79	remove async dep for widgets (30kb was overkill for one use of async.each); linting	2014-03-12 15:05:07 -04:00
Julian Lam	dc99701d42	Merge branch 'master' of github.com:designcreateplay/NodeBB	2014-03-12 14:09:11 -04:00
Julian Lam	2826381b20	draft saving in composer -- resolved #1197	2014-03-12 14:08:55 -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
Julian Lam	da0793c011	Merge branch 'master' of github.com:designcreateplay/NodeBB	2014-03-12 11:41:55 -04:00
Julian Lam	da05330ded	updated cron dependency to require v0.1.4 at least, due to fixes upstream ... re-enabling notifications pruning	2014-03-12 11:41:41 -04:00
barisusakli	6eff7d4c51	mongo cleanup	2014-03-12 02:04:31 -04:00
barisusakli	c320051a1e	chat jshint	2014-03-12 01:40:35 -04:00
Julian Lam	e757183cec	linting	2014-03-12 01:29:24 -04:00
Julian Lam	89ba0840e6	minor reordering of jslint comment	2014-03-12 01:23:35 -04:00
Julian Lam	0668556d4f	Merge branch 'master' of github.com:designcreateplay/NodeBB	2014-03-12 01:23:20 -04:00
Julian Lam	c000a8c5ba	linting	2014-03-12 01:23:11 -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	5e5c6014ac	updated vanilla minver	2014-03-11 23:20:35 -04:00
Julian Lam	9bf1d345e2	adding relative path to a category image for subfolder installs	2014-03-11 23:19:48 -04:00
barisusakli	67f1251ba3	pagination cleanup	2014-03-11 22:54:17 -04:00
barisusakli	3f12e51045	removed relative path from upload_url	2014-03-11 22:34:27 -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