1057 Commits

Author	SHA1	Message	Date
Julian Lam	1ae51ef5ea	redis export function (commented out for now)	2013-09-24 15:36:17 -04:00
psychobunny	1fbc038e64	fixed conflicts, added new language key for users/online	2013-09-24 15:15:39 -04:00
Julian Lam	c80e2552b2	express-namespaceing routes	2013-09-24 14:18:41 -04:00
psychobunny	5c7da4b686	fixed serverside templating; footer, logout internationalization; updated more global lang keys	2013-09-24 14:14:26 -04:00
Baris Usakli	9a4eb26246	closes #332	2013-09-24 13:06:14 -04:00
Julian Lam	0d9958afe7	HOTFIX for scripts	2013-09-24 13:01:18 -04:00
Julian Lam	d6dd74b50a	removed extra debug log	2013-09-24 12:34:54 -04:00
Julian Lam	d5437ca8fa	Merge branch 'master' of github.com:designcreateplay/NodeBB	2013-09-24 12:34:17 -04:00
Julian Lam	14720057c2	serving unminified libraries in development mode, minified otherwise	2013-09-24 12:33:51 -04:00
Baris Usakli	170ed8cc01	fixed conflict	2013-09-24 12:31:28 -04:00
Baris Usakli	25576eb35a	closes #329	2013-09-24 12:29:51 -04:00
Julian Lam	bcc65fd879	closed #328	2013-09-24 08:38:19 -04:00
Julian Lam	99440585e6	Merge branch 'master' into optimize-22-09-2013 ... Conflicts: package.json	2013-09-23 20:04:09 -04:00
Julian Lam	521586f08f	Merge branch 'master' of github.com:designcreateplay/NodeBB	2013-09-23 15:45:23 -04:00
Baris Usakli	bae9f46d8b	small fixes to search	2013-09-23 15:31:52 -04:00
Julian Lam	d7ea24e218	issue #322 - minifying css file and added jquery to minified compilation	2013-09-23 15:27:46 -04:00
Julian Lam	e621d7e601	closed #322 - autominifying client-side assets on load	2013-09-23 15:21:34 -04:00
Baris Usakli	b25c3d8b67	closes #324	2013-09-23 14:40:31 -04:00
Baris Usakli	bade99d069	Merge branch 'master' of https://github.com/designcreateplay/NodeBB	2013-09-23 13:43:25 -04:00
Baris Usakli	776b51fef7	closes #323	2013-09-23 13:43:15 -04:00
Julian Lam	7fdf83089d	linting	2013-09-23 12:50:27 -04:00
Julian Lam	043aafd7b7	closed #315	2013-09-22 20:40:10 -04:00
Julian Lam	5f00f1e18e	renamed "toHTML" method to "parse"	2013-09-22 13:54:21 -04:00
Julian Lam	c940ce3329	camelCased get_latest_undeleted_pid method	2013-09-22 13:33:05 -04:00
Julian Lam	2366e2b209	refactored get_latest_undeleted_pid to not blindly call getPostsByTid in ... order to determine post deletion. (issue #320)	2013-09-22 13:28:10 -04:00
Julian Lam	2b7fd3c9d1	interim commit	2013-09-22 12:55:03 -04:00
Baris Soner Usakli	de34c7580f	closes #314	2013-09-22 00:29:31 -04:00
Julian Lam	8243019a60	closed #312	2013-09-20 20:43:02 -04:00
psychobunny	8b8a890ac9	removed unnecessary warning message to anonymous users attempting to unfavourite posts	2013-09-20 16:57:25 -04:00
psychobunny	5645bcee2d	topic.json en lang; tested serverside internationalization in favourites; fixed some keys in login	2013-09-20 16:43:50 -04:00
Baris Soner Usakli	6be5bcc4c8	closes #308	2013-09-19 20:43:56 -04:00
Baris Usakli	efef9c864c	closes #306	2013-09-19 15:02:35 -04:00
Baris Usakli	27cb837b08	closes #303	2013-09-19 12:29:25 -04:00
Baris Usakli	f9442db96f	closes #284	2013-09-18 16:23:08 -04:00
Baris Usakli	e5ef498164	merged users.tpl	2013-09-18 16:05:01 -04:00
Baris Usakli	24e4be77d8	closes #304	2013-09-18 16:01:54 -04:00
Julian Lam	ccca4d2914	fixed issue where meta was called before nconf loaded	2013-09-18 12:15:29 -04:00
psychobunny	28704a6164	hinting	2013-09-18 10:50:02 -04:00
psychobunny	cf4ba9d1d3	format/jshint favourites.js	2013-09-18 10:44:54 -04:00
Julian Lam	c69e30c146	Merge branch 'master' of github.com:designcreateplay/NodeBB	2013-09-18 07:23:50 -04:00
psychobunny	fd32d75d3b	jshinted categories.js	2013-09-17 15:54:08 -04:00
psychobunny	64b071f277	nconf and redis wrapper no longer global objects. jshinted app.js. updated sockets.io to latest	2013-09-17 15:38:57 -04:00
Julian Lam	af246ad0d7	Merge remote-tracking branch 'origin'	2013-09-17 15:14:15 -04:00
Julian Lam	56a87329ec	removing extra line	2013-09-17 15:14:11 -04:00
Baris Usakli	ce61138351	fixed conflicts	2013-09-17 13:42:07 -04:00
Baris Usakli	564662ee00	closes #294	2013-09-17 13:37:03 -04:00
psychobunny	1b9e451a6f	formatting - server side admin	2013-09-17 13:10:58 -04:00
psychobunny	1780b343b4	formatting - routes	2013-09-17 13:10:14 -04:00
psychobunny	aea3181d27	formatting - server side core	2013-09-17 13:09:37 -04:00
Julian Lam	d249f411f8	closed #300 - issue where web socket connections were not working properly ... with passworded redis instances	2013-09-15 20:51:36 -04:00