8a42a3a51e
Merge branch 'develop' into api-v3
2016-04-08 21:31:41 -05:00
2bbae8c5f5
refactor: Simplify flag_report_email load
2016-04-08 17:14:14 -05:00
7e9163a17f
chore: Remove apdex check from new relic monitoring
2016-04-05 20:08:44 -05:00
74dace9b5a
chore: Re-enable New Relic
...
closes #7011
2016-04-05 20:08:31 -05:00
68ff26e6d6
v3: check that tasks are deleted when the user deletes the acocunt and misc fixes
2016-04-04 17:16:36 +02:00
c86898c7e4
Merge branch 'api-v3-ops-release-mounts' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-ops-release-mounts
2016-04-04 11:49:06 +02:00
66959c23f5
Merge branch 'api-v3-ops-release-both' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-ops-release-both
2016-04-04 11:46:46 +02:00
c916c74775
Ported release both, added unit tests, add release both route with integration tests
2016-04-03 14:44:00 -05:00
487a26ec43
Ported release pets, added unit tests, added route with integration tests
2016-04-03 14:37:20 -05:00
24b7b4c838
Ported release mounts, add unit tests, added release mounts route with integration tests
2016-04-03 14:34:43 -05:00
bb373ed93a
Splitting party and boss damage notifications into two code blocks.
...
Splitting the party and boss damage notifications into two code blocks will allow the page to push them to newlines if needed instead of added a scroll bar and making the user scroll to see the entire message.
Related issue: https://github.com/HabitRPG/habitrpg/issues/3453
2016-04-03 10:42:15 -07:00
de74fae0b4
v3: port coupons
2016-04-02 16:37:55 +02:00
731ac86244
port changes to cron develop
2016-04-02 12:15:24 +02:00
e95837f69f
Merge branch 'develop' into api-v3
2016-04-02 11:34:04 +02:00
0ba47de43d
adjust cron so that it prevents a double cron when timezone decreases (timezoneOffset increases)
...
* start to fix cron for when timezones change
* add some incomplete code
* change cron to identify when timezone changes and run only if both zones agree it should run - BAD - does cron an hour early one day later
* change timezone offset variable names
* improve handling of each individual timezone change possibility
* remove unnecessary casting to number
* remove duplicated code
* finish code for dangerous timezone change
* fix linting errors
* remove console.log lines and other testing code
* add a TODO comment for further actions for timezone changes in the "safe" direction
2016-04-02 11:42:15 +10:00
843dd09d35
Merge pull request #6986 from HabitRPG/api-v3-one-app
...
[Api v3] Consolidate server code and share middlewares where possible
2016-04-01 19:30:52 +02:00
6cbbdcdcbe
v3: port static pages, make routes lib more flexible, share middlewares between v2 and v3, port v1, simplify server.js
2016-04-01 19:07:03 +02:00
238dee7608
Merge pull request #6962 from piousbox/shared-code-user-score-task
...
shared-code-user-score-task
2016-04-01 18:28:55 +02:00
e6e2c26a12
shared-code-user-score-task
2016-04-01 16:11:37 +00:00
aae94bf1b4
Merge branch 'api-v3-open-mystery-item' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-open-mystery-item3
2016-04-01 16:39:52 +02:00
82afc1971d
Merge branch 'api-v3-ops-read-card' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-ops-read-card
2016-04-01 16:30:48 +02:00
7e093f1622
Merge branch 'api-v3-hourglass-purchase' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-hourglass-purchase2
2016-04-01 16:28:20 +02:00
519b3a1e4f
Merge pull request #6988 from TheHollidayInn/api-v3-ops-purchase
...
Ported purchase, add unit tests, created new user purchase route, and added tests
2016-04-01 16:20:33 +02:00
6d9617e345
Ported read card, added unit tests, added read card route and integration tests
2016-04-01 09:17:40 -05:00
3fe88fd8d0
Ported open mystery item, added unit tests, added route, and integration tests
2016-04-01 08:23:40 -05:00
ad0bc58028
Ported purchase, add unit tests, created new user purchase route, and added tests
2016-04-01 08:14:15 -05:00
dd12443166
Ported Hourglass Purchase, add unit tests. Created new hourglass purchase route and tests
2016-04-01 08:11:26 -05:00
c5f17b4011
Merge branch 'develop' into api-v3
2016-04-01 11:50:41 +02:00
f51653b7a5
WIP(world-boss): partial build
2016-03-31 17:29:21 -04:00
3089658cc7
Merge branch 'develop' into api-v3
2016-03-30 23:40:00 +02:00
d0383766e3
Merge pull request #6985 from HabitRPG/api-v3-update-user
...
[Api v3] update user
2016-03-30 23:16:28 +02:00
95fa91522a
Merge pull request #6955 from HabitRPG/wheelchair
...
Wheelchair
2016-03-30 14:25:12 -05:00
bf93275693
v3: port updateUser
2016-03-30 16:18:22 +02:00
ae9e6fbe30
allow cron to record user's current timezone offset in preferences.timezoneOffsetAtLastCron (initial stage of cron timezone fix for https://github.com/HabitRPG/habitrpg/issues/3806 )
2016-03-29 22:34:23 +10:00
a9d227b490
Merge branch 'develop' into wheelchair
2016-03-28 21:12:52 -05:00
02a60d90d8
Merge branch 'develop' into api-v3
2016-03-28 16:02:04 -05:00
f4b43f55f0
refactor: Remove express-csv dependency
2016-03-28 10:24:29 -05:00
cb5a79b1bf
chore: Set express session options
2016-03-28 10:24:01 -05:00
b1c3b8e7e7
chore: Update res.json(code, json) to res.status(code).json(json)
2016-03-28 10:24:00 -05:00
cf8153fd93
chore: Update res.send(code) to res.sendStatus(code)
2016-03-28 10:24:00 -05:00
2477507b2e
chore: Set extended option for bodyParser
...
See
https://github.com/expressjs/body-parser/blob/3f1b02247702c2966d33ee73610a98d54cf32fe8/lib/types/urlencoded.js#L41-L44
2016-03-28 10:24:00 -05:00
41b961004a
chore: upgrade express to version 4
2016-03-28 10:24:00 -05:00
1112d93b15
Merge pull request #6907 from HabitRPG/sabrecat/server-party-cheevos
...
[v3] Add Party Up / Party On achievements to server in V3
2016-03-27 20:53:15 +02:00
861a32f72a
feat(achievements): move party cheevos to server
2016-03-27 14:51:39 -04:00
c4bbfcf2f3
Merge pull request #6968 from HabitRPG/api-v3-buy-list
...
v3: port getBuyList and shared.updateStore
2016-03-26 16:39:52 +01:00
67d49bc9fc
v3: port getContent route caching responses to disk
2016-03-26 16:29:22 +01:00
3002c9b7fd
v3: port getBuyList and shared.updateStore
2016-03-26 16:25:15 +01:00
5ee33b08b9
Merge branch 'api-v3-get-user-anonymized' of https://github.com/piousbox/habitrpg into piousbox-api-v3-get-user-anonymized
2016-03-25 16:04:48 +01:00
d89d1e50dd
Merge branch 'develop' into api-v3
2016-03-25 15:58:04 +01:00
15e8f881fe
Merge branch 'api-v3-send-private-message' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-send-private-message
2016-03-25 15:56:28 +01:00
Blade Barringer