250 Commits

Author	SHA1	Message	Date
psychobunny	f3f08a9c94	more fixes to ajaxify, updated /users blocks to sit flush to the left, started work on the ACP including basic templates, added a method to get active users in all rooms (socket connections), added more routes mostly pointing to admin, added a routing folder to start organizing routes better, starting with admin.	2013-05-09 03:33:53 +00:00
Julian Lam	ff025f0e48	interim commit to thread moving	2013-05-08 14:09:50 -04:00
Baris Usakli	0eacec8166	Merge branch 'master' of https://github.com/psychobunny/NodeBB	2013-05-07 16:21:30 -04:00
Baris Usakli	8fe4905b68	exists function fix	2013-05-07 16:21:25 -04:00
Julian Lam	bf7c602cd8	thread pinning	2013-05-07 15:14:47 -04:00
Julian Lam	7bbc630dfb	Merge remote-tracking branch 'origin' into thread_options ... Conflicts: public/src/templates.js	2013-05-07 12:56:21 -04:00
Julian Lam	250c70bdfc	topic locking and deletion	2013-05-07 12:54:10 -04:00
Baris Usakli	ccf0f6dd73	removed get_username_by_uid, use getUserField(uid,'username',callback) directly	2013-05-07 12:11:22 -04:00
Julian Lam	b2c6d4f7c7	interim commit to thread options	2013-05-07 09:21:46 -04:00
psychobunny	fa64e84dcc	fixed a bug in templates, introduced categories, added default setup script onload, moved home.tpl code over to category, created hierachies	2013-05-06 22:05:42 +00:00
psychobunny	ecf3ffa170	fixed anon bug in users browsing this thread code, simplified the logic as well, fixed language	2013-05-06 17:09:08 +00:00
psychobunny	1009726b51	almost done X users browsing this thread feature. there is one bug where anonymous users do not get disconnected from the room, so I'll have to figure that out later	2013-05-06 06:07:04 +00:00
psychobunny	8a2c18de5b	fixed ajaxify bug that was rendering pages twice (solved flicker issue); fixed entering rooms that was casuing rep/streaming posts to not work; fixed /accounts to work by adding get data route; fixed bug that preventing gravatars from loading if there was more than one post in the thread	2013-05-06 03:41:22 +00:00
Baris Soner Usakli	54b4c55dfc	removed the unused login function	2013-05-05 19:13:08 -04:00
Baris Soner Usakli	fee76db8dc	more fixes	2013-05-05 18:40:04 -04:00
Baris Soner Usakli	8a0266562c	Merge branch 'master' of https://github.com/psychobunny/NodeBB	2013-05-05 17:38:11 -04:00
Baris Soner Usakli	08f7b64ccf	hash changes to user data	2013-05-05 17:38:08 -04:00
psychobunny	26c22b0559	bugfixes + starting active users in thread feature	2013-05-05 20:59:41 +00:00
psychobunny	3947b6b6fd	modified ajaxify slightly to make transitions between pages a bit more fluid (although first load doesn't look that awesome); fixed up rooms - resolved DRY failure and properly leave rooms	2013-05-05 20:10:26 +00:00
psychobunny	bcb672e1fe	socket rooms! and almost finished rep (socket updates) except for one small bug where current_user isnt being pulled	2013-05-03 19:31:21 +00:00
psychobunny	5e48b4cdc5	redis updates for sets: added sadd, srem, and sismember; finished basic favouriting/up/down votes - still need to add socket support in future	2013-05-03 18:54:19 +00:00
psychobunny	c73d1237d2	started favourites/rep	2013-05-03 17:52:20 +00:00
Baris Usakli	7f12d568ff	user name on home.tpl	2013-05-02 16:28:04 -04:00
Baris Usakli	de28d8af55	token bug	2013-05-02 16:00:24 -04:00
Baris Usakli	44485a2e40	fixed session ids	2013-05-02 15:45:19 -04:00
Baris Usakli	39b24436d0	removed global.socket, passing in socket to the functions now	2013-05-02 12:54:27 -04:00
Julian Lam	69bafcf19c	refactoring register to use form post instead of socket (for passport integration)	2013-05-02 10:15:55 -04:00
Julian Lam	a537c4d805	Merge branch 'master' of github.com:psychobunny/node-forum	2013-05-01 21:04:05 -04:00
Julian Lam	d712f57141	refactored user authentication (passport-local, instead of my own ... half-baked implementation)	2013-05-01 21:03:49 -04:00
psychobunny	e658531a67	replies are up	2013-05-01 20:58:36 +00:00
psychobunny	a655ebb290	most users ever online block	2013-05-01 16:14:09 +00:00
Julian Lam	cb9a110a5d	RUN npm install AFTER PULLING THIS COMMIT! ... Added user label to header, gravatar support	2013-04-29 12:22:02 -04:00
Julian Lam	570dfd9786	updated topics module to use uid as a passed in param, instead of through global.uid	2013-04-28 15:41:26 -04:00
Julian Lam	33f155b2d1	updating web sockets so that uid is populated for socket calls	2013-04-28 15:39:40 -04:00
Julian Lam	2a9c33b9f8	user activity counter (bug present where all users register as same session? this isn't good....)	2013-04-25 16:27:22 -04:00
psychobunny	877219cb58	fixed conflicts	2013-04-24 21:19:04 +00:00
psychobunny	e50e136d83	inbetween some changes but asked to pull so I'll comment better later	2013-04-24 21:16:10 +00:00
Julian Lam	0985087f5d	auth...	2013-04-24 17:14:05 -04:00
Julian Lam	71e410d571	Merge branch 'master' of github.com:psychobunny/node-forum ... Conflicts: src/webserver.js	2013-04-24 16:44:12 -04:00
Julian Lam	c1186f396e	some work on session login etc	2013-04-24 16:42:12 -04:00
psychobunny	d711a4e334	added post button, post window, added click handler to toaster alert, started on posts and topics schema and code	2013-04-24 20:40:34 +00:00
Julian Lam	dfd5c9960b	finished pw reset page, finally	2013-04-23 23:28:34 -04:00
Julian Lam	5369be0397	timing out reset codes, enhancing template replace so that a single placeholder can be used multiple times	2013-04-23 21:13:01 -04:00
Julian Lam	a73481af8b	more work with reset page	2013-04-23 15:39:23 -04:00
Julian Lam	0e8c4f35cd	socketing for reset page - started on emailer	2013-04-23 12:06:22 -04:00
Julian Lam	f975105176	added email to registration fields, email existence check	2013-04-22 17:31:51 -04:00
Julian Lam	2d8725d522	changing socket.io to exist on the same port as the server, made config file template (removed config file from repo)	2013-04-22 15:24:23 -04:00
psychobunny	3d81f129e3	added login, fixed gitignore	2013-04-22 19:01:45 +00:00
psychobunny	9b973327a0	registration bugfix	2013-04-22 17:09:40 +00:00
psychobunny	b04d262fe4	init, just some testing	2013-04-22 16:51:32 +00:00