Commit Graph

4372 Commits

Author SHA1 Message Date
barisusakli
281c482f1c Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-03-09 14:02:33 -04:00
barisusakli
6496b91c29 closes #1180 2014-03-09 14:02:30 -04:00
Julian Lam
4309fe3192 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-03-09 00:47:25 -05:00
Julian Lam
820cdf8a47 temporarily removing cronjob until upstream bugs are fixed -- resolved #1178 2014-03-09 00:47:21 -05: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
6fb393de78 fixing #1177 2014-03-08 16:50:32 -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
7fa8f5ef36 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-03-08 15:45:56 -05:00
barisusakli
284276cbb6 messaging jshint 2014-03-08 15:45:42 -05:00
psychobunny
f99c1f9921 removed code climate badge until analysis is complete 2014-03-08 02:56:24 -05:00
Julian Lam
c9642cecd2 setting Lavender as default theme for 0.4.0, woo! 2014-03-06 23:24:47 -05:00
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
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
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
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
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
Baris Soner Usakli
c028761857 new route to get recent posts 2014-03-05 16:49:42 -05:00
Baris Soner Usakli
6f806d80c2 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-03-05 15:39:02 -05:00