Commit graph

4535 commits

Author SHA1 Message Date
Tyler Renelle
e3e5399584 test(quests): change quest tests from gryphon => vice1 2014-01-31 15:06:56 -07:00
Tyler Renelle
54064debf3 feat(quests): allow dropping scrolls in quests 2014-01-31 15:06:56 -07:00
Tyler Renelle
800231cf64 feat(quests): allow html in quest notes 2014-01-31 15:06:56 -07:00
Matteo Pagliazzi
1fbdd6cebe Merge branch 'develop' into paglias/bs3 2014-01-31 22:13:41 +01:00
Matteo Pagliazzi
89443bb970 chore(git): update gitignore 2014-01-31 22:11:00 +01:00
Matteo Pagliazzi
49e1bf1ba4 refactor(bs3): fix 2014-01-31 22:05:09 +01:00
Matteo Pagliazzi
823296fc41 refactor(bs3): sync with develop 2014-01-31 21:56:39 +01:00
Matteo Pagliazzi
f4c30390f5 refactor(bs3): start porting app, general layout and filters 2014-01-31 21:18:44 +01:00
Tyler Renelle
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
Tyler Renelle
4ba5a9cf26 refactor(restore): remove restore-gear commented-out code, that stuff is
incompatible with new gear setup (circa class system)
2014-01-31 12:50:13 -07:00
Matteo Pagliazzi
cc348b2f11 refactor(bs3): sync with develop & misc 2014-01-31 20:04:40 +01:00
Matteo Pagliazzi
0764aa8c17 refactor(bs3): convert icons to new format 2014-01-31 19:47:48 +01:00
Tyler Renelle
a72b013131 fix(hall): let's try $gt instead of $ne:null, the query is still
slow
2014-01-31 11:11:42 -07:00
Tyler Renelle
87d196b038 chore(throttling): throttle in dev too 2014-01-31 11:11:16 -07:00
Tyler Renelle
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
Tyler Renelle
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
Tyler Renelle
ab86ba11bd fix(user): if need to upgrade site, send 501, not 400 2014-01-31 10:27:02 -07:00
Tyler Renelle
afee0968f8 fix(groups): pass missing next into Like function 2014-01-30 23:31:58 -07:00
Tyler Renelle
b42dacf203 fix(errors): handle if err.message == undefined, send err 2014-01-30 22:13:51 -07:00
Tyler Renelle
a960c63f00 refactor(groups): small groups-creation cleanup 2014-01-30 21:54:24 -07:00
Tyler Renelle
0aec4caa78 fix(user): PUT user retricted path errors are 401, not 500 2014-01-30 21:39:19 -07:00
Tyler Renelle
8e86fddc64 Revert "chore(cluster): don't kill process until email sent"
This reverts commit 52df534196.
2014-01-30 21:34:14 -07:00
Tyler Renelle
0a0c6c73a5 chore(bailey): fix bailey notifs to say Jan 31 for cut off dates @lemoness 2014-01-30 21:34:06 -07:00
Tyler Renelle
f967962996 fix(batch-update): send errors to client if batch-update found an error,
crash pid.
2014-01-30 21:33:28 -07:00
Tyler Renelle
5b6c4427b5 fix(groups): send error if +1 errored 2014-01-30 21:11:11 -07:00
Tyler Renelle
aff885c05c feat(habitBirthday): add habitrpg birthday event. includes cakes for all
pets, absurd party robes, npc swap, badge, etc. @lemoness
2014-01-30 19:20:07 -07:00
Marc-André Larivière
2e64b03a63 Fixed inventory alignment. Issue #2158 2014-01-30 19:58:34 -05:00
Marc-André Larivière
49ec9d2e5c Fixed inventory alignment. Issue #2158 2014-01-30 19:57:50 -05:00
Tyler Renelle
8a42e0c392 chore(logging): no production logging (how did this commit get removed?) 2014-01-30 17:21:17 -07:00
Tyler Renelle
52df534196 chore(cluster): don't kill process until email sent 2014-01-30 17:18:48 -07:00
Tyler Renelle
4f02ccb3b0 chore(cluster): kill & respawn pids on cluster fail, using domain-middleware 2014-01-30 17:01:13 -07:00
Tyler Renelle
7c3d85dbbe chore(cluster): try cluster again 2014-01-30 17:00:56 -07:00
Matteo Pagliazzi
c7c6181bbc Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop 2014-01-30 22:26:28 +01:00
Matteo Pagliazzi
76db2d49c2 18n(merge): merge @Sinza- pr, @lefnire now it is ready 2014-01-30 22:25:42 +01:00
Tyler Renelle
6f2f3dd71e chore(newrelic): some newrelic code location experiments 2014-01-30 13:43:30 -07:00
Marcelo Sizer
44d9ea2a15 i18n(interpolation): Add string interpolation 2014-01-30 18:25:25 -02:00
Tyler Renelle
416feca42e chore(newrelic): use license key in accordance with https://docs.newrelic.com/docs/nodejs/nodejs-agent-on-heroku 2014-01-30 11:52:58 -07:00
Matteo Pagliazzi
9481b32b0f chore(bs3): upgrade to 3.1.0 2014-01-30 19:34:50 +01:00
Tyler Renelle
85e2ce5c4a chore(logging): don't log in production 2014-01-30 11:04:43 -07:00
Tyler Renelle
2d4d103ca6 chore(bower): strange temporary fix. Can't remember where I picked this
up, but I was having issues deploying to prod with bower referencing a
private repo (using github oauth key, see private#premium)
2014-01-30 11:04:43 -07:00
Tyler Renelle
5b06392879 chore(newrelic): add newrelic 2014-01-30 11:04:39 -07:00
Tyler Renelle
3660f1a85c feat(premium): backport server code for premium subs (it's just ccard
handling & uer model stuff)
2014-01-30 10:51:32 -07:00
Matteo Pagliazzi
5f0cf6575c fix(settings): remove unnecessary code 2014-01-30 18:44:53 +01:00
Matteo Pagliazzi
e9fb7d0343 Merge pull request #2627 from Sinza-/subscriber
i18n(subscriber): replace subscriber hard-coded strings for env.t
2014-01-30 09:37:42 -08:00
Tyler Renelle
53917bc9f0 chore(cluster): remove all cluster code, just in case
`require('cluster')` is flagging issues, even if not in use. Revert this
in the near future when we can peg VersionError. @colegleason
2014-01-30 10:19:04 -07:00
Cole Gleason
a6d66f68ba Merge remote-tracking branch 'upstream/sabe/attributes' into develop 2014-01-30 11:10:09 -06:00
Sabe Jones
f6e12fa25e fix(allocateNow): Send empty object to user.ops per @colegleason suggestion
Tested with both implemented allocation modes, looks good!
2014-01-30 07:55:27 -06:00
Tyler Renelle
241d04140f fix(spells): temp workaround for spell & task being undefined. #2649 #2640 2014-01-29 21:37:59 -07:00
Matteo Pagliazzi
c93bc46908 refactor(bs3): use templates for modals 2014-01-29 22:18:13 +01:00
Matteo Pagliazzi
7354efc1d5 refactor(bs3): working register & prettier login modal 2014-01-29 21:28:11 +01:00