1898 Commits

Author	SHA1	Message	Date
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
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
Julian Lam	0020f278a5	stopped using unnecessary regex in user search	2014-01-21 13:59:03 -05:00
Baris Soner Usakli	aa2978976c	notif fix	2014-01-21 12:35:34 -05:00
Baris Soner Usakli	a1149b8f8d	notif unread class	2014-01-21 10:38:20 -05:00
Baris Soner Usakli	039f02456d	if user is in the topic when a new post comes in mark the topic read	2014-01-21 10:06:13 -05:00
Baris Soner Usakli	9400e5bcc9	motd	2014-01-21 01:27:39 -05:00
Baris Soner Usakli	f282dcd677	Merge branch 'master' of https://github.com/designcreateplay/NodeBB	2014-01-20 21:00:21 -05:00
Baris Soner Usakli	55d4a5fe3a	template fixes closes #825	2014-01-20 21:00:10 -05:00
Julian Lam	affa51856b	closed #801 pending explanation	2014-01-20 19:05:19 -05:00
Aziz Khoury	da647d105b	removing couple of console.log	2014-01-20 16:34:12 -05:00
Aziz Khoury	74f23497dc	password should be passed to action hook, and it was being ovewritten	2014-01-20 16:29:46 -05:00
Aziz Khoury	a13c321de8	added "trust proxy" config option with default to true	2014-01-20 13:23:40 -05:00
Aziz Khoury	ba85ffb292	Merge remote-tracking branch 'upstream/master'	2014-01-20 13:22:16 -05:00
Baris Soner Usakli	71888adb09	closes #815, closes #816	2014-01-20 12:56:09 -05:00
Aziz Khoury	f74f01ca77	Changed User.create signature to accept a hash, added a couple of utility functions as well	2014-01-20 12:41:35 -05:00
Julian Lam	e2960e3ed6	Merge pull request #819 from BitBangersCode/mongo-fix ... Add callback to mongo.searchRemove, fixes infinite schema update	2014-01-20 08:28:23 -08:00
MrWaffle	e4d8ddcf1b	Add callback to mongo.removeSearch, fixes infinite schema update	2014-01-20 17:21:45 +01:00
Julian Lam	e1a9fe9691	Merge branch 'WindowsFix' of github.com:BitBangersCode/NodeBB into BitBangersCode-WindowsFix ... Conflicts: src/webserver.js	2014-01-20 11:08:41 -05:00