psychobunny
|
448673b141
|
recent replies part 2
|
12 years ago |
|
psychobunny
|
55cb790d3c
|
potential fix for duplicate chat results, started recent replies block
|
12 years ago |
Julian Lam
|
e6218bb74a
|
Merge branch 'master' of github.com:psychobunny/node-forum
|
12 years ago |
|
Julian Lam
|
2a829a0618
|
derpy globals to get notification pushing working for sockets on new notification event
|
12 years ago |
Baris Usakli
|
99eb9f8399
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
12 years ago |
|
Baris Usakli
|
a4e10076cc
|
assorted
|
12 years ago |
|
psychobunny
|
1f99666d9f
|
moved favourites code out of posts
|
12 years ago |
|
Julian Lam
|
bafac00232
|
Merge branch 'master' of github.com:psychobunny/node-forum
Conflicts:
src/websockets.js
|
12 years ago |
|
Julian Lam
|
35dae6c0ec
|
updating web sockets so that all connections are stored in a userSockets array
|
12 years ago |
|
Baris Usakli
|
b0be1fab16
|
notifications in chat messages
|
12 years ago |
|
Julian Lam
|
681bf270a1
|
hotfix to path to utils
|
12 years ago |
|
Julian Lam
|
ffbafc99c4
|
Merge remote-tracking branch 'origin' into notifications
Conflicts:
public/css/style.less
public/src/app.js
src/websockets.js
|
12 years ago |
|
Julian Lam
|
c8d48127ad
|
more changes to notification dropdown in header bar
|
12 years ago |
|
psychobunny
|
9503aa9a57
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
12 years ago |
|
psychobunny
|
a9672ab9d8
|
begin refactor of posts/topics + pagination + cleanup + async
|
12 years ago |
Julian Lam
|
194793d14d
|
Merge branch 'master' into notifications
Conflicts:
src/websockets.js
|
12 years ago |
|
Julian Lam
|
6bae30336a
|
foundation for user notifications
|
12 years ago |
|
Baris Usakli
|
8d0ac4cb07
|
chat feature
|
12 years ago |
|
Baris Usakli
|
9f8c9e8822
|
derp
|
12 years ago |
|
Julian Lam
|
26781157b3
|
refactoring posts, topics, and categories so that each "get" is moved up
one level. Topics.get will get all of the posts in a tid, etc.
|
12 years ago |
|
psychobunny
|
ab492f147f
|
check for online/offline users, added custom redis sismembers method, fix for category view not showing up if it has no topics
|
12 years ago |
|
psychobunny
|
e694751b72
|
fixed templates bug in websockets
|
12 years ago |
|
Julian Lam
|
a4dfc604e7
|
changed favouriting behaviour so that it no longer allows anons to favourite, and favouriting your own posts don't raise your rep count
|
12 years ago |
|
Baris Usakli
|
b429a31f6b
|
more clean up
|
12 years ago |
|
Baris Usakli
|
4c324664fa
|
removed global modules
|
12 years ago |
|
Julian Lam
|
4fd1244e2d
|
some work on deleting posts, and allowing a mod to edit a post
|
12 years ago |
|
Julian Lam
|
b244da724e
|
edit labels, and fixing responsive layout in topic view
|
12 years ago |
|
Julian Lam
|
e9a552eab4
|
editing of posts
|
12 years ago |
psychobunny
|
09c9d0ee1f
|
fixed topics bug that was prevent /latest /popular /active and subsequently the admin versions of those routes from working. removed debug statements. added admin socket room. added dynamic updating of active users on acp index
|
12 years ago |
|
psychobunny
|
30323fa29f
|
Merge branch 'master' of https://github.com/psychobunny/NodeBB
|
12 years ago |
|
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.
|
12 years ago |
|
Julian Lam
|
ff025f0e48
|
interim commit to thread moving
|
12 years ago |
|
Baris Usakli
|
0eacec8166
|
Merge branch 'master' of https://github.com/psychobunny/NodeBB
|
12 years ago |
|
Baris Usakli
|
8fe4905b68
|
exists function fix
|
12 years ago |
|
Julian Lam
|
bf7c602cd8
|
thread pinning
|
12 years ago |
|
Julian Lam
|
7bbc630dfb
|
Merge remote-tracking branch 'origin' into thread_options
Conflicts:
public/src/templates.js
|
12 years ago |
|
Julian Lam
|
250c70bdfc
|
topic locking and deletion
|
12 years ago |
|
Baris Usakli
|
ccf0f6dd73
|
removed get_username_by_uid, use getUserField(uid,'username',callback) directly
|
12 years ago |
|
Julian Lam
|
b2c6d4f7c7
|
interim commit to thread options
|
12 years ago |
|
psychobunny
|
fa64e84dcc
|
fixed a bug in templates, introduced categories, added default setup script onload, moved home.tpl code over to category, created hierachies
|
12 years ago |
|
psychobunny
|
ecf3ffa170
|
fixed anon bug in users browsing this thread code, simplified the logic as well, fixed language
|
12 years ago |
|
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
|
12 years ago |
|
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
|
12 years ago |
|
Baris Soner Usakli
|
54b4c55dfc
|
removed the unused login function
|
12 years ago |
|
Baris Soner Usakli
|
fee76db8dc
|
more fixes
|
12 years ago |
|
Baris Soner Usakli
|
8a0266562c
|
Merge branch 'master' of https://github.com/psychobunny/NodeBB
|
12 years ago |
|
Baris Soner Usakli
|
08f7b64ccf
|
hash changes to user data
|
12 years ago |
|
psychobunny
|
26c22b0559
|
bugfixes + starting active users in thread feature
|
12 years ago |
|
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
|
12 years ago |
|
psychobunny
|
bcb672e1fe
|
socket rooms! and almost finished rep (socket updates) except for one small bug where current_user isnt being pulled
|
12 years ago |
|
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
|
12 years ago |
|
psychobunny
|
c73d1237d2
|
started favourites/rep
|
12 years ago |
|
Baris Usakli
|
7f12d568ff
|
user name on home.tpl
|
12 years ago |
|
Baris Usakli
|
de28d8af55
|
token bug
|
12 years ago |
|
Baris Usakli
|
44485a2e40
|
fixed session ids
|
12 years ago |
|
Baris Usakli
|
39b24436d0
|
removed global.socket, passing in socket to the functions now
|
12 years ago |
|
Julian Lam
|
69bafcf19c
|
refactoring register to use form post instead of socket (for passport integration)
|
12 years ago |
|
Julian Lam
|
a537c4d805
|
Merge branch 'master' of github.com:psychobunny/node-forum
|
12 years ago |
|
Julian Lam
|
d712f57141
|
refactored user authentication (passport-local, instead of my own
half-baked implementation)
|
12 years ago |
|
psychobunny
|
e658531a67
|
replies are up
|
12 years ago |
|
psychobunny
|
a655ebb290
|
most users ever online block
|
12 years ago |
|
Julian Lam
|
cb9a110a5d
|
RUN npm install AFTER PULLING THIS COMMIT!
Added user label to header, gravatar support
|
12 years ago |
|
Julian Lam
|
570dfd9786
|
updated topics module to use uid as a passed in param, instead of through global.uid
|
12 years ago |
|
Julian Lam
|
33f155b2d1
|
updating web sockets so that uid is populated for socket calls
|
12 years ago |
|
Julian Lam
|
2a9c33b9f8
|
user activity counter (bug present where all users register as same session? this isn't good....)
|
12 years ago |
|
psychobunny
|
877219cb58
|
fixed conflicts
|
12 years ago |
|
psychobunny
|
e50e136d83
|
inbetween some changes but asked to pull so I'll comment better later
|
12 years ago |
|
Julian Lam
|
0985087f5d
|
auth...
|
12 years ago |
|
Julian Lam
|
71e410d571
|
Merge branch 'master' of github.com:psychobunny/node-forum
Conflicts:
src/webserver.js
|
12 years ago |
|
Julian Lam
|
c1186f396e
|
some work on session login etc
|
12 years ago |
|
psychobunny
|
d711a4e334
|
added post button, post window, added click handler to toaster alert, started on posts and topics schema and code
|
12 years ago |
|
Julian Lam
|
dfd5c9960b
|
finished pw reset page, finally
|
12 years ago |
|
Julian Lam
|
5369be0397
|
timing out reset codes, enhancing template replace so that a single placeholder can be used multiple times
|
12 years ago |
|
Julian Lam
|
a73481af8b
|
more work with reset page
|
12 years ago |
|
Julian Lam
|
0e8c4f35cd
|
socketing for reset page - started on emailer
|
12 years ago |
|
Julian Lam
|
f975105176
|
added email to registration fields, email existence check
|
12 years ago |
|
Julian Lam
|
2d8725d522
|
changing socket.io to exist on the same port as the server, made config file template (removed config file from repo)
|
12 years ago |
|
psychobunny
|
3d81f129e3
|
added login, fixed gitignore
|
12 years ago |
|
psychobunny
|
9b973327a0
|
registration bugfix
|
12 years ago |
|
psychobunny
|
b04d262fe4
|
init, just some testing
|
12 years ago |