Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-14 09:55:47 +01:00
Code Issues Packages Projects Releases Wiki Activity
5,675 Commits 74 Branches 483 Tags
652e1ef5745b69cb15e756eeb7df923af6e47388
Commit Graph

5675 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baris Soner Usakli
e51016ee66 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-03-06 20:53:51 -05:00
Baris Soner Usakli
30130b2d62 set back to false when loading indicator fades out 2014-03-06 20:53:41 -05:00
Julian Lam
90b29031fe backwards compatibility with older plugins using css with staticDir 2014-03-06 20:36:05 -05:00
Julian Lam
6a31bd9af6 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-03-06 19:48:54 -05:00
Julian Lam
552a63367d workaround for problem arising from switch to Date.UTC() 2014-03-06 19:48:38 -05:00
Baris Soner Usakli
6a824a2e10 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-03-06 17:57:15 -05:00
Baris Soner Usakli
7dfdab0a2d search page change 2014-03-06 17:57:07 -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
psychobunny
7183fda2eb console.log 2014-03-06 16:48:55 -05:00
psychobunny
bcd8137d0e console.log 2014-03-06 16:47:59 -05:00
psychobunny
55a7838725 temporary templateMapping fix for admin side; will come back to this after merging this branch 2014-03-06 16:00:17 -05:00
Julian Lam
958e85a31f updated readme to point to wiki for platform specific install docs 2014-03-06 15:56:14 -05:00
Julian Lam
4add89cea4 Merge branch 'master' of github.com:tparnell8/NodeBB into tparnell8-master 2014-03-06 15:40:07 -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
acd4771012 dbmock changes 2014-03-06 15:11:29 -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
Baris Soner Usakli
7135e9424c closes #1167 2014-03-06 13:32:26 -05:00
Baris Soner Usakli
3fe9bdc24c removed the postbar selector from activeusers 2014-03-06 13:08:22 -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
Barış Soner Uşaklı
b79169a765 Merge pull request #1161 from code-press/master 
Upgrade script incorrectly looking for "err"
 2014-03-06 01:24:32 -05:00
Anthony Webb
21b1bc1729 Revert "Remove text" 
This reverts commit c25835c63e.
 2014-03-06 00:13:13 -06:00
Anthony Webb
6f8ed7f073 err doesnt exist here 2014-03-06 00:07:07 -06:00
Anthony Webb
d9ca95a5a3 Merge remote-tracking branch 'upstream/master' 2014-03-06 00:04:47 -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