Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-02-06 06:40:07 +01:00
Code Issues Packages Projects Releases Wiki Activity
21,328 Commits 74 Branches 490 Tags
18ae7cf719fba7dab4a7461894de9de1364b87ac
Commit Graph

11415 Commits

Author SHA1 Message Date
psychobunny
1ef95bd09e Merge remote-tracking branch 'origin/master' into webserver.js-refactor 
Conflicts:
	app.js
	public/templates/category.tpl
	public/templates/popular.tpl
	public/templates/recent.tpl
	public/templates/unread.tpl
	src/routes/plugins.js
	src/webserver.js
 2014-03-09 16:07:34 -04:00
barisusakli
6496b91c29 closes #1180 2014-03-09 14:02:30 -04:00
barisusakli
ec86aafb48 return user object 2014-03-09 00:20:29 -05:00
barisusakli
b4b9ed1841 optimized getTopicsByTids, single db call to get topicData, added cache for privilege/category/user data 2014-03-09 00:16:05 -05:00
barisusakli
1568c50906 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-03-08 17:41:51 -05:00
barisusakli
23e1cc010c removed removeHiddenFields function, using mongo selector instead 2014-03-08 17:41:23 -05:00
Julian Lam
f00f7c8818 fixed apple-touch-icon for subfolder installs 2014-03-08 16:08:52 -05:00
Julian Lam
d9d04a3982 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-03-08 16:04:43 -05:00
Julian Lam
5a8a3627d2 bringing subfolder installations to v0.4.0 - JUST FOR @PLANNER 2014-03-08 16:04:22 -05:00
barisusakli
284276cbb6 messaging jshint 2014-03-08 15:45:42 -05:00
psychobunny
e84dd4fd94 Merge remote-tracking branch 'origin/master' into webserver.js-refactor 
Conflicts:
	public/templates/accountedit.tpl
	public/templates/header.tpl
	src/routes/meta.js
	src/webserver.js
 2014-03-07 19:21:40 -05:00
Julian Lam
c9642cecd2 setting Lavender as default theme for 0.4.0, woo! 2014-03-06 23:24:47 -05:00
Julian Lam
90b29031fe backwards compatibility with older plugins using css with staticDir 2014-03-06 20:36:05 -05:00
Julian Lam
552a63367d workaround for problem arising from switch to Date.UTC() 2014-03-06 19:48:38 -05:00
Julian Lam
5880590425 removing "pluginCSS", "css" in plugins is now included directly into stylesheet.css. This is a breaking change. 
fixes #1168
 2014-03-06 17:51:17 -05:00
psychobunny
23e4eb7cd9 deprecating filter:server.create_routes and filter:admin.create_routes; maintains limited functionality but recommended you migrate asap 2014-03-06 16:49:32 -05:00
Julian Lam
1f23642ab4 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-03-06 15:38:02 -05:00
Julian Lam
b2bc1d4555 setting password to null in getUserData, because Object.delete is bad? :P (thanks @barisusakli) 2014-03-06 15:37:29 -05:00
Julian Lam
e9e53ad95e added a new property to userData "hasPassword", disabling "current password" field in user editing if no password is set (for SSO logins, for example) 2014-03-06 15:32:06 -05:00
Baris Soner Usakli
d34e68ca25 convert score to int in mongo 2014-03-06 15:31:10 -05:00
Baris Soner Usakli
da0e1a8eb9 added back err to redis flushdb 2014-03-06 14:52:34 -05:00
Baris Soner Usakli
4986c8ed3a fixed tests 2014-03-06 14:51:43 -05:00
psychobunny
8c8055fbae fix for multiple synchronous hooks (synchronous hooks to be deprecated in 0.4x) 2014-03-06 14:23:48 -05:00
psychobunny
178edd150a moved action:app.load out of webserver; passing in app, mdw, and controllers into action:app.load. now we can create routes dynamically ;) 2014-03-06 14:09:10 -05:00
psychobunny
a9cccc9b9c allow hooks to accept single/multiple arguments instead of requiring you to send in a hash 2014-03-06 14:07:56 -05:00
psychobunny
a9046b926d clean templates directory before beginning compilation 2014-03-06 12:25:10 -05:00
psychobunny
90a80ad83d plugins can now define a templates directory which gets compiled onload without requiring any hooks 2014-03-06 12:06:19 -05:00
psychobunny
c054ae121b Merge remote-tracking branch 'origin/master' into webserver.js-refactor 2014-03-06 10:56:36 -05:00
Julian Lam
4a1513eabf fixed #1161 properly - Merge remote-tracking branch 'origin/master' 
Conflicts:
	src/upgrade.js
 2014-03-06 10:35:12 -05:00
Anthony Webb
6f8ed7f073 err doesnt exist here 2014-03-06 00:07:07 -06:00
psychobunny
f20a2a2047 merging changes from deprecated routes/user.js 2014-03-06 00:52:12 -05:00
psychobunny
8a05eee1f5 Merge remote-tracking branch 'origin/master' into webserver.js-refactor 
Conflicts:
	src/routes/user.js
 2014-03-06 00:51:36 -05:00
Baris Soner Usakli
096f352c82 closes #1130 2014-03-05 23:00:27 -05:00
Julian Lam
e956c19587 #1110 - moved isEmailAvailable into User.email 2014-03-05 21:21:53 -05:00
Julian Lam
e0dcf95138 fixed missing err in upgrade script 2014-03-05 21:19:36 -05:00
Baris Soner Usakli
38145abae1 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-03-05 20:37:40 -05:00
Baris Soner Usakli
58cb51bb02 removed unused imagemagick require 2014-03-05 20:37:31 -05:00
Julian Lam
b404b0197f final pass, resolved #1155 2014-03-05 19:51:16 -05:00
Julian Lam
5f52ef5f01 removed all 0.3.x related upgrade scripts, and updated minSchemaDate 2014-03-05 19:41:16 -05:00
Julian Lam
64aa89f5ee updating upgrade script to use UTC timestamps *facepalm*. God, I hope I didn't break anything... 
(first pass #1155)
 2014-03-05 19:33:10 -05:00
psychobunny
34552f7fb0 added middleware.guestSearchingAllowed to the actual search API call 2014-03-05 17:37:54 -05:00
psychobunny
542f937589 Merge remote-tracking branch 'origin/master' into webserver.js-refactor 
Conflicts:
	src/routes/api.js
 2014-03-05 17:35:41 -05:00
psychobunny
b9e119241e moved get_custom_templates into plugins.js 2014-03-05 17:23:08 -05:00
psychobunny
8f7a7fec7d more cleanup; commenting out custom plugin routes until its fixed properly 2014-03-05 17:13:55 -05:00
psychobunny
c0cd6148f4 one final push, cleanup + organize + lint; made feeds/meta/plugins routes follow same pattern as other route files 2014-03-05 17:06:24 -05:00
Baris Soner Usakli
c028761857 new route to get recent posts 2014-03-05 16:49:42 -05:00
psychobunny
1dbc47b890 deps cleanup 2014-03-05 16:25:55 -05:00
psychobunny
73d637096c Merge remote-tracking branch 'origin/master' into webserver.js-refactor 
Conflicts:
	public/templates/account.tpl
	public/templates/accountposts.tpl
	public/templates/favourites.tpl
	public/templates/search.tpl
 2014-03-05 15:59:50 -05:00
psychobunny
3efca794fd regex cleanup; fixed indenting on partials 2014-03-05 15:58:43 -05:00
Baris Soner Usakli
c9c25bd174 added getRecentPost 2014-03-05 15:38:54 -05:00