Commit Graph

13138 Commits

Author SHA1 Message Date
psychobunny
cdceb39828 Merge branch 'master' of https://github.com/psychobunny/NodeBB 2013-05-07 21:02:13 +00:00
psychobunny
6cb739ee67 install scripts for categories and added new post badges to category listing 2013-05-07 21:02:07 +00:00
Baris Usakli
fa04273b72 footer lastest user links to their profile 2013-05-07 16:53:24 -04:00
psychobunny
3e30f6ac5a Merge branch 'master' of https://github.com/psychobunny/NodeBB 2013-05-07 20:49:36 +00:00
psychobunny
b734ee5c50 homepage complete, hero unit et al. 2013-05-07 20:49:27 +00:00
Baris Usakli
bf731dc224 user edit 2013-05-07 16:49:18 -04:00
Baris Usakli
d2f830c75f fixed active users and reply user links to use /users/username 2013-05-07 16:37:40 -04:00
Baris Usakli
cef1ba4c08 changed profile page to /users/username 2013-05-07 16:35:29 -04:00
Baris Usakli
0eacec8166 Merge branch 'master' of https://github.com/psychobunny/NodeBB 2013-05-07 16:21:30 -04:00
Baris Usakli
8fe4905b68 exists function fix 2013-05-07 16:21:25 -04:00
Julian Lam
b57109f6fd floating pinned articles to the top of the topic list 2013-05-07 15:43:51 -04:00
Julian Lam
387419ef64 Merge branch 'master' of github.com:psychobunny/node-forum 2013-05-07 15:36:40 -04:00
Julian Lam
f0eeec8932 fixing alert removal by alert_id and adding alerts when thread is locked or pinned 2013-05-07 15:36:32 -04:00
psychobunny
96b9d41698 removed return to home link from topic, realized that breadcrumbs are right on top 2013-05-07 19:24:52 +00:00
psychobunny
91d9775cc4 fixed slugs from disappearing if f5ing 2013-05-07 19:22:38 +00:00
Julian Lam
8bccc8466e Merge branch 'master' of github.com:psychobunny/node-forum 2013-05-07 15:14:52 -04:00
Julian Lam
bf7c602cd8 thread pinning 2013-05-07 15:14:47 -04:00
psychobunny
2dccfb96e7 Merge branch 'master' of https://github.com/psychobunny/NodeBB
Conflicts:
	src/posts.js
	src/topics.js
2013-05-07 18:29:20 +00:00
psychobunny
ae2be687b8 small refactor plus breadcrumbs for all ur pages 2013-05-07 18:21:00 +00:00
Julian Lam
ae43a299df hiding edit and delete buttons from indiv. posts if thread is locked 2013-05-07 13:57:30 -04:00
Baris Usakli
283dbc477b Merge branch 'master' of https://github.com/psychobunny/NodeBB 2013-05-07 13:55:05 -04:00
Baris Usakli
6a6eeae426 edit changes 2013-05-07 13:55:02 -04:00
Julian Lam
d35bffa830 removing topic from listing if deleted, and adding lock icon if thread is locked 2013-05-07 13:52:19 -04:00
Julian Lam
2ce70dbb93 restricting upvoting if a thread is locked 2013-05-07 13:37:05 -04:00
Julian Lam
a3e816b68e Merge remote-tracking branch 'origin' into thread_options 2013-05-07 13:32:40 -04:00
Julian Lam
43a76f9c9c fixing socket returns to emit to everybody in the room (on thread locking/deletion) 2013-05-07 13:32:12 -04:00
psychobunny
9e23279459 fixed socket notifications for new posts 2013-05-07 17:27:38 +00:00
Julian Lam
7ed2413d96 Merge remote-tracking branch 'origin' into thread_options
added some styling and elements to thread deletion

Conflicts:
	public/src/ajaxify.js
2013-05-07 13:24:46 -04:00
psychobunny
4b32089367 temporary fix for templates loading twice 2013-05-07 17:15:42 +00:00
psychobunny
6ebc5398a7 fixed custom_mapping bug 2013-05-07 17:08:44 +00:00
Baris Usakli
9ad1b572aa what i have 2013-05-07 13:01:09 -04:00
Julian Lam
7bbc630dfb Merge remote-tracking branch 'origin' into thread_options
Conflicts:
	public/src/templates.js
2013-05-07 12:56:21 -04:00
Julian Lam
250c70bdfc topic locking and deletion 2013-05-07 12:54:10 -04:00
Baris Usakli
85acabf1f6 Merge branch 'master' of https://github.com/psychobunny/node-forum 2013-05-07 12:53:10 -04:00
psychobunny
ace64cec7b Merge branch 'master' of https://github.com/psychobunny/NodeBB 2013-05-07 16:52:41 +00:00
psychobunny
31542cd9be finished recent, popular and active posts shells, just need to update api methods 2013-05-07 16:52:35 +00:00
Baris Usakli
4ffbf88274 fixed header to link to new users page 2013-05-07 12:51:59 -04:00
Baris Usakli
ec104b05d4 added links to user profiles from posts and the breadcrumbs 2013-05-07 12:47:12 -04:00
psychobunny
1df9de049b forgot templates config 2013-05-07 16:16:06 +00:00
psychobunny
6dfc44c63c Merge branch 'master' of https://github.com/psychobunny/NodeBB
Conflicts:
	src/webserver.js
2013-05-07 16:14:22 +00:00
psychobunny
5153aa7652 added template mapping, did users->account 2013-05-07 16:12:26 +00:00
Baris Usakli
ccf0f6dd73 removed get_username_by_uid, use getUserField(uid,'username',callback) directly 2013-05-07 12:11:22 -04:00
Baris Usakli
49cb5fddcd removed some console.log 2013-05-07 11:53:40 -04:00
psychobunny
c80d178a57 duhsign for category home page 2013-05-07 15:49:24 +00:00
Baris Usakli
ec754d601d users profile page, need to add templates 2013-05-07 10:56:30 -04:00
Julian Lam
b2c6d4f7c7 interim commit to thread options 2013-05-07 09:21:46 -04:00
Julian Lam
d7c5a3c150 merging from stash 2013-05-06 21:15:53 -04:00
psychobunny
97c1819dc4 forgot to commit category files 2013-05-06 22:06:01 +00:00
psychobunny
fa64e84dcc fixed a bug in templates, introduced categories, added default setup script onload, moved home.tpl code over to category, created hierachies 2013-05-06 22:05:42 +00:00
psychobunny
178bc82a55 removed deprecated functions from topics.js (server side parsing) and fixed the 150ms initial delay on first load 2013-05-06 20:23:38 +00:00