psychobunny
|
d98a1473ee
|
Merge branch 'master' of https://github.com/psychobunny/NodeBB
|
12 years ago |
|
psychobunny
|
42b4f90fed
|
bad commit earlier, lost the footer. just reduced delay to 200ms now and it looks much better
|
12 years ago |
Baris Soner Usakli
|
7d27a7c6d3
|
changed user update profile so that it only updates specific fields, before it was possible to send in rep,post count
|
12 years ago |
|
psychobunny
|
88f64b4a79
|
optimized the transition between pages just a bit
|
12 years ago |
Julian Lam
|
e9a552eab4
|
editing of posts
|
12 years ago |
|
psychobunny
|
f218e0f3a7
|
user has read feature - turns post count badge red if there is a new post and grey if the user has seen this post already
|
12 years ago |
|
psychobunny
|
a4e8f9e706
|
cleaned up webserver a bit, moved over authentication stuff into its own file, got rid of unused routes, user routes still need to be moved out but am waiting for baris to finish
|
12 years ago |
|
psychobunny
|
d77ab9048d
|
removed logs
|
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
|
3709150911
|
Merge branch 'master' of github.com:psychobunny/node-forum
|
12 years ago |
|
Julian Lam
|
2acd40a8bb
|
fixing up the post window to extend the body when opened, so it doesn't clip stuff
|
12 years ago |
|
Baris Usakli
|
5057af7bbe
|
user edit fix for !==
|
12 years ago |
|
Julian Lam
|
2ca1986b40
|
moving threads will refresh view for all connected clients as well
|
12 years ago |
|
Julian Lam
|
a0fa95b9f0
|
Merge branch 'master' of github.com:psychobunny/node-forum
|
12 years ago |
|
Baris Usakli
|
9166a9ccde
|
user edit changes
|
12 years ago |
|
Julian Lam
|
917eadae95
|
Merge remote-tracking branch 'origin'
|
12 years ago |
|
Baris Usakli
|
67191b3a54
|
Merge branch 'master' of https://github.com/psychobunny/NodeBB
|
12 years ago |
|
Julian Lam
|
ff025f0e48
|
interim commit to thread moving
|
12 years ago |
|
Baris Usakli
|
5edf7efd8f
|
user edit and profile changes
|
12 years ago |
|
psychobunny
|
8e1ee88878
|
removed derpy + from header ill come back to that later when im more inspired... fixed ajaxify for custom routed urls, fixed recent/popular/active tab's invalid object initializer
|
12 years ago |
|
psychobunny
|
baecab84de
|
added code to remove fields that are not passed in for templates
|
12 years ago |
|
Baris Usakli
|
187d5a101a
|
edit page
|
12 years ago |
|
psychobunny
|
31e845f4b0
|
added regex matching to templates/ajaxify. needs cleanup, just unblocking baris
|
12 years ago |
|
Baris Usakli
|
36e7baa84d
|
userS
|
12 years ago |
|
Baris Usakli
|
b2adda06c8
|
Merge branch 'master' of https://github.com/psychobunny/NodeBB
|
12 years ago |
|
Baris Usakli
|
d308242d2d
|
decimal places for rep and post count
|
12 years ago |
|
Julian Lam
|
4dced643c5
|
tweaking app.alert so that on regular fadeout (after timeout expiry), the alert is removed from the DOM
|
12 years ago |
|
psychobunny
|
4cb59c5aa9
|
started styling category.tpl, and added a fail plus sign to header, will revisit in the AM
|
12 years ago |
|
Baris Soner Usakli
|
a80e9c3cdd
|
users page change
|
12 years ago |
|
Baris Soner Usakli
|
3f67fc29e8
|
links from user pics in posts
|
12 years ago |
|
Baris Soner Usakli
|
8710aa3457
|
users page
|
12 years ago |
|
Baris Soner Usakli
|
781c99295c
|
fix so templates load when custom_tpl is 'undefined'
|
12 years ago |
|
psychobunny
|
e061fe061b
|
added custom routing from server side, started moving hardcoded scripts into create_route
|
12 years ago |
|
psychobunny
|
e75076caad
|
Merge branch 'master' of https://github.com/psychobunny/NodeBB
|
12 years ago |
|
psychobunny
|
09c6aace09
|
custom template half in
|
12 years ago |
|
Baris Usakli
|
0499343940
|
Merge branch 'master' of https://github.com/psychobunny/NodeBB
|
12 years ago |
|
Baris Usakli
|
781d7cf9cf
|
template stuff
|
12 years ago |
|
psychobunny
|
cdceb39828
|
Merge branch 'master' of https://github.com/psychobunny/NodeBB
|
12 years ago |
|
psychobunny
|
6cb739ee67
|
install scripts for categories and added new post badges to category listing
|
12 years ago |
|
Baris Usakli
|
fa04273b72
|
footer lastest user links to their profile
|
12 years ago |
|
psychobunny
|
3e30f6ac5a
|
Merge branch 'master' of https://github.com/psychobunny/NodeBB
|
12 years ago |
|
psychobunny
|
b734ee5c50
|
homepage complete, hero unit et al.
|
12 years ago |
|
Baris Usakli
|
bf731dc224
|
user edit
|
12 years ago |
|
Baris Usakli
|
d2f830c75f
|
fixed active users and reply user links to use /users/username
|
12 years ago |
|
Baris Usakli
|
cef1ba4c08
|
changed profile page to /users/username
|
12 years ago |
|
Baris Usakli
|
0eacec8166
|
Merge branch 'master' of https://github.com/psychobunny/NodeBB
|
12 years ago |
|
Julian Lam
|
387419ef64
|
Merge branch 'master' of github.com:psychobunny/node-forum
|
12 years ago |
|
Julian Lam
|
f0eeec8932
|
fixing alert removal by alert_id and adding alerts when thread is locked or pinned
|
12 years ago |
|
psychobunny
|
96b9d41698
|
removed return to home link from topic, realized that breadcrumbs are right on top
|
12 years ago |
|
Julian Lam
|
8bccc8466e
|
Merge branch 'master' of github.com:psychobunny/node-forum
|
12 years ago |
|
Julian Lam
|
bf7c602cd8
|
thread pinning
|
12 years ago |
|
psychobunny
|
2dccfb96e7
|
Merge branch 'master' of https://github.com/psychobunny/NodeBB
Conflicts:
src/posts.js
src/topics.js
|
12 years ago |
|
psychobunny
|
ae2be687b8
|
small refactor plus breadcrumbs for all ur pages
|
12 years ago |
|
Julian Lam
|
ae43a299df
|
hiding edit and delete buttons from indiv. posts if thread is locked
|
12 years ago |
|
Baris Usakli
|
283dbc477b
|
Merge branch 'master' of https://github.com/psychobunny/NodeBB
|
12 years ago |
|
Baris Usakli
|
6a6eeae426
|
edit changes
|
12 years ago |
|
Julian Lam
|
d35bffa830
|
removing topic from listing if deleted, and adding lock icon if thread is locked
|
12 years ago |
|
Julian Lam
|
2ce70dbb93
|
restricting upvoting if a thread is locked
|
12 years ago |
|
Julian Lam
|
43a76f9c9c
|
fixing socket returns to emit to everybody in the room (on thread locking/deletion)
|
12 years ago |
|
Julian Lam
|
7ed2413d96
|
Merge remote-tracking branch 'origin' into thread_options
added some styling and elements to thread deletion
Conflicts:
public/src/ajaxify.js
|
12 years ago |
|
psychobunny
|
4b32089367
|
temporary fix for templates loading twice
|
12 years ago |
|
psychobunny
|
6ebc5398a7
|
fixed custom_mapping bug
|
12 years ago |
|
Baris Usakli
|
9ad1b572aa
|
what i have
|
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
|
85acabf1f6
|
Merge branch 'master' of https://github.com/psychobunny/node-forum
|
12 years ago |
|
psychobunny
|
ace64cec7b
|
Merge branch 'master' of https://github.com/psychobunny/NodeBB
|
12 years ago |
|
psychobunny
|
31542cd9be
|
finished recent, popular and active posts shells, just need to update api methods
|
12 years ago |
|
Baris Usakli
|
4ffbf88274
|
fixed header to link to new users page
|
12 years ago |
|
Baris Usakli
|
ec104b05d4
|
added links to user profiles from posts and the breadcrumbs
|
12 years ago |
|
psychobunny
|
1df9de049b
|
forgot templates config
|
12 years ago |
|
psychobunny
|
5153aa7652
|
added template mapping, did users->account
|
12 years ago |
|
psychobunny
|
c80d178a57
|
duhsign for category home page
|
12 years ago |
|
Julian Lam
|
b2c6d4f7c7
|
interim commit to thread options
|
12 years ago |
|
Julian Lam
|
d7c5a3c150
|
merging from stash
|
12 years ago |
|
psychobunny
|
97c1819dc4
|
forgot to commit category files
|
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
|
178bc82a55
|
removed deprecated functions from topics.js (server side parsing) and fixed the 150ms initial delay on first load
|
12 years ago |
|
Baris Soner Usakli
|
e57ae200e4
|
account page border
|
12 years ago |
|
Julian Lam
|
35770edcae
|
added thread tools dropdown
|
12 years ago |
|
Julian Lam
|
f0f1ed7ed8
|
added lock icon to locked button in threads
|
12 years ago |
|
Julian Lam
|
4f38bb10e8
|
Merge remote-tracking branch 'origin'
|
12 years ago |
|
Julian Lam
|
b6f3211ce7
|
if a thread is locked, the reply buttons all now say "locked", and the
post reply window will not pop up
|
12 years ago |
|
Baris Soner Usakli
|
6e49dc65c7
|
css
|
12 years ago |
|
Baris Soner Usakli
|
91c2271ffd
|
account page
|
12 years ago |
|
Baris Soner Usakli
|
48d5100dfe
|
some profile changes, added post count to users and account and some css to account
|
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
|
c906b7419a
|
added reputation to /account
|
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
|
8133ac53de
|
small change to ajaxify to ignore href='#', added some design to future features, up for grabs if anybody wants to do them
|
12 years ago |
|
psychobunny
|
b47f292eaa
|
Merge branch 'master' of https://github.com/psychobunny/node-forum
|
12 years ago |
|
psychobunny
|
496ed20615
|
fixed annoying footer being hidden then reshown on first load
|
12 years ago |
|
Julian Lam
|
1fc6e0db2c
|
added email verification on registration
added email header and footer
|
12 years ago |
|
Julian Lam
|
1afc575bc9
|
Merge remote-tracking branch 'origin'
|
12 years ago |
|
Baris Soner Usakli
|
73e958e627
|
added join date to users, fixed post count when a new topic is created. account page shows time joined,picture and name
|
12 years ago |
|
Julian Lam
|
458cd31b4b
|
adding account to the template index
|
12 years ago |
|
psychobunny
|
93c5931bb0
|
fixed listener memleak causing new posts to appear duplicated
|
12 years ago |
|
psychobunny
|
5aa3dab289
|
added popstate check to trigger ajaxify on back button keypress. forward button doesn't work yet
|
12 years ago |
|
psychobunny
|
dd4758725e
|
fixed bug where events weren't being attached to new posts being parsed in
|
12 years ago |
|
psychobunny
|
f0bb70fa3a
|
adjusting rep of a user now affects all instances of that user on the page
|
12 years ago |
|
psychobunny
|
35f2ac7bf7
|
small style changes in header, added edit and delete button for moderators/own posts, hide moderator tools for all users except those that qualify
|
12 years ago |
|
psychobunny
|
4807002447
|
fix for responsive avatar, fix for submit/discard buttons taking you away from the thread
|
12 years ago |
|
Julian Lam
|
c5cf128629
|
Merge branch 'master' of github.com:psychobunny/node-forum
|
12 years ago |
|
psychobunny
|
ebaa69d987
|
responsive threads - although avatar is *slightly* misaligned on my phone. not sure why
|
12 years ago |
|
Julian Lam
|
0dbc1ba692
|
restricted the user.get socket listener to only react once
|
12 years ago |
|
psychobunny
|
b7782dbf7f
|
clean up
|
12 years ago |
|
psychobunny
|
3e96f64191
|
streaming posts. also moved topics to be entirely client side parsed. made some changes. added block level caching to templates. added a prepare method to templates
|
12 years ago |
|
psychobunny
|
9fb2a338bb
|
whitespace probably oops
|
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 |
|
psychobunny
|
2b50c43a5f
|
Merge branch 'master' of https://github.com/psychobunny/node-forum
|
12 years ago |
|
psychobunny
|
7db1834182
|
gravatars in posts
|
12 years ago |
|
Julian Lam
|
430e65a352
|
Merge branch 'master' of github.com:psychobunny/node-forum
|
12 years ago |
|
Julian Lam
|
ba1001aac9
|
fixed alternative login css
|
12 years ago |
|
psychobunny
|
2bc9876852
|
fixed ready_callback bug
|
12 years ago |
|
psychobunny
|
d622c9e100
|
Merge branch 'master' of https://github.com/psychobunny/node-forum
|
12 years ago |
|
psychobunny
|
edf58693cc
|
added real username to posts
|
12 years ago |
|
Baris Usakli
|
7dc9fd83c1
|
account page shows up when logged in and 403 when logged out
|
12 years ago |
|
psychobunny
|
b97157d8fd
|
fixed topic name bug
|
12 years ago |
|
psychobunny
|
e766cc0c64
|
more style updates to topic + very basic quoting feature in, needs to be looked at in future
|
12 years ago |
|
Baris Usakli
|
ed26728a0f
|
show username on homepage
|
12 years ago |
|
psychobunny
|
abf4be488a
|
Merge branch 'master' of https://github.com/psychobunny/node-forum
|
12 years ago |
|
psychobunny
|
9fe73d68fc
|
style changes to topics
|
12 years ago |
|
Julian Lam
|
00f7347575
|
css cleanup
|
12 years ago |
|
Baris Usakli
|
ad2021df04
|
Merge branch 'master' of https://github.com/psychobunny/node-forum
|
12 years ago |
|
Baris Usakli
|
7f12d568ff
|
user name on home.tpl
|
12 years ago |
|
Julian Lam
|
daa01d07d2
|
Merge branch 'master' of github.com:psychobunny/node-forum
|
12 years ago |
|
Julian Lam
|
d5dc81b63c
|
social icons
|
12 years ago |
|
psychobunny
|
9e7654fa9a
|
template example for user
|
12 years ago |
|
Baris Usakli
|
bff02a7f2e
|
Merge branch 'master' of https://github.com/psychobunny/node-forum
|
12 years ago |
|
Baris Usakli
|
de28d8af55
|
token bug
|
12 years ago |
|
Julian Lam
|
9c05a76fcb
|
facebook integration
|
12 years ago |
|
psychobunny
|
c113f4151b
|
Merge branch 'master' of https://github.com/psychobunny/node-forum
Conflicts:
public/css/style.less
src/webserver.js
|
12 years ago |
|
psychobunny
|
517b4de2fe
|
threads look awesome now
|
12 years ago |
|
Julian Lam
|
4c41011d83
|
minor stylistic change to header
|
12 years ago |
|
Julian Lam
|
8be3b8c05e
|
accidentally developed on a merge commit... *fingers crossed*
Merge branch 'master' of github.com:psychobunny/node-forum
Conflicts:
public/templates/login.tpl
|
12 years ago |
|
Julian Lam
|
32d9b5349e
|
beginning google integration
|
12 years ago |
|
psychobunny
|
c73feeea2a
|
hide alternate login strategies if config is not set
|
12 years ago |
|
Julian Lam
|
417e722ae7
|
Merge branch 'master' of github.com:psychobunny/node-forum
|
12 years ago |
|
Julian Lam
|
60c1e937a1
|
tweaking twitter login so that if the config is blank, trying to log in via twitter won't crash the server
|
12 years ago |
|
Baris Soner Usakli
|
06d013e6de
|
Merge branch 'master' of https://github.com/psychobunny/node-forum
|
12 years ago |