Commit Graph

2368 Commits

Author SHA1 Message Date
psychobunny
607bc8545b Merge remote-tracking branch 'origin/master' into webserver.js-refactor 2014-02-28 14:35:00 -05:00
psychobunny
cb15655c9c app.checkAccountPermissions middleware; some clean up & bug fixes 2014-02-28 14:34:35 -05:00
psychobunny
bfcb61f37d forgot to port getUserDataByUserSlug 2014-02-28 14:22:49 -05:00
psychobunny
d072ad60de all users/ pages converted 2014-02-28 14:19:43 -05:00
psychobunny
7c873c4314 decided to functionally separate accounts from users 2014-02-28 14:08:06 -05:00
psychobunny
e64d87cb1d all user account pages; all static pages; outgoing page 2014-02-28 14:04:21 -05:00
Matthew Conlen
a2a9c8fd8a fix error with undefined callback 2014-02-28 12:58:05 -05:00
Baris Soner Usakli
9b4ca12dc1 fixed missing var, posts.js cleanup 2014-02-28 00:14:11 -05:00
Baris Soner Usakli
091723a8c5 closes #1101 2014-02-27 23:45:12 -05:00
psychobunny
00df660fa5 robots + sitemap; some clean up 2014-02-27 17:16:06 -05:00
psychobunny
942d16a3b4 confirmEmail route 2014-02-27 17:04:41 -05:00
psychobunny
dae7b06f4d initial login and register routes 2014-02-27 16:52:46 -05:00
psychobunny
e193d58112 unreadTotal route 2014-02-27 16:39:34 -05:00
psychobunny
08c0a7fa5e removing old unread and recent routes 2014-02-27 16:38:10 -05:00
psychobunny
beafc881c4 added recent and unread in categoriesController 2014-02-27 16:35:29 -05:00
psychobunny
062e35c89e app.authenticate middleware; added new recent, unread routes 2014-02-27 16:34:58 -05:00
psychobunny
4435a20d90 fixed merge conflict 2014-02-27 15:11:50 -05:00
psychobunny
96d6b96ce4 controllers.home 2014-02-27 15:06:39 -05:00
psychobunny
c084529597 removed old api/home and api/popular 2014-02-27 14:56:54 -05:00
psychobunny
ad222dce2a controller indexx 2014-02-27 14:56:14 -05:00
psychobunny
233e49fd34 topics controller 2014-02-27 14:56:05 -05:00
psychobunny
62a4b419e3 categories controller 2014-02-27 14:55:53 -05:00
psychobunny
27b99d5c56 webserver.js refactor init 2014-02-27 14:55:41 -05:00
psychobunny
1db0651bff removing old api/popular code 2014-02-27 14:44:47 -05:00
Julian Lam
dfd13fac0d Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-02-27 14:05:55 -05:00
Julian Lam
44ac7ec262 added new hooks for rendering help messages in composer, removed markdown text from translation 2014-02-27 14:05:31 -05:00
Baris Soner Usakli
30eb85f96e fixed conflicts 2014-02-27 12:46:37 -05:00
Julian Lam
c7274e11d0 removing the bit of code that disables plugins if the minver does not satisfy (too annoying imo)... now that we have ./nodebb reset, this is moot 2014-02-27 10:28:49 -05:00
Julian Lam
5b301772bb added daemon capability to ./nodebb start, npm start/stop scripts 2014-02-27 10:06:31 -05:00
Baris Soner Usakli
38e4a6c8b0 better check 2014-02-27 01:51:33 -05:00
Baris Soner Usakli
b8c089cfaa added check for invalid tags 2014-02-27 01:43:24 -05:00
akhoury
3f1d5c6656 merge fork with upstream master 2014-02-26 22:01:29 -05:00
akhoury
1b207d8276 IE8 support, general cleanups, from native to $ objects ... 2014-02-26 21:55:29 -05:00
akhoury
b59c10a1e9 took out some overrides out utils to a new overrides.js 2014-02-26 21:49:22 -05:00
Baris Soner Usakli
81f4767687 user.js hint 2014-02-26 21:04:20 -05:00
Baris Soner Usakli
6a962655e4 jshint for topics.js 2014-02-26 20:38:49 -05:00
Baris Soner Usakli
f1f7b59d58 missed this one 2014-02-26 20:31:30 -05:00
Baris Soner Usakli
99bf882a1c removed cid from getTopicsByTids 2014-02-26 19:55:28 -05:00
Baris Soner Usakli
ad37715972 empty array if not topics in catgory 2014-02-26 17:34:02 -05:00
Baris Soner Usakli
d5268f5497 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-26 17:17:02 -05:00
Baris Soner Usakli
56bbeb9950 use disableSocialButtons from config 2014-02-26 17:16:55 -05:00
psychobunny
2247a8b21f Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-26 17:00:07 -05:00
psychobunny
aee2b2ecd0 allow express to serve parsed tpls via res.render 2014-02-26 17:00:03 -05:00
Baris Soner Usakli
7f2d70d7f6 minor cleanups 2014-02-26 16:58:02 -05:00
Baris Soner Usakli
a83d4a9dd5 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-26 16:43:28 -05:00
Baris Soner Usakli
ea6cf3bbd5 more cleanup and changes to topics 2014-02-26 16:43:21 -05:00
psychobunny
87baeebc3f Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-26 15:58:45 -05:00
psychobunny
5145ba1aac added a route to get moderators by category id 2014-02-26 15:58:42 -05:00
Baris Soner Usakli
8da7a6f2f3 cleanup 2014-02-26 15:32:32 -05:00
Julian Lam
3f7e458866 fixed #1127 2014-02-25 23:06:21 -05:00