c8639c178d
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
2014-02-08 15:31:43 +01:00
313ec3d869
Merge branch 'develop' into bs3
...
Conflicts:
views/options/social/tavern.jade
2014-02-07 23:41:14 -07:00
8d03cfc6b5
Made incorrect username and password show the same error, for security purposes.
2014-02-07 21:08:13 -08:00
3473b73452
chore(Merge): branch 'develop' into bs3
...
Conflicts:
views/options/inventory/inventory.jade
2014-02-07 17:42:12 -07:00
00c8a7f757
chore(cluster): max 2-core
2014-02-07 14:18:04 -07:00
e404f35705
Revert "chore(cluster): temporarily disable cluster (revert here)"
...
This reverts commit e36d3264be
2014-02-07 14:17:48 -07:00
2807b3f87d
chore(logging): remove console.log
2014-02-07 21:08:46 +01:00
00af5f7d02
feat(bug-crushing): add the critical hammer of bug-crushing
2014-02-07 11:41:50 -07:00
e24d7476e8
refactor(errors): remove more res.json(500) in favor of next(err)
2014-02-07 09:20:40 -07:00
ce8351d622
chore(Merge): branch 'develop' into origin-paglias-bs3
...
Conflicts:
views/options/social/tavern.jade
2014-02-07 00:03:33 -07:00
e36d3264be
chore(cluster): temporarily disable cluster (revert here)
2014-02-06 20:12:52 -07:00
f7ded9d690
chore(logging): remove console.log(isStaticPage)
2014-02-06 13:28:19 -07:00
2837edd51f
chore(cluster): use domain-middleware properly, so domains are used to restart cluster workers
2014-02-06 10:58:47 -07:00
e4bd817443
refactor(bs3): sync with develop
2014-02-06 17:36:33 +01:00
90e9a1aeaa
i18n(refactor): load all files in a locale, not the ones defined in app.json, move env.t client code to own file, add env.isStaticPage (from isFrontPage)
2014-02-06 17:17:21 +01:00
b6edc28b14
refactor(bs3): merge develop
2014-02-06 16:19:51 +01:00
e268839bcb
chore(throttling): lower api limit a tad, just to test
2014-02-05 21:33:24 -07:00
0c21f54c67
fix(user): make sure next is passed to all routes, and is available in
...
err-back of batch updates
2014-02-05 21:28:46 -07:00
4c3c4b2ae7
perf(user): save user.save till very end of ops queue
2014-02-05 21:22:25 -07:00
bf5e9016a4
fix(errors): return next(err) when experiencing errors, instead of res.json(500,{err:err}). Let the top-level error handler handle this (needed for upcoming versionerror discarding)
2014-02-05 17:28:59 -07:00
3f4d266b00
refactor(bs3): sync with develop
2014-02-04 19:59:48 +01:00
9b3814575e
perf(hall): use $gt in contributors.level index instead of $ne:null for
...
better performance
2014-02-04 09:49:49 -07:00
2786b36206
fix(mongoose): typo
2014-02-03 18:14:17 -07:00
6a86da316b
chore(mongoose): set some options per #2725 to address high number of open connections, replset connection timeout, and close mongoose connection on process death
2014-02-03 17:57:38 -07:00
56133894d8
refactor(bs3): sync with develop
2014-02-03 18:45:25 +01:00
e3b5a3978a
chore(logging): change disconnect message level from error to info
2014-02-03 01:25:54 -06:00
ac5ef440fe
chore(merge): Merge remote-tracking branch 'colegleason/disconnect' into develop
...
Conflicts:
src/utils.js
2014-02-02 23:42:59 -07:00
83b3739f46
fix(winston): typo
2014-02-02 23:26:57 -07:00
e966cc956a
chore(logging): only log to console and file on dev (cc @lefnire)
2014-02-03 00:14:31 -06:00
dfa27b3fa2
Merge pull request #2685 from colegleason/logging
...
chore(logging): add Winston and replace console.log
2014-02-02 22:06:35 -08:00
85eb0aa38a
chore(cluster): disconnect worker on error, then kill after 30 sec
...
(cc @lefnire): This disconnects the process, sets up a kill timer, and
then sends error emails and responses back to the client. This should
stop new clients from connecting to the dead worker, allow connections
already established to finish, and cause the master to fork a new worker
to pick up the slack immediately.
2014-02-03 00:00:58 -06:00
f31723b0ab
refactor(bs3): sync with develop
2014-02-02 13:26:35 +01:00
b01d08ccfe
Merge pull request #2693 from colegleason/csv
...
Set filename when exporting challenge to CSV
2014-02-01 17:10:09 -08:00
78315d828b
feat(quests): add flags.levelDrops for dropping items at certain levels
2014-02-01 16:15:20 -08:00
36f21196f4
fix(challenges): challenge csv export now has proper filename
...
This sets the Content-disposition filename for the Challenge CSV export
to be {challenge_id}.csv.
Fixes #2689 .
2014-02-01 12:14:24 -06:00
0a047f5b2f
Merge branch 'develop' into paglias/bs3
2014-02-01 16:47:32 +01:00
71f4371d9c
chore(logging): add Newrelic and Email transports for Winston
...
This will send an email on errors logged with winston and thus removes
the old error emailing code.
2014-02-01 02:46:22 -06:00
ae847facda
chore(logging): fix logging.error and make sure logger exists
2014-02-01 02:08:32 -06:00
4494600d92
chore(logging): replace console.* with new logging module
2014-02-01 02:01:19 -06:00
2188b5a6c0
chore(logging): add logging via Winston and wrapped it with a custom logging module
2014-02-01 01:47:11 -06:00
54064debf3
feat(quests): allow dropping scrolls in quests
2014-01-31 15:06:56 -07:00
800231cf64
feat(quests): allow html in quest notes
2014-01-31 15:06:56 -07:00
823296fc41
refactor(bs3): sync with develop
2014-01-31 21:56:39 +01:00
179316e10f
feat(restore): add restore-gp back in. Parly to end the winter event,
...
partly due to the convo at #2681 regarding subscriptions. Fixes #2681
2014-01-31 12:54:37 -07:00
cc348b2f11
refactor(bs3): sync with develop & misc
2014-01-31 20:04:40 +01:00
a72b013131
fix(hall): let's try $gt instead of $ne:null, the query is still
...
slow
2014-01-31 11:11:42 -07:00
87d196b038
chore(throttling): throttle in dev too
2014-01-31 11:11:16 -07:00
1faec250d8
chore(throttling): throttle all requests, not just API requests. Since
...
we're 120req/min, this shouldn't pose an issue for normal usage. #2645
2014-01-31 10:47:41 -07:00
92563915ef
chore(throttling): add api-throttling (request limiting) so users can
...
only request routes 120times per minute (aka, 2req/second but spread out
for sanity). fixes #2645
2014-01-31 10:32:33 -07:00
ab86ba11bd
fix(user): if need to upgrade site, send 501, not 400
2014-01-31 10:27:02 -07:00
Matteo Pagliazzi