Commit Graph

831 Commits

Author SHA1 Message Date
Julian Lam
74c13ba299 Merge remote-tracking branch 'origin' 2013-05-21 20:12:28 -04:00
Julian Lam
fd38b60bd6 fixing issue with teasers showing deleted post info 2013-05-21 20:12:13 -04:00
psychobunny
34133eef8c post counts + read status working on homepage category listing. fixed posts.get_cid_by_pid 2013-05-21 18:12:39 -04:00
psychobunny
effb26c856 user friendly message if no topics exist in a category 2013-05-21 17:19:33 -04:00
psychobunny
ab492f147f check for online/offline users, added custom redis sismembers method, fix for category view not showing up if it has no topics 2013-05-21 17:02:04 -04:00
Julian Lam
76aa644314 Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-05-21 14:54:42 -04:00
Julian Lam
7c165876f1 fixed bug where deleted posts still showed up in teasers 2013-05-21 14:54:35 -04:00
Baris Soner Usakli
9c5fa5fc5e signature work 2013-05-21 13:44:53 -04:00
psychobunny
47d491b266 some left over unfinished templates fixes from last week. deeper urls now take higher precedence. 2013-05-21 10:57:45 -04:00
Julian Lam
7e7d8ac8a4 fixing typo in user.js... weird 2013-05-19 13:39:51 -04:00
Julian Lam
e62fcc5831 refactored the entire privileges stack. .editable() is now deprecated, use
.privileges instead. Privileges now are inherited, so querying a topic's
privileges will automatically query it's parent category's privileges as
well, etc.
2013-05-18 14:59:50 -04:00
Julian Lam
fd5277c815 fixed bug with isAdministator usage in Posts 2013-05-17 21:27:48 -04:00
Julian Lam
1a38644eb8 exposing thread tools to users in the "administrators" set, fixing up
Topics methods to call the "editable" method first instead of just
checking rep thresholds.

Also changed the limit on thread length from 10 to infinity (for now,
until infinite scrolling makes it in)
2013-05-17 21:14:58 -04:00
Julian Lam
7757c29889 Merge branch 'master' of github.com:psychobunny/node-forum 2013-05-17 15:34:30 -04:00
Julian Lam
fe9adf696d new post event (although there is a bug... hmhm) 2013-05-17 15:34:25 -04:00
psychobunny
cb6d98cecb derp conflicts
Merge branch 'master' of https://github.com/psychobunny/NodeBB

Conflicts:
	public/src/templates.js
2013-05-17 15:26:46 -04:00
psychobunny
fb52dfc6c8 templates refactor part 2
updated so that tpls get loaded on demand as opposed to all at once on
load; added a function to pull the tpl list on load instead of having to
manually define new templates in code; some clean up; added utils.walk;
2013-05-17 15:20:08 -04:00
Baris Usakli
78b59432cc dont call marked if content is empty in get_teaser 2013-05-17 15:09:20 -04:00
Baris Usakli
bece6a7878 added signature to topic template 2013-05-17 14:52:19 -04:00
Baris Usakli
1f5956d031 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-05-17 14:48:14 -04:00
Baris Usakli
994b7e8b33 signature 2013-05-17 14:48:05 -04:00
Julian Lam
7d648e7abe Merge branch 'master' of github.com:psychobunny/node-forum 2013-05-17 14:26:26 -04:00
Julian Lam
297c4b8173 socketizing topic creation so that a new topic shows up automatically when one is created 2013-05-17 14:25:45 -04:00
Baris Usakli
d8489e2c66 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-05-17 14:22:39 -04:00
Baris Usakli
dfdbc3bea2 admin/redis page 2013-05-17 14:22:34 -04:00
psychobunny
e694751b72 fixed templates bug in websockets 2013-05-17 13:40:15 -04:00
psychobunny
1cdbd376ba deprecated server side templates finally. code sharing between client side and server side templates; force_refresh parameter added to temasd
deprecated server side templates finally. code sharing between client
side and server side templates; force_refresh parameter added to
templates config.json; created initialization fn for webserver
2013-05-17 13:36:44 -04:00
Julian Lam
3df8d7279b rejigged Topics.get so that it does not return a hardcoded return if no topics were returned 2013-05-17 13:29:50 -04:00
Julian Lam
03511cd9a8 removing console rlogs 2013-05-17 12:45:54 -04:00
Julian Lam
1b63207920 Merge branch 'master' of github.com:psychobunny/node-forum 2013-05-17 12:25:11 -04:00
Julian Lam
4b6ad9607e removing static saving of recent post, and added in dynamic pulling on Topics.get 2013-05-17 12:25:06 -04:00
Baris Usakli
c2c4c003ab if the user updates their email change the email uid mapping, added 500ms delay to the disconnect modal 2013-05-17 10:57:26 -04:00
Julian Lam
12ff6bf1e1 removing server-side registration info check (as it conflicts with social network registrations) 2013-05-16 21:32:28 -04:00
Julian Lam
8b1ff03cbb fixing social network logins and refactoring post actions 2013-05-16 21:30:16 -04:00
Julian Lam
e5716145ae get pid and tid and cid methods in posts and topics 2013-05-16 18:15:58 -04:00
Julian Lam
2258ab3503 fixing up posts behaviour when a mod is the viewer 2013-05-16 16:23:17 -04:00
Julian Lam
6dd960d6c3 adding moderator checking to post actions 2013-05-16 15:55:17 -04:00
psychobunny
7e7a4ffac5 fixed logout 2013-05-16 15:10:27 -04:00
psychobunny
a711adfcd0 fix for recent/popular/active global categories 2013-05-16 13:19:45 -04:00
psychobunny
9a0e487936 fix so that empty categories dont 404 2013-05-16 13:16:09 -04:00
Julian Lam
9917f068f9 fixing up moderator listing 2013-05-16 13:14:23 -04:00
Baris Usakli
3cff31be4e getMultipleUserFields will return empty ojbect if no uids are passed in 2013-05-16 13:13:46 -04:00
psychobunny
211363235d removed console.log 2013-05-16 13:00:21 -04:00
psychobunny
fd8c0c5097 fixed bug in active users causing moderators to not show up and only one active user being shown 2013-05-16 12:59:24 -04:00
Julian Lam
e256ee99f7 Merge branch 'master' of github.com:psychobunny/node-forum 2013-05-16 12:49:57 -04:00
Julian Lam
bdeb7b13f1 interim commit for moderator support 2013-05-16 12:49:39 -04:00
Baris Usakli
4cf0af0556 fixed topics 2013-05-16 12:47:21 -04:00
Baris Usakli
96df6abe85 broken posts 2013-05-16 12:21:13 -04:00
Baris Usakli
34432773d6 fix crash when you go to /topics/nonexistant 2013-05-16 12:13:39 -04:00
Baris Usakli
9d5f6364ad removed console.logs 2013-05-16 11:53:27 -04:00