Commit Graph

2409 Commits

Author SHA1 Message Date
psychobunny
ee5596fad5 Merge remote-tracking branch 'origin/master' into webserver.js-refactor 2014-03-02 13:51:34 -05:00
Baris Soner Usakli
feeb220514 removed console.log 2014-03-01 22:52:30 -05:00
Baris Soner Usakli
1b7f8cc5cb active users fix 2014-03-01 22:51:39 -05:00
Baris Soner Usakli
fb691b23b4 moved topic locked check to topic.reply 2014-03-01 22:03:21 -05:00
Julian Lam
079ed10631 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-03-01 21:32:43 -05:00
Julian Lam
2b178ff76d proper tracking of users' reply status when others enter the room 2014-03-01 21:31:50 -05:00
Baris Soner Usakli
2966cc4a49 minor fix 2014-03-01 19:18:15 -05:00
Baris Soner Usakli
b2f9184562 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-03-01 19:15:25 -05:00
Baris Soner Usakli
b6d97281d3 closes #1015 2014-03-01 19:15:18 -05:00
Julian Lam
a9b78d2600 minimizing the composer should unregister it 2014-03-01 17:49:39 -05:00
Baris Soner Usakli
42a7c037e6 removed dupe i var 2014-03-01 17:36:29 -05:00
psychobunny
f46e563b8a moved all route definitions in webserver.js into routes/index.js 2014-03-01 17:35:47 -05:00
psychobunny
08a9ce4950 moved all app.configure() code into middleware/index.js + organization/cleanup 2014-03-01 17:26:26 -05:00
Julian Lam
fcb44ae256 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-03-01 17:06:02 -05:00
Julian Lam
d012d237bf added back clearInterval 2014-03-01 17:05:57 -05:00
Baris Soner Usakli
c4d1c8feff Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-03-01 16:59:13 -05:00
Baris Soner Usakli
87f337f2fb cleanup 2014-03-01 16:59:04 -05:00
Julian Lam
7ef84e0daa switched to 'ping active' system 2014-03-01 16:53:41 -05:00
Julian Lam
7ff9fa1a44 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-03-01 15:46:27 -05:00
Julian Lam
b3d7ae1c86 showing who is replying in the active users block 2014-03-01 15:46:13 -05:00
Baris Soner Usakli
0c9ab5e93f Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-03-01 15:45:55 -05:00
psychobunny
804da0d8de removed unused deps in webser.js 2014-03-01 15:45:47 -05:00
Baris Soner Usakli
fff3ba5bec hinted redis.js 2014-03-01 15:45:43 -05:00
psychobunny
26853d024e Merge remote-tracking branch 'origin/master' into webserver.js-refactor 2014-03-01 15:37:57 -05:00
Julian Lam
0fecbf7cbf entity decoding in filenames 2014-02-28 23:38:04 -05:00
Julian Lam
6bc759748f Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-02-28 20:51:17 -05:00
Julian Lam
1f136c6a72 ninjafix to mappedPath 2014-02-28 20:51:12 -05:00
Baris Soner Usakli
24b669bd39 some fixes for search plugin 2014-02-28 20:47:49 -05:00
Julian Lam
1c19ae48bd fixed #1143 -- also removed near-meaningless info messages saying that a Hook had been registered. 2014-02-28 20:39:27 -05:00
Julian Lam
5540313b7f fixing path resolution for plugins in production mode 2014-02-28 20:13:28 -05:00
Julian Lam
5e2460e17e fixed #1144 2014-02-28 20:05:19 -05:00
Baris Soner Usakli
e75c303b89 added unique visitor count to admin dashboard 2014-02-28 17:19:42 -05:00
Baris Soner Usakli
7081c7dcc4 moved ip log to api 2014-02-28 16:50:39 -05:00
psychobunny
e73f8d6f37 Merge remote-tracking branch 'origin/master' into webserver.js-refactor 2014-02-28 16:42:05 -05:00
Julian Lam
6a649f9b9a Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-02-28 16:21:09 -05:00
Julian Lam
561b42d0f9 new staticDirs format, @mrwaffle 2014-02-28 16:21:02 -05:00
psychobunny
f35c14ee07 bugfixes + cleanup for accounts and users routes 2014-02-28 15:58:29 -05:00
psychobunny
fa103b2d6e finally done with routes/user.js; accounts.getUserByUID; bug fixing and cleanup 2014-02-28 15:33:25 -05:00
psychobunny
08d3d9feb3 accounts.uploadPicture 2014-02-28 15:26:39 -05:00
Baris Soner Usakli
ccd29bfd61 added callback to category update 2014-02-28 15:25:50 -05:00
psychobunny
e67f6d2169 re-added filter:footer.build temporarily - to be deprecated for 0.4x 2014-02-28 15:15:00 -05:00
psychobunny
607bc8545b Merge remote-tracking branch 'origin/master' into webserver.js-refactor 2014-02-28 14:35:00 -05:00
psychobunny
cb15655c9c app.checkAccountPermissions middleware; some clean up & bug fixes 2014-02-28 14:34:35 -05:00
psychobunny
bfcb61f37d forgot to port getUserDataByUserSlug 2014-02-28 14:22:49 -05:00
psychobunny
d072ad60de all users/ pages converted 2014-02-28 14:19:43 -05:00
psychobunny
7c873c4314 decided to functionally separate accounts from users 2014-02-28 14:08:06 -05:00
psychobunny
e64d87cb1d all user account pages; all static pages; outgoing page 2014-02-28 14:04:21 -05:00
Matthew Conlen
a2a9c8fd8a fix error with undefined callback 2014-02-28 12:58:05 -05:00
Baris Soner Usakli
9b4ca12dc1 fixed missing var, posts.js cleanup 2014-02-28 00:14:11 -05:00
Baris Soner Usakli
091723a8c5 closes #1101 2014-02-27 23:45:12 -05:00