Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-01-19 14:02:58 +01:00
Code Issues Packages Projects Releases Wiki Activity
4,337 Commits 69 Branches 489 Tags
3fe9bdc24cf59eadfcd54107fda9be577dc6aab7
Commit Graph

4337 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Baris Soner Usakli
c9c25bd174 added getRecentPost 2014-03-05 15:38:54 -05:00
Julian Lam
6192af18ab Merge pull request #1159 from BitBangersCode/settings-callback 
Send the callback to the retry
 2014-03-05 15:37:45 -05:00
MrWaffle
33a5a2177e Send the callback to the retry 2014-03-05 20:57:32 +01:00
Baris Soner Usakli
976744480f post summary change 2014-03-05 14:52:32 -05:00
David Hoff
c25835c63e Remove text 2014-03-05 13:59:59 -05:00
Baris Soner Usakli
76d8d09f9b closes #1141 2014-03-04 16:48:07 -05:00
Baris Soner Usakli
d100a41ce7 fixes topic follow 2014-03-04 15:23:26 -05:00
Baris Soner Usakli
8c11299197 template language fix 2014-03-04 14:56:05 -05:00
Barış Soner Uşaklı
81378e071b Merge pull request #1157 from MakerStudios/alertclose_nofire_click 
Don't fire click when closing an alert
 2014-03-04 13:43:04 -05:00
Julian Lam
9b53dd1014 english fallback for 'reset_password' translations 2014-03-04 13:35:20 -05:00
medwards20x6
76b53478ce Don't fire click when closing an alert 2014-03-04 10:30:44 -08:00
Baris Soner Usakli
b28e4846a4 fixed disconnect check 2014-03-04 13:28:24 -05:00
Baris Soner Usakli
3c97ef6829 closes #1156 2014-03-04 13:09:58 -05:00
Baris Soner Usakli
dbb814fe4e category permission page fixes 2014-03-04 12:54:25 -05:00
Baris Soner Usakli
7bb3766ebd 2 column layout for admin index 2014-03-03 22:05:25 -05:00
Baris Soner Usakli
814db2e1d8 icon first 2014-03-03 17:52:00 -05:00
Baris Soner Usakli
4b64b9dcdc closes #951 2014-03-03 17:46:54 -05:00
Baris Soner Usakli
1f7a717bf0 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-03-03 17:24:52 -05:00
Baris Soner Usakli
50f83abf75 closes 1150 2014-03-03 17:24:38 -05:00
Julian Lam
57d0273c13 dutch translations 2014-03-03 16:40:57 -05:00
Julian Lam
8846f7fb9b fixing mappedPath in windows 2014-03-03 16:32:41 -05:00
Baris Soner Usakli
37aeda14c4 fixed email retrieval in mongo 2014-03-03 16:16:41 -05:00
Baris Soner Usakli
be70b3de57 closes #1090 2014-03-03 15:26:15 -05:00
Baris Soner Usakli
529cd60dd2 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-03-03 14:46:57 -05:00
Baris Soner Usakli
70299ea5c2 better search result page 2014-03-03 14:46:50 -05:00
Julian Lam
9c55b202e7 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-03-03 12:47:43 -05:00
Julian Lam
dc8839b63c updating validator to 3.4.0 2014-03-03 12:47:40 -05:00
Julian Lam
64ee792013 fixed #1154 2014-03-03 11:12:28 -05:00
Julian Lam
5a8fa9b1f7 fixed regression in groups management modal 2014-03-03 11:07:37 -05:00
Julian Lam
30e83fdabe fixing upgrade script if order is not set 2014-03-03 10:17:11 -05:00
Julian Lam
fc53385ede removing socket.io library from minfile 2014-03-02 22:34:57 -05:00
Julian Lam
044347ebca hotfix for vanilla missing socket.io lib 2014-03-02 22:02:55 -05:00
Julian Lam
aadde85e1b Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-03-02 20:41:49 -05:00
Julian Lam
28832a2540 fixing bug where sometimes a pidfile was left over, and nodebb would refuse to start a daemon again. 2014-03-02 20:37:57 -05:00