533 Commits

Author	SHA1	Message	Date
psychobunny	de1e3230f5	fixed topics and admin views, broken after merge	2013-09-24 15:23:16 -04:00
psychobunny	1fbc038e64	fixed conflicts, added new language key for users/online	2013-09-24 15:15:39 -04:00
psychobunny	cd63dd429b	finalizing todo's before merging	2013-09-24 14:59:13 -04:00
Baris Usakli	fbfdf561fc	Merge branch 'master' of https://github.com/designcreateplay/NodeBB	2013-09-24 14:57:01 -04:00
Baris Usakli	83d5a84edd	login redirects back	2013-09-24 14:56:51 -04:00
psychobunny	5abf02c6d1	default language, en	2013-09-24 14:55:46 -04:00
psychobunny	b8037845d6	registration.tpl; translator variable system	2013-09-24 14:50:38 -04:00
psychobunny	5c7da4b686	fixed serverside templating; footer, logout internationalization; updated more global lang keys	2013-09-24 14:14:26 -04:00
Julian Lam	964fbfe2bb	fixes to get nodebb to at least load on IE	2013-09-24 13:30:54 -04:00
Julian Lam	0d9958afe7	HOTFIX for scripts	2013-09-24 13:01:18 -04:00
Julian Lam	66cb1fb6ad	removed console.log from socket connection success handler	2013-09-24 11:02:06 -04:00
Julian Lam	99440585e6	Merge branch 'master' into optimize-22-09-2013 ... Conflicts: package.json	2013-09-23 20:04:09 -04:00
Baris Usakli	290d69d14a	remember where the topic was left off	2013-09-23 17:41:54 -04:00
Baris Usakli	aa6eff4c54	one more itme	2013-09-23 14:58:06 -04:00
Baris Usakli	f36583e676	possible fix for users/online duplication	2013-09-23 14:55:34 -04:00
Baris Usakli	0a0a91d4b2	remove listener	2013-09-23 14:51:59 -04:00
Baris Usakli	6c70f9e308	only collapse header if its expanded	2013-09-23 14:51:16 -04:00
Baris Usakli	b25c3d8b67	closes #324	2013-09-23 14:40:31 -04:00
Baris Usakli	776b51fef7	closes #323	2013-09-23 13:43:15 -04:00
Julian Lam	043aafd7b7	closed #315	2013-09-22 20:40:10 -04:00
Julian Lam	6fd202fe36	closed #321, removed cheerio use altogether, and made changes to the ... client side to ajaxify the user to /outgoing when an external link is clicked	2013-09-22 15:27:10 -04:00
Baris Soner Usakli	bcb492751c	closes #313, also fixed progressbar	2013-09-22 00:01:31 -04:00
psychobunny	5a10f7fcfe	init variables in translator	2013-09-20 17:31:53 -04:00
psychobunny	5e89caf358	internationalization: topic.json	2013-09-20 17:16:01 -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
psychobunny	451ffafb9e	finished initial client side & server side language parsing methods; integrated preloading into ajaxify and server app.js	2013-09-20 16:01:52 -04:00
psychobunny	b5274a0d91	init	2013-09-20 14:35:32 -04:00
Baris Usakli	21efda4a84	Merge branch 'master' of https://github.com/designcreateplay/NodeBB	2013-09-19 16:40:11 -04:00
Baris Usakli	082375f129	link fade outs	2013-09-19 16:40:02 -04:00
Julian Lam	1204859263	Merge branch 'master' of github.com:designcreateplay/NodeBB	2013-09-19 16:38:20 -04:00
Julian Lam	c8b5d1561e	minor CSS fixes to post timeago text in topic view	2013-09-19 16:38:04 -04:00
Baris Usakli	d84d096e7e	added post links	2013-09-19 16:24:30 -04:00
Baris Usakli	29c17fd32e	fixed user infinite loading	2013-09-19 15:50:28 -04:00
Baris Usakli	d721320af5	added jquery.timeago.js	2013-09-19 15:10:03 -04:00
Baris Usakli	efef9c864c	closes #306	2013-09-19 15:02:35 -04:00
Baris Usakli	24e4be77d8	closes #304	2013-09-18 16:01:54 -04:00
Baris Usakli	eddddc694d	closes #302	2013-09-17 14:37:01 -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	c44461e33f	formatting - template js admin side	2013-09-17 13:07:30 -04:00
psychobunny	221b9bc149	formatting - template associated js	2013-09-17 13:05:54 -04:00
psychobunny	dc41c6bc0d	formatting - core client side	2013-09-17 13:04:40 -04:00
psychobunny	828d937dec	.jsbeautify	2013-09-17 13:03:53 -04:00
psychobunny	b85e2545d6	fixes #299	2013-09-15 16:32:30 -04:00
Baris Soner Usakli	b0a37c6ac5	closes #293	2013-09-14 22:04:03 -04:00
Julian Lam	8b3fd9d1e9	fixed bug where deleted threads caused thread tools to disappear (js ... error)	2013-09-14 11:44:06 -04:00
Vincent Briglia	b1003e954e	user search shouldn't replace the whole top-level userbox	2013-09-12 16:04:04 +00:00
Baris Usakli	85fbe38e71	fixed to icon selection in admin/categories	2013-09-11 16:44:40 -04:00
Baris Usakli	e896fd1fd6	show created category right away	2013-09-11 16:20:00 -04:00