Julian Lam
|
b2bc1d4555
|
setting password to null in getUserData, because Object.delete is bad? :P (thanks @barisusakli)
|
11 years ago |
|
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)
|
11 years ago |
|
Julian Lam
|
4a1513eabf
|
fixed #1161 properly - Merge remote-tracking branch 'origin/master'
Conflicts:
src/upgrade.js
|
11 years ago |
Barış Soner Uşaklı
|
b79169a765
|
Merge pull request #1161 from code-press/master
Upgrade script incorrectly looking for "err"
|
11 years ago |
Anthony Webb
|
21b1bc1729
|
Revert "Remove text"
This reverts commit c25835c63e.
|
11 years ago |
|
Anthony Webb
|
6f8ed7f073
|
err doesnt exist here
|
11 years ago |
|
Anthony Webb
|
d9ca95a5a3
|
Merge remote-tracking branch 'upstream/master'
|
11 years ago |
|
Baris Soner Usakli
|
096f352c82
|
closes #1130
|
11 years ago |
|
Julian Lam
|
e956c19587
|
#1110 - moved isEmailAvailable into User.email
|
11 years ago |
|
Julian Lam
|
e0dcf95138
|
fixed missing err in upgrade script
|
11 years ago |
|
Baris Soner Usakli
|
38145abae1
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
11 years ago |
|
Baris Soner Usakli
|
58cb51bb02
|
removed unused imagemagick require
|
11 years ago |
|
Julian Lam
|
b404b0197f
|
final pass, resolved #1155
|
11 years ago |
|
Julian Lam
|
5f52ef5f01
|
removed all 0.3.x related upgrade scripts, and updated minSchemaDate
|
11 years ago |
|
Julian Lam
|
64aa89f5ee
|
updating upgrade script to use UTC timestamps *facepalm*. God, I hope I didn't break anything...
(first pass #1155)
|
11 years ago |
|
Baris Soner Usakli
|
c028761857
|
new route to get recent posts
|
11 years ago |
|
Baris Soner Usakli
|
6f806d80c2
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
11 years ago |
|
Baris Soner Usakli
|
c9c25bd174
|
added getRecentPost
|
11 years ago |
|
Julian Lam
|
6192af18ab
|
Merge pull request #1159 from BitBangersCode/settings-callback
Send the callback to the retry
|
11 years ago |
MrWaffle
|
33a5a2177e
|
Send the callback to the retry
|
11 years ago |
|
Baris Soner Usakli
|
976744480f
|
post summary change
|
11 years ago |
David Hoff
|
c25835c63e
|
Remove text
|
11 years ago |
|
Baris Soner Usakli
|
76d8d09f9b
|
closes #1141
|
11 years ago |
|
Baris Soner Usakli
|
d100a41ce7
|
fixes topic follow
|
11 years ago |
|
Baris Soner Usakli
|
8c11299197
|
template language fix
|
11 years ago |
|
Barış Soner Uşaklı
|
81378e071b
|
Merge pull request #1157 from MakerStudios/alertclose_nofire_click
Don't fire click when closing an alert
|
11 years ago |
|
Julian Lam
|
9b53dd1014
|
english fallback for 'reset_password' translations
|
11 years ago |
medwards20x6
|
76b53478ce
|
Don't fire click when closing an alert
|
11 years ago |
|
Baris Soner Usakli
|
b28e4846a4
|
fixed disconnect check
|
11 years ago |
|
Baris Soner Usakli
|
3c97ef6829
|
closes #1156
|
11 years ago |
|
Baris Soner Usakli
|
dbb814fe4e
|
category permission page fixes
|
11 years ago |
|
Baris Soner Usakli
|
7bb3766ebd
|
2 column layout for admin index
|
11 years ago |
|
Baris Soner Usakli
|
814db2e1d8
|
icon first
|
11 years ago |
|
Baris Soner Usakli
|
4b64b9dcdc
|
closes #951
|
11 years ago |
|
Baris Soner Usakli
|
1f7a717bf0
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
11 years ago |
|
Baris Soner Usakli
|
50f83abf75
|
closes 1150
|
11 years ago |
|
Julian Lam
|
57d0273c13
|
dutch translations
|
11 years ago |
|
Julian Lam
|
8846f7fb9b
|
fixing mappedPath in windows
|
11 years ago |
|
Baris Soner Usakli
|
37aeda14c4
|
fixed email retrieval in mongo
|
11 years ago |
|
Baris Soner Usakli
|
be70b3de57
|
closes #1090
|
11 years ago |
|
Baris Soner Usakli
|
529cd60dd2
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
11 years ago |
|
Baris Soner Usakli
|
70299ea5c2
|
better search result page
|
11 years ago |
|
Julian Lam
|
9c55b202e7
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
11 years ago |
|
Julian Lam
|
dc8839b63c
|
updating validator to 3.4.0
|
11 years ago |
|
Julian Lam
|
64ee792013
|
fixed #1154
|
11 years ago |
|
Julian Lam
|
5a8fa9b1f7
|
fixed regression in groups management modal
|
11 years ago |
|
Julian Lam
|
30e83fdabe
|
fixing upgrade script if order is not set
|
11 years ago |
|
Julian Lam
|
fc53385ede
|
removing socket.io library from minfile
|
11 years ago |
|
Julian Lam
|
044347ebca
|
hotfix for vanilla missing socket.io lib
|
11 years ago |
|
Julian Lam
|
aadde85e1b
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
11 years ago |