Commit Graph

18771 Commits (5b8bb3e4266ddde8a123d01e03f4c09d2b51e6e1)
 

Author SHA1 Message Date
psychobunny 2dccfb96e7 Merge branch 'master' of https://github.com/psychobunny/NodeBB
Conflicts:
	src/posts.js
	src/topics.js
psychobunny ae2be687b8 small refactor plus breadcrumbs for all ur pages
Julian Lam ae43a299df hiding edit and delete buttons from indiv. posts if thread is locked
Baris Usakli 283dbc477b Merge branch 'master' of https://github.com/psychobunny/NodeBB
Baris Usakli 6a6eeae426 edit changes
Julian Lam d35bffa830 removing topic from listing if deleted, and adding lock icon if thread is locked
Julian Lam 2ce70dbb93 restricting upvoting if a thread is locked
Julian Lam a3e816b68e Merge remote-tracking branch 'origin' into thread_options
Julian Lam 43a76f9c9c fixing socket returns to emit to everybody in the room (on thread locking/deletion)
psychobunny 9e23279459 fixed socket notifications for new posts
Julian Lam 7ed2413d96 Merge remote-tracking branch 'origin' into thread_options
added some styling and elements to thread deletion

Conflicts:
	public/src/ajaxify.js
psychobunny 4b32089367 temporary fix for templates loading twice
psychobunny 6ebc5398a7 fixed custom_mapping bug
Baris Usakli 9ad1b572aa what i have
Julian Lam 7bbc630dfb Merge remote-tracking branch 'origin' into thread_options
Conflicts:
	public/src/templates.js
Julian Lam 250c70bdfc topic locking and deletion
Baris Usakli 85acabf1f6 Merge branch 'master' of https://github.com/psychobunny/node-forum
psychobunny ace64cec7b Merge branch 'master' of https://github.com/psychobunny/NodeBB
psychobunny 31542cd9be finished recent, popular and active posts shells, just need to update api methods
Baris Usakli 4ffbf88274 fixed header to link to new users page
Baris Usakli ec104b05d4 added links to user profiles from posts and the breadcrumbs
psychobunny 1df9de049b forgot templates config
psychobunny 6dfc44c63c Merge branch 'master' of https://github.com/psychobunny/NodeBB
Conflicts:
	src/webserver.js
psychobunny 5153aa7652 added template mapping, did users->account
Baris Usakli ccf0f6dd73 removed get_username_by_uid, use getUserField(uid,'username',callback) directly
Baris Usakli 49cb5fddcd removed some console.log
psychobunny c80d178a57 duhsign for category home page
Baris Usakli ec754d601d users profile page, need to add templates
Julian Lam b2c6d4f7c7 interim commit to thread options
Julian Lam d7c5a3c150 merging from stash
psychobunny 97c1819dc4 forgot to commit category files
psychobunny fa64e84dcc fixed a bug in templates, introduced categories, added default setup script onload, moved home.tpl code over to category, created hierachies
psychobunny 178bc82a55 removed deprecated functions from topics.js (server side parsing) and fixed the 150ms initial delay on first load
psychobunny 724c1511af moved slugify to utils
Baris Soner Usakli e57ae200e4 account page border
Julian Lam 35770edcae added thread tools dropdown
Julian Lam f0f1ed7ed8 added lock icon to locked button in threads
psychobunny 4c524922cc posts.get().unfactored().refactored().commited().pushed(); if (conflicts) throw new Error ('IGNORED'); yep.
Julian Lam 86af1b2af5 topic creation now checks for valid pid as well
Julian Lam 4f38bb10e8 Merge remote-tracking branch 'origin'
Julian Lam 6b9b72a550 restricting post replies if a thread is locked (returns pid of -1 instead)
Julian Lam b6f3211ce7 if a thread is locked, the reply buttons all now say "locked", and the
post reply window will not pop up
Baris Soner Usakli da837f662a redirect /login and /register to /account if user is already logged in
Baris Soner Usakli 9f915bbbae Merge branch 'master' of https://github.com/psychobunny/NodeBB
Baris Soner Usakli 6e49dc65c7 css
Julian Lam 922acc0f79 added locked state to Posts.get
Baris Soner Usakli 9a3c907056 set post rep to 0 when created
Baris Soner Usakli 91c2271ffd account page
Baris Soner Usakli 48d5100dfe some profile changes, added post count to users and account and some css to account
psychobunny 92175274b5 Merge branch 'master' of https://github.com/psychobunny/NodeBB