11415 Commits

Author	SHA1	Message	Date
Baris Soner Usakli	d718eca935	fixes global meta leak, and categories meta require, #873	2014-01-25 01:34:56 -05:00
psychobunny	46e29dfb2b	Merge branch 'master' of https://github.com/designcreateplay/NodeBB	2014-01-25 00:05:45 -05:00
psychobunny	d67ae5c2be	changing undetected minified JS file warning to info message instead	2014-01-25 00:05:41 -05:00
Baris Soner Usakli	b23960e8d7	fixes to category pagination	2014-01-24 23:05:59 -05:00
Baris Soner Usakli	ef6fd35e85	lots of cleanup, moved pagination to requirejs module	2014-01-24 22:26:11 -05:00
Baris Soner Usakli	0580d0c8a3	Merge branch 'master' of https://github.com/designcreateplay/NodeBB into pagination	2014-01-24 20:51:02 -05:00
Baris Soner Usakli	606367701f	pagination on posts	2014-01-24 20:00:56 -05:00
Julian Lam	d5534cf545	fixing upgrade script on edge builds	2014-01-24 19:55:19 -05:00
Baris Soner Usakli	8d007e7029	Merge branch 'master' of https://github.com/designcreateplay/NodeBB into pagination	2014-01-24 13:27:45 -05:00
Baris Soner Usakli	cf39c66017	some pagination work	2014-01-24 13:27:36 -05:00
Julian Lam	a3fe390810	reverting change to User.search that added "timing" to the return of User.search. Such a change can only be made for 0.4.0, sorry!	2014-01-24 13:09:44 -05:00
Baris Soner Usakli	620ff65cbe	Merge branch 'master' of https://github.com/designcreateplay/NodeBB	2014-01-24 12:11:29 -05:00
Baris Soner Usakli	7f23f848fe	fix for mismatch between favourite count and number of people in favourited seT	2014-01-24 12:11:22 -05:00
Julian Lam	459d5ddccd	fixed #867 - added proper detection so that onpopstate would not react if it was a proper page load	2014-01-24 10:09:28 -05:00
Julian Lam	43808c01ec	reduced the number of 'ajaxify.go' calls to one, in /src	2014-01-24 10:00:57 -05:00
Julian Lam	b587d7b5ad	fixed issue where calls to ajaxify.go were sending in a "template" argument that had since been removed, navigating back to NodeBB from an external link now no longer clobbers the History stack.	2014-01-24 09:48:41 -05:00
Julian Lam	dc7cd95f6d	Merge branch 'master' of github.com:designcreateplay/NodeBB	2014-01-24 08:18:02 -05:00
Baris Soner Usakli	f3bdc55348	little tweak to user search show timing and 10 users, sort after slicing	2014-01-23 23:31:10 -05:00
akhoury	dcc6ec797e	removed use_proxy config, cleaned-up some comments and sneaked in a time log print on initialization, also, related to pull#820	2014-01-23 20:35:53 -05:00
Baris Soner Usakli	b0ef974590	lots of cleanup and refactor	2014-01-23 19:01:30 -05:00
Baris Soner Usakli	f62c82c797	send app to action:app.load	2014-01-23 17:08:33 -05:00
Baris Soner Usakli	bc1cde38da	added getObjectKeys for julian :)	2014-01-23 16:34:54 -05:00
Julian Lam	2af14e47b1	Merge branch 'master' of github.com:designcreateplay/NodeBB	2014-01-23 16:20:46 -05:00
Julian Lam	d380f69310	support for "registered users" and "administrators" in access control (categories). Renamed "Administrators" group to "administrators", and made hidden	2014-01-23 16:19:10 -05:00
Baris Soner Usakli	824c5072e8	topics should be marked read correctly if you are already in it	2014-01-23 15:46:39 -05:00
Julian Lam	f02cd9df82	Merge branch 'master' of github.com:akhoury/NodeBB into akhoury-master ... Conflicts: src/user.js	2014-01-23 08:15:16 -05:00
Aziz Khoury	659817b4f1	Update comment	2014-01-23 01:07:10 -05:00
Aziz Khoury	7e3d8d65f5	Update login.js	2014-01-23 01:04:01 -05:00
Baris Soner Usakli	b717c74a81	closes #856	2014-01-22 23:58:21 -05:00
Baris Soner Usakli	042174290f	removed console.log	2014-01-22 20:35:57 -05:00
Baris Soner Usakli	b325212182	crash fix for admin verify email, temp fix	2014-01-22 19:47:55 -05:00
Baris Soner Usakli	79803d2b3d	Merge branch 'favourite-spy' of https://github.com/BitBangersCode/NodeBB into BitBangersCode-favourite-spy	2014-01-22 15:28:09 -05:00
MrWaffle	d63ced8a5c	Move to client side	2014-01-22 21:08:43 +01:00
MrWaffle	03d92eb5cd	Thought I'd refactor this for you guys	2014-01-22 20:29:37 +01:00
MrWaffle	da317b5a85	async wooo	2014-01-22 20:27:42 +01:00
MrWaffle	c0e2e9d011	Remove log	2014-01-22 20:21:56 +01:00
MrWaffle	69b54337bb	Limit to 5 users	2014-01-22 20:21:12 +01:00
Baris Soner Usakli	b945dfc71d	closes #843	2014-01-22 14:04:04 -05:00
MrWaffle	b887b76c29	Implement favourite tooltip to show who favourited a post	2014-01-22 19:46:34 +01:00
Baris Soner Usakli	baa74958c5	can set image class for categories	2014-01-22 11:46:50 -05:00
Barış Soner Uşaklı	c709fae251	Merge pull request #828 from BitBangersCode/admin-group-fix ... Admin group fix	2014-01-22 08:03:01 -08:00
Richie Preece	d959aad41f	Changed to bcrypt.js	2014-01-21 20:56:12 -07:00
Baris Soner Usakli	18075b85c7	winston.error	2014-01-21 20:57:02 -05:00
Baris Soner Usakli	e997c63480	return error	2014-01-21 20:47:03 -05:00
psychobunny	3b4f0a8f4e	updating motd for incoming theme	2014-01-21 16:51:04 -05:00
Julian Lam	53a1474785	second pass for #773, blocked for now	2014-01-21 15:29:34 -05:00
Julian Lam	bafc8caaf5	first pass at #773	2014-01-21 15:17:41 -05:00
Josh Rickers	55b0270b34	Merge branch 'master' into admin-group-fix	2014-01-21 19:59:21 +00:00
Josh Rickers	bac1a5ec3e	updated groups to stop you from removing yourself from the admin group	2014-01-21 19:37:01 +00:00
Julian Lam	397861c3cc	Merge branch 'master' of github.com:designcreateplay/NodeBB	2014-01-21 14:01:38 -05:00