Commit Graph

4358 Commits (f99c1f9921606aff48312c741bd9b50529a557d6)
 

Author SHA1 Message Date
psychobunny f99c1f9921 removed code climate badge until analysis is complete
Julian Lam c9642cecd2 setting Lavender as default theme for 0.4.0, woo!
Baris Soner Usakli e51016ee66 Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Soner Usakli 30130b2d62 set back to false when loading indicator fades out
Julian Lam 90b29031fe backwards compatibility with older plugins using css with staticDir
Julian Lam 6a31bd9af6 Merge branch 'master' of github.com:designcreateplay/NodeBB
Julian Lam 552a63367d workaround for problem arising from switch to Date.UTC()
Baris Soner Usakli 6a824a2e10 Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Soner Usakli 7dfdab0a2d search page change
Julian Lam 5880590425 removing "pluginCSS", "css" in plugins is now included directly into stylesheet.css. This is a breaking change.
fixes 
Julian Lam 958e85a31f updated readme to point to wiki for platform specific install docs
Julian Lam 4add89cea4 Merge branch 'master' of github.com:tparnell8/NodeBB into tparnell8-master
Julian Lam 1f23642ab4 Merge branch 'master' of github.com:designcreateplay/NodeBB
Julian Lam b2bc1d4555 setting password to null in getUserData, because Object.delete is bad? :P (thanks @barisusakli)
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)
Baris Soner Usakli d34e68ca25 convert score to int in mongo
Baris Soner Usakli acd4771012 dbmock changes
Baris Soner Usakli da0e1a8eb9 added back err to redis flushdb
Baris Soner Usakli 4986c8ed3a fixed tests
Baris Soner Usakli 7135e9424c closes
Baris Soner Usakli 3fe9bdc24c removed the postbar selector from activeusers
Julian Lam 4a1513eabf fixed properly - Merge remote-tracking branch 'origin/master'
Conflicts:
	src/upgrade.js
Barış Soner Uşaklı b79169a765 Merge pull request from code-press/master
Upgrade script incorrectly looking for "err"
Anthony Webb 21b1bc1729 Revert "Remove text"
This reverts commit c25835c63e.
Anthony Webb 6f8ed7f073 err doesnt exist here
Anthony Webb d9ca95a5a3 Merge remote-tracking branch 'upstream/master'
Baris Soner Usakli 096f352c82 closes
Julian Lam e956c19587 - moved isEmailAvailable into User.email
Julian Lam e0dcf95138 fixed missing err in upgrade script
Baris Soner Usakli 38145abae1 Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Soner Usakli 58cb51bb02 removed unused imagemagick require
Julian Lam b404b0197f final pass, resolved
Julian Lam 5f52ef5f01 removed all 0.3.x related upgrade scripts, and updated minSchemaDate
Julian Lam 64aa89f5ee updating upgrade script to use UTC timestamps *facepalm*. God, I hope I didn't break anything...
(first pass )
Baris Soner Usakli c028761857 new route to get recent posts
Baris Soner Usakli 6f806d80c2 Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Soner Usakli c9c25bd174 added getRecentPost
Julian Lam 6192af18ab Merge pull request from BitBangersCode/settings-callback
Send the callback to the retry
MrWaffle 33a5a2177e Send the callback to the retry
Baris Soner Usakli 976744480f post summary change
David Hoff c25835c63e Remove text
Baris Soner Usakli 76d8d09f9b closes
Baris Soner Usakli d100a41ce7 fixes topic follow
Baris Soner Usakli 8c11299197 template language fix
Barış Soner Uşaklı 81378e071b Merge pull request from MakerStudios/alertclose_nofire_click
Don't fire click when closing an alert
Julian Lam 9b53dd1014 english fallback for 'reset_password' translations
medwards20x6 76b53478ce Don't fire click when closing an alert
Baris Soner Usakli b28e4846a4 fixed disconnect check
Baris Soner Usakli 3c97ef6829 closes
Baris Soner Usakli dbb814fe4e category permission page fixes