Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-02 20:16:04 +01:00
Code Issues Packages Projects Releases Wiki Activity
1,333 Commits 75 Branches 483 Tags
00cb15d3c85cc251eecafac62d1f3d88aca7104b
Commit Graph

831 Commits

Author SHA1 Message Date
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
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
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
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
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
ec104b05d4 added links to user profiles from posts and the breadcrumbs 2013-05-07 12:47:12 -04: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
psychobunny
724c1511af moved slugify to utils 2013-05-06 20:13:59 +00:00
psychobunny
4c524922cc posts.get().unfactored().refactored().commited().pushed(); if (conflicts) throw new Error ('IGNORED'); yep. 2013-05-06 19:46:50 +00:00
Julian Lam
86af1b2af5 topic creation now checks for valid pid as well 2013-05-06 15:35:01 -04:00
Julian Lam
4f38bb10e8 Merge remote-tracking branch 'origin' 2013-05-06 15:31:32 -04:00
Julian Lam
6b9b72a550 restricting post replies if a thread is locked (returns pid of -1 instead) 2013-05-06 15:30:47 -04:00
Julian Lam
b6f3211ce7 if a thread is locked, the reply buttons all now say "locked", and the 
post reply window will not pop up
 2013-05-06 15:09:22 -04:00
Baris Soner Usakli
da837f662a redirect /login and /register to /account if user is already logged in 2013-05-06 14:27:15 -04:00
Julian Lam
922acc0f79 added locked state to Posts.get 2013-05-06 13:48:49 -04:00
Baris Soner Usakli
9a3c907056 set post rep to 0 when created 2013-05-06 13:46:14 -04:00
Baris Soner Usakli
48d5100dfe some profile changes, added post count to users and account and some css to account 2013-05-06 13:25:07 -04:00
psychobunny
92175274b5 Merge branch 'master' of https://github.com/psychobunny/NodeBB 2013-05-06 17:09:15 +00:00
psychobunny
ecf3ffa170 fixed anon bug in users browsing this thread code, simplified the logic as well, fixed language 2013-05-06 17:09:08 +00:00
Baris Soner Usakli
57354fe582 changed posts.reply to use the getUserFields method and removed the 2 old methods from user.js 2013-05-06 13:01:07 -04:00
Baris Soner Usakli
47782df9cb Merge branch 'master' of https://github.com/psychobunny/NodeBB 2013-05-06 12:44:33 -04:00
Baris Soner Usakli
883f029a3a agian 2013-05-06 12:44:30 -04:00
Julian Lam
4a1dc28a26 *shenans* refactored Posts.get to use async module instead of callback 
pyramid. Call time net decrease = 0, rofl.
 2013-05-06 12:04:36 -04:00
Julian Lam
30bf27f1c7 Merge remote-tracking branch 'origin' into posts-refactor 2013-05-06 10:05:10 -04:00
Julian Lam
08c303b3c7 interim commit 2013-05-06 10:05:00 -04:00
psychobunny
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 2013-05-06 06:07:04 +00:00
psychobunny
d6bd801561 Merge branch 'master' of https://github.com/psychobunny/NodeBB 2013-05-06 03:41:36 +00:00
psychobunny
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 2013-05-06 03:41:22 +00:00
Baris Soner Usakli
9b5c8de541 setUserField 2013-05-05 22:54:38 -04:00
Baris Soner Usakli
c906b7419a added reputation to /account 2013-05-05 19:35:17 -04:00
Baris Soner Usakli
3bdbf3c191 password reset will use the user has 2013-05-05 19:29:58 -04:00
Baris Soner Usakli
54b4c55dfc removed the unused login function 2013-05-05 19:13:08 -04:00
Baris Soner Usakli
fee76db8dc more fixes 2013-05-05 18:40:04 -04:00