Commit Graph

4592 Commits (da0793c0119d586157ca3e8a7d22f263cb44b310)
 

Author SHA1 Message Date
psychobunny e75076caad Merge branch 'master' of https://github.com/psychobunny/NodeBB
psychobunny 09c6aace09 custom template half in
Baris Usakli 0499343940 Merge branch 'master' of https://github.com/psychobunny/NodeBB
Baris Usakli 781d7cf9cf template stuff
psychobunny cdceb39828 Merge branch 'master' of https://github.com/psychobunny/NodeBB
psychobunny 6cb739ee67 install scripts for categories and added new post badges to category listing
Baris Usakli fa04273b72 footer lastest user links to their profile
psychobunny 3e30f6ac5a Merge branch 'master' of https://github.com/psychobunny/NodeBB
psychobunny b734ee5c50 homepage complete, hero unit et al.
Baris Usakli bf731dc224 user edit
Baris Usakli d2f830c75f fixed active users and reply user links to use /users/username
Baris Usakli cef1ba4c08 changed profile page to /users/username
Baris Usakli 0eacec8166 Merge branch 'master' of https://github.com/psychobunny/NodeBB
Baris Usakli 8fe4905b68 exists function fix
Julian Lam b57109f6fd floating pinned articles to the top of the topic list
Julian Lam 387419ef64 Merge branch 'master' of github.com:psychobunny/node-forum
Julian Lam f0eeec8932 fixing alert removal by alert_id and adding alerts when thread is locked or pinned
psychobunny 96b9d41698 removed return to home link from topic, realized that breadcrumbs are right on top
psychobunny 91d9775cc4 fixed slugs from disappearing if f5ing
Julian Lam 8bccc8466e Merge branch 'master' of github.com:psychobunny/node-forum
Julian Lam bf7c602cd8 thread pinning
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