Commit Graph

11415 Commits

Author SHA1 Message Date
Julian Lam
82a3415ab1 fixing admin routes on subfolder installs 2014-03-11 19:46:33 -04:00
Julian Lam
f28c690f2f fixing up robots.txt 2014-03-11 19:44:48 -04:00
Julian Lam
08b2106e0f Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-03-11 19:42:18 -04:00
Julian Lam
7111adb3c2 fixed subfolder installs again (a bit), also stopped apple-touch-icon from clobbering /apple-touch-icon 2014-03-11 19:41:58 -04:00
barisusakli
d4556d4da3 added minifed js files
replace jquery form and timeago with minified versions
2014-03-11 19:31:30 -04:00
barisusakli
813b3d6fcc changes for live streaming of posts 2014-03-11 18:46:27 -04:00
psychobunny
5dc5eb41df fixed ajaxify bug introduced in last commit 2014-03-11 18:33:19 -04:00
psychobunny
e451a145dd Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-03-11 18:10:11 -04:00
psychobunny
c8bf617f4b allow plugins to override any route (except for admin routes) 2014-03-11 18:09:56 -04:00
Julian Lam
41116bc0b2 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-03-11 15:51:29 -04:00
Julian Lam
4bb6d89e83 fixed #1172 2014-03-11 15:51:25 -04:00
Julian Lam
b259c3d422 categoryData should return better topics (non-anon uid passed in now) 2014-03-11 15:48:29 -04:00
Julian Lam
82a82afe99 updated the way privileges were handled in the .get() category controller 2014-03-11 15:32:32 -04:00
barisusakli
350070339b added home room emit 2014-03-11 15:18:14 -04:00
barisusakli
a5f4135c62 added socket listeners to home 2014-03-11 15:15:54 -04:00
psychobunny
5abc96399e Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-03-11 14:48:38 -04:00
psychobunny
5f7f5a37c1 linting 2014-03-11 14:48:35 -04:00
barisusakli
76037a5f14 closes #1191
added a new method called isSetMembers takes in an array of values to
test if they are members of a set
2014-03-11 14:43:42 -04:00
Julian Lam
21d28b0f58 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-03-11 11:26:22 -04:00
Julian Lam
de6f58842b fixed issue where events page would error out if log was not already created. 2014-03-11 11:26:06 -04:00
barisusakli
88c4b90fc8 accounts controller removed duplication 2014-03-11 04:33:08 -04:00
barisusakli
037e8943a8 removed left over 2014-03-11 04:10:39 -04:00
barisusakli
9564b6fda2 closes #1165 2014-03-11 04:10:00 -04:00
barisusakli
3d68c7c6b6 added getObjectsFields methods to db class, changed getUsers methods to use the new method, refactor to user.js and mongo.js 2014-03-11 03:39:41 -04:00
Julian Lam
8873963946 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-03-10 21:55:57 -04:00
Julian Lam
ffa42ffea3 moving pluginRoutes to top of route stack (like others), put app.load hook behind plugins' ready callback 2014-03-10 21:54:30 -04:00
barisusakli
c41ef10572 removed routes/user.js 2014-03-10 20:35:55 -04:00
barisusakli
4e3819603b jshint fixed missing var 2014-03-10 19:00:23 -04:00
barisusakli
e83ad1ab4a Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-03-10 18:28:42 -04:00
barisusakli
974333dbc3 fixed missing currentPage 2014-03-10 18:28:34 -04:00
Julian Lam
efb933f102 backwards-compatibility for plugins if they return a callback 2014-03-10 17:32:50 -04:00
Julian Lam
19c9f1bb19 backwards compatibility with plugins that are assuming no callback 2014-03-10 16:58:16 -04:00
Julian Lam
a7f310b49a fixed #1189 2014-03-10 15:31:47 -04:00
psychobunny
2cde4508b0 Merge remote-tracking branch 'origin/master' into webserver.js-refactor 2014-03-10 01:28:13 -04:00
psychobunny
23983c4c80 cleanup - search routes 2014-03-10 01:07:37 -04:00
barisusakli
71f84655ca minor cleanup 2014-03-10 00:17:06 -04:00
barisusakli
b413f06b72 removed unused function from groups, jshint 2014-03-09 23:51:09 -04:00
psychobunny
30cfddda68 fix for topics view count, and marking topics as unread 2014-03-09 23:20:59 -04:00
barisusakli
16d2e65ea0 optimized getCategories 2014-03-09 23:09:08 -04:00
psychobunny
6ea4d89edc fixed search routes 2014-03-09 21:43:35 -04:00
psychobunny
4e54d500c0 fix bug where inactive plugin templates were being compiled as well 2014-03-09 20:45:37 -04:00
psychobunny
4793b6b4f9 fixed invalid path for apple-touch-icon 2014-03-09 20:08:51 -04:00
psychobunny
a99be8e7be got rid of all the res.locals.isAPI checks in all controller methods. now 1000% cleaner :shipit: 2014-03-09 20:05:14 -04:00
psychobunny
faf3de7e27 added a check for res.locals.isAPI inside res.render, instead of doing it all over the place in code 2014-03-09 19:54:16 -04:00
psychobunny
1b3f089804 fixed /admin/index 404 2014-03-09 19:47:39 -04:00
psychobunny
6acdc66470 fixed bug if default templates folder missing (in case you planned on building an entire theme from scratch) 2014-03-09 19:47:33 -04:00
psychobunny
464c2f42c3 Merge remote-tracking branch 'origin/master' into webserver.js-refactor
Conflicts:
	public/templates/admin/themes.tpl
	src/meta.js
	src/routes/api.js
2014-03-09 19:19:13 -04:00
psychobunny
37840d35f0 missing variable - numCSS 2014-03-09 19:15:18 -04:00
barisusakli
73c89010cb closes #1182 2014-03-09 17:29:05 -04:00
barisusakli
57f9f8bc57 closes #1176 2014-03-09 16:39:31 -04:00