5434 Commits

Author	SHA1	Message	Date
psychobunny	4e7f22a674	cleanup	2014-09-25 12:32:48 -04:00
Julian Lam	5a36c33fac	fixed #2142 -- passing in cached (pre-required) redis module into socket.io so it uses the same redis module... why? who bloody knows.	2014-09-25 11:56:33 -04:00
psychobunny	1a18bf22aa	linting	2014-09-25 11:41:13 -04:00
psychobunny	467d486e58	closes #2145	2014-09-25 11:29:53 -04:00
psychobunny	99a56acab8	#1999 sending ajaxify-data to client on cold loads ... commented out until we figure out what we're doing with the renamed properties (see issue)	2014-09-25 11:22:11 -04:00
Julian Lam	b0323e4d3b	closed #2150	2014-09-25 10:57:37 -04:00
psychobunny	6f937c59fb	gitignore check for config.json too strict	2014-09-24 21:48:42 -04:00
barisusakli	1fe5a8788f	check err	2014-09-24 21:37:36 -04:00
psychobunny	af2b66f438	closes #2107	2014-09-24 18:43:02 -04:00
psychobunny	e336188ccc	admin/header.tpl use admin.css instead of stylesheet.css	2014-09-24 18:36:59 -04:00
psychobunny	81ce7f93ad	compile admin stylesheet separately	2014-09-24 18:36:58 -04:00
barisusakli	c000e852b5	closes #1935	2014-09-24 17:13:17 -04:00
psychobunny	027e8eb54c	acp searching, closes #2140	2014-09-24 15:55:45 -04:00
psychobunny	977bc014f9	index acp files	2014-09-24 15:55:44 -04:00
barisusakli	73faa79a69	fix edit page csrf, category slug optional	2014-09-24 15:53:39 -04:00
barisusakli	da64eb0873	closes #2117	2014-09-24 15:42:49 -04:00
psychobunny	5d344b3dac	linting	2014-09-24 14:49:16 -04:00
psychobunny	9f40cd03e8	on /admin/settings, render general	2014-09-24 14:47:58 -04:00
psychobunny	117b8dece4	settings acp refactor for dedicated routes	2014-09-24 14:45:49 -04:00
barisusakli	6abb0ff4c8	Merge branch 'master' of https://github.com/NodeBB/NodeBB	2014-09-24 13:50:45 -04:00
barisusakli	1a26cb0938	#2139	2014-09-24 13:50:43 -04:00
psychobunny	64b43d58ea	moved core templates into nodebb core (admin, status pages, emails)	2014-09-24 13:45:11 -04:00
barisusakli	4eabf41a21	dont allow invalid status to be set	2014-09-24 13:36:32 -04:00
barisusakli	bedadd8b5f	#2137	2014-09-24 00:07:24 -04:00
barisusakli	23197af725	closes #2114	2014-09-23 23:05:46 -04:00
Julian Lam	ecea917d11	closed #2097 -- NodeBB will prefer using Redis as session store if at all possible	2014-09-23 17:18:44 -04:00
Julian Lam	20819e3dfd	Revert "use redis session storage instead of connect-mongo" ... This reverts commit 056f89d6cf.	2014-09-23 17:18:43 -04:00
Julian Lam	f41be4ae8b	exposed redis' "connect" method, so socket.io can call it from outside database/redis.js, fixed NodeBB requiring Redis as a socket.io store. It will now go back to using in-memory store per process, if no redis config is found in the NodeBB configuration. re: #2097	2014-09-23 17:09:46 -04:00
barisusakli	b1f492dec3	fix redis bulk zadd	2014-09-23 17:07:22 -04:00
Julian Lam	e1211527b0	Merge branch '0.5.1' into hashtalk ... Conflicts: src/controllers/topics.js	2014-09-23 16:16:45 -04:00
Julian Lam	528ee3ad05	Merge remote-tracking branch 'origin/hashtalk' into hashtalk	2014-09-23 16:02:38 -04:00
barisusakli	64c51d5cba	check nid before pusing and marking read	2014-09-23 16:02:23 -04:00
Julian Lam	50a7c42f15	Merge remote-tracking branch 'origin/hashtalk' into hashtalk	2014-09-23 16:02:22 -04:00
Julian Lam	05e147b440	Merge branch 'master' of github.com:chronize/NodeBB into chronize-master	2014-09-23 16:00:11 -04:00
psychobunny	a0da73dabd	don't pass back err if plugin.json is corrupted	2014-09-23 15:03:13 -04:00
psychobunny	180625ece3	forgot to return just posts array	2014-09-23 14:00:28 -04:00
psychobunny	77dfc7378b	filter:post.getPostSummaryByPids	2014-09-23 13:58:16 -04:00
psychobunny	0eb4fd89ef	don't blow up nodebb if plugin.json is broken	2014-09-23 13:58:14 -04:00
barisusakli	0767998022	closes #2124	2014-09-23 13:34:53 -04:00
psychobunny	99bacf910c	oops - #2126	2014-09-23 13:33:36 -04:00
psychobunny	7f2254c9da	closes https://github.com/NodeBB/NodeBB/issues/2126	2014-09-23 13:08:53 -04:00
barisusakli	2d5dc44ce5	closes #2123	2014-09-22 21:54:28 -04:00
barisusakli	515e663f85	getObjectsFix ... return empty array if keys is empty or not an array	2014-09-22 21:47:20 -04:00
barisusakli	39392672a2	moved static ... removed pageRouter middleware into routes, helper method to setup page routes	2014-09-22 21:39:02 -04:00
Julian Lam	9b9e79ef27	re: #2099	2014-09-22 20:31:57 -04:00
Julian Lam	bfdc32a9c3	typo	2014-09-22 19:03:59 -04:00
psychobunny	0db93504ce	forgot comma	2014-09-22 16:09:27 -04:00
psychobunny	2b90add560	fix for topics without category data (?) ... @barisusakli lemme know if this is legit, if not, see line 195 as well	2014-09-22 16:08:40 -04:00
barisusakli	8b64e65095	cleaned up admin routes	2014-09-22 15:43:41 -04:00
barisusakli	21f65cbb6a	crash fix	2014-09-22 12:39:25 -04:00