2828 Commits

Author	SHA1	Message	Date
psychobunny	d20501b29d	meta.js merge conflict	2014-03-02 22:59:57 -05:00
psychobunny	cdf92c5cda	fixed a really annoying bug - the original topics route pre-refactor never actually included a privileges object	2014-03-02 22:54:03 -05:00
Julian Lam	fc53385ede	removing socket.io library from minfile	2014-03-02 22:34:57 -05:00
psychobunny	fa2b5d1ee6	re-implementing meta and link tags - completified	2014-03-02 22:15:27 -05:00
psychobunny	3eb9f65c2e	jshinting controllers/index.js; adding back meta tags to home page	2014-03-02 22:12:08 -05:00
psychobunny	8df33e65ac	fixing bug in topics causing meta tags to revert on subsequent refresh	2014-03-02 22:10:57 -05:00
Julian Lam	1837a8443c	shifting socket.io back to the end :\	2014-03-02 19:55:50 -05:00
Julian Lam	a8d2b46911	fixed incorrect path in plugin script inclusion	2014-03-02 16:44:41 -05:00
Julian Lam	e70bc9f163	added deprecation warning for plugins using filter:scripts.get	2014-03-02 16:33:45 -05:00
Julian Lam	5553e07bbd	moving socket.IO client lib to top of file, just in case	2014-03-02 16:29:21 -05:00
Julian Lam	4c2a6953f1	concatenating the client scripts, instead of compressing, in development mode	2014-03-02 15:34:12 -05:00
psychobunny	dbbbe21883	re-implementing meta and link tags part 1	2014-03-02 15:14:38 -05:00
psychobunny	6820e9e662	random jshinting expedition	2014-03-02 14:45:57 -05:00
psychobunny	f0dfee5402	clean up	2014-03-02 14:21:24 -05:00
psychobunny	6c3c669e31	moved middleware out of webserver.js and into middleware.js	2014-03-02 14:16:16 -05:00
psychobunny	936e52a43f	require db	2014-03-02 14:00:28 -05:00
Julian Lam	3860abdc24	plugins can now pass in scripts in plugin.json, and they will be bundled into nodebb.min.js	2014-03-02 13:58:25 -05:00
psychobunny	4d598dcd63	moved process events out of webserver.js and into app.js	2014-03-02 13:56:46 -05:00
psychobunny	ee5596fad5	Merge remote-tracking branch 'origin/master' into webserver.js-refactor	2014-03-02 13:51:34 -05:00
Julian Lam	14d7453a23	bundling socket.io client library into minfile, minfile always used from this point forward, even in development mode. ... Development mode will not compress the scripts, but will just concatenate.	2014-03-02 13:28:09 -05:00
Baris Soner Usakli	feeb220514	removed console.log	2014-03-01 22:52:30 -05:00
Baris Soner Usakli	1b7f8cc5cb	active users fix	2014-03-01 22:51:39 -05:00
Baris Soner Usakli	fb691b23b4	moved topic locked check to topic.reply	2014-03-01 22:03:21 -05:00
Julian Lam	079ed10631	Merge branch 'master' of github.com:designcreateplay/NodeBB	2014-03-01 21:32:43 -05:00
Julian Lam	2b178ff76d	proper tracking of users' reply status when others enter the room	2014-03-01 21:31:50 -05:00
Baris Soner Usakli	2966cc4a49	minor fix	2014-03-01 19:18:15 -05:00
Baris Soner Usakli	b2f9184562	Merge branch 'master' of https://github.com/designcreateplay/NodeBB	2014-03-01 19:15:25 -05:00
Baris Soner Usakli	b6d97281d3	closes #1015	2014-03-01 19:15:18 -05:00
Julian Lam	a9b78d2600	minimizing the composer should unregister it	2014-03-01 17:49:39 -05:00
Baris Soner Usakli	42a7c037e6	removed dupe i var	2014-03-01 17:36:29 -05:00
psychobunny	f46e563b8a	moved all route definitions in webserver.js into routes/index.js	2014-03-01 17:35:47 -05:00
psychobunny	08a9ce4950	moved all app.configure() code into middleware/index.js + organization/cleanup	2014-03-01 17:26:26 -05:00
Julian Lam	fcb44ae256	Merge branch 'master' of github.com:designcreateplay/NodeBB	2014-03-01 17:06:02 -05:00
Julian Lam	d012d237bf	added back clearInterval	2014-03-01 17:05:57 -05:00
Baris Soner Usakli	c4d1c8feff	Merge branch 'master' of https://github.com/designcreateplay/NodeBB	2014-03-01 16:59:13 -05:00
Baris Soner Usakli	87f337f2fb	cleanup	2014-03-01 16:59:04 -05:00
Julian Lam	7ef84e0daa	switched to 'ping active' system	2014-03-01 16:53:41 -05:00
Julian Lam	7ff9fa1a44	Merge branch 'master' of github.com:designcreateplay/NodeBB	2014-03-01 15:46:27 -05:00
Julian Lam	b3d7ae1c86	showing who is replying in the active users block	2014-03-01 15:46:13 -05:00
Baris Soner Usakli	0c9ab5e93f	Merge branch 'master' of https://github.com/designcreateplay/NodeBB	2014-03-01 15:45:55 -05:00
psychobunny	804da0d8de	removed unused deps in webser.js	2014-03-01 15:45:47 -05:00
Baris Soner Usakli	fff3ba5bec	hinted redis.js	2014-03-01 15:45:43 -05:00
psychobunny	26853d024e	Merge remote-tracking branch 'origin/master' into webserver.js-refactor	2014-03-01 15:37:57 -05:00
Julian Lam	0fecbf7cbf	entity decoding in filenames	2014-02-28 23:38:04 -05:00
Julian Lam	6bc759748f	Merge branch 'master' of github.com:designcreateplay/NodeBB	2014-02-28 20:51:17 -05:00
Julian Lam	1f136c6a72	ninjafix to mappedPath	2014-02-28 20:51:12 -05:00
Baris Soner Usakli	24b669bd39	some fixes for search plugin	2014-02-28 20:47:49 -05:00
Julian Lam	1c19ae48bd	fixed #1143 -- also removed near-meaningless info messages saying that a Hook had been registered.	2014-02-28 20:39:27 -05:00
Julian Lam	5540313b7f	fixing path resolution for plugins in production mode	2014-02-28 20:13:28 -05:00
Julian Lam	5e2460e17e	fixed #1144	2014-02-28 20:05:19 -05:00