Commit Graph

24952 Commits (beeb3ba13daf69b21036e17e90a6d06031316caa)
 

Author SHA1 Message Date
Baris Usakli b2adda06c8 Merge branch 'master' of https://github.com/psychobunny/NodeBB
Baris Usakli d308242d2d decimal places for rep and post count
Julian Lam 4dced643c5 tweaking app.alert so that on regular fadeout (after timeout expiry), the alert is removed from the DOM
psychobunny 4cb59c5aa9 started styling category.tpl, and added a fail plus sign to header, will revisit in the AM
Baris Soner Usakli 6dda6ce15b removed some console.logs
Baris Soner Usakli a80e9c3cdd users page change
Baris Soner Usakli 3f67fc29e8 links from user pics in posts
Baris Soner Usakli 8710aa3457 users page
Baris Soner Usakli 781c99295c fix so templates load when custom_tpl is 'undefined'
psychobunny e061fe061b added custom routing from server side, started moving hardcoded scripts into create_route
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