b57109f6fd
floating pinned articles to the top of the topic list
12 years ago
387419ef64
Merge branch 'master' of github.com:psychobunny/node-forum
12 years ago
f0eeec8932
fixing alert removal by alert_id and adding alerts when thread is locked or pinned
12 years ago
91d9775cc4
fixed slugs from disappearing if f5ing
12 years ago
8bccc8466e
Merge branch 'master' of github.com:psychobunny/node-forum
12 years ago
bf7c602cd8
thread pinning
12 years ago
2dccfb96e7
Merge branch 'master' of https://github.com/psychobunny/NodeBB
...
Conflicts:
src/posts.js
src/topics.js
12 years ago
ae2be687b8
small refactor plus breadcrumbs for all ur pages
12 years ago
283dbc477b
Merge branch 'master' of https://github.com/psychobunny/NodeBB
12 years ago
6a6eeae426
edit changes
12 years ago
d35bffa830
removing topic from listing if deleted, and adding lock icon if thread is locked
12 years ago
a3e816b68e
Merge remote-tracking branch 'origin' into thread_options
12 years ago
43a76f9c9c
fixing socket returns to emit to everybody in the room (on thread locking/deletion)
12 years ago
9e23279459
fixed socket notifications for new posts
12 years ago
7bbc630dfb
Merge remote-tracking branch 'origin' into thread_options
...
Conflicts:
public/src/templates.js
12 years ago
250c70bdfc
topic locking and deletion
12 years ago
ace64cec7b
Merge branch 'master' of https://github.com/psychobunny/NodeBB
12 years ago
31542cd9be
finished recent, popular and active posts shells, just need to update api methods
12 years ago
ec104b05d4
added links to user profiles from posts and the breadcrumbs
12 years ago
6dfc44c63c
Merge branch 'master' of https://github.com/psychobunny/NodeBB
...
Conflicts:
src/webserver.js
12 years ago
5153aa7652
added template mapping, did users->account
12 years ago
ccf0f6dd73
removed get_username_by_uid, use getUserField(uid,'username',callback) directly
12 years ago
49cb5fddcd
removed some console.log
12 years ago
c80d178a57
duhsign for category home page
12 years ago
ec754d601d
users profile page, need to add templates
12 years ago
b2c6d4f7c7
interim commit to thread options
12 years ago
d7c5a3c150
merging from stash
12 years ago
97c1819dc4
forgot to commit category files
12 years ago
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
178bc82a55
removed deprecated functions from topics.js (server side parsing) and fixed the 150ms initial delay on first load
12 years ago
724c1511af
moved slugify to utils
12 years ago
4c524922cc
posts.get().unfactored().refactored().commited().pushed(); if (conflicts) throw new Error ('IGNORED'); yep.
12 years ago
86af1b2af5
topic creation now checks for valid pid as well
12 years ago
4f38bb10e8
Merge remote-tracking branch 'origin'
12 years ago
6b9b72a550
restricting post replies if a thread is locked (returns pid of -1 instead)
12 years ago
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
da837f662a
redirect /login and /register to /account if user is already logged in
12 years ago
922acc0f79
added locked state to Posts.get
12 years ago
9a3c907056
set post rep to 0 when created
12 years ago
48d5100dfe
some profile changes, added post count to users and account and some css to account
12 years ago
92175274b5
Merge branch 'master' of https://github.com/psychobunny/NodeBB
12 years ago
ecf3ffa170
fixed anon bug in users browsing this thread code, simplified the logic as well, fixed language
12 years ago
57354fe582
changed posts.reply to use the getUserFields method and removed the 2 old methods from user.js
12 years ago
47782df9cb
Merge branch 'master' of https://github.com/psychobunny/NodeBB
12 years ago
883f029a3a
agian
12 years ago
4a1dc28a26
*shenans* refactored Posts.get to use async module instead of callback
...
pyramid. Call time net decrease = 0, rofl.
12 years ago
30bf27f1c7
Merge remote-tracking branch 'origin' into posts-refactor
12 years ago
08c303b3c7
interim commit
12 years ago
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
d6bd801561
Merge branch 'master' of https://github.com/psychobunny/NodeBB
12 years ago
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
9b5c8de541
setUserField
12 years ago
c906b7419a
added reputation to /account
12 years ago
3bdbf3c191
password reset will use the user has
12 years ago
54b4c55dfc
removed the unused login function
12 years ago
fee76db8dc
more fixes
12 years ago
954392e4c4
fixes to gravatars and get functions in user.js
12 years ago
8a0266562c
Merge branch 'master' of https://github.com/psychobunny/NodeBB
12 years ago
08f7b64ccf
hash changes to user data
12 years ago
26c22b0559
bugfixes + starting active users in thread feature
12 years ago
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
1fc6e0db2c
added email verification on registration
...
added email header and footer
12 years ago
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
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
4807002447
fix for responsive avatar, fix for submit/discard buttons taking you away from the thread
12 years ago
6142225726
Merge branch 'master' of https://github.com/psychobunny/node-forum
12 years ago
69565b0ded
fixed a bug where anonymous users couldnt access topics
12 years ago
73fc0a3699
customising markdown parser to allow single line breaks
12 years ago
ebaa69d987
responsive threads - although avatar is *slightly* misaligned on my phone. not sure why
12 years ago
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
bcb672e1fe
socket rooms! and almost finished rep (socket updates) except for one small bug where current_user isnt being pulled
12 years ago
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
b5622690e0
Merge branch 'master' of https://github.com/psychobunny/node-forum
12 years ago
c73d1237d2
started favourites/rep
12 years ago
2a3ef2408f
fixed post content
12 years ago
2b50c43a5f
Merge branch 'master' of https://github.com/psychobunny/node-forum
12 years ago
7db1834182
gravatars in posts
12 years ago
3c86b43ba3
post count is incrementing when replying
12 years ago
430e65a352
Merge branch 'master' of github.com:psychobunny/node-forum
12 years ago
bceaf67c20
INSTALL build-essential AND RUN npm install!!!!
...
bcrypt integration
12 years ago
d622c9e100
Merge branch 'master' of https://github.com/psychobunny/node-forum
12 years ago
edf58693cc
added real username to posts
12 years ago
7dc9fd83c1
account page shows up when logged in and 403 when logged out
12 years ago
e766cc0c64
more style updates to topic + very basic quoting feature in, needs to be looked at in future
12 years ago
ed26728a0f
show username on homepage
12 years ago
6d36df1604
tweaking users/* calls
12 years ago
0ae4e31163
RUN "npm install" AFTER THIS GIT PULL!!
...
Integrated markdown parsing to all post content. Title content by default
not going to be parsed, using default options unless circumstances dictate
otherwise.
12 years ago
7f12d568ff
user name on home.tpl
12 years ago
bff02a7f2e
Merge branch 'master' of https://github.com/psychobunny/node-forum
12 years ago
de28d8af55
token bug
12 years ago
9c05a76fcb
facebook integration
12 years ago
c113f4151b
Merge branch 'master' of https://github.com/psychobunny/node-forum
...
Conflicts:
public/css/style.less
src/webserver.js
12 years ago
517b4de2fe
threads look awesome now
12 years ago
44485a2e40
fixed session ids
12 years ago
bef0bd87da
Merge branch 'master' of github.com:psychobunny/node-forum
12 years ago
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
8cedb33c82
Merge branch 'master' of https://github.com/psychobunny/node-forum
12 years ago
39b24436d0
removed global.socket, passing in socket to the functions now
12 years ago
32d9b5349e
beginning google integration
12 years ago
c73feeea2a
hide alternate login strategies if config is not set
12 years ago
Julian Lam
psychobunny
Baris Usakli
Julian Lam