68ff26e6d6
v3: check that tasks are deleted when the user deletes the acocunt and misc fixes
2016-04-04 17:16:36 +02:00
1620614b3b
Merge branch 'TheHollidayInn-api-v3-ops-release-mounts' into api-v3
2016-04-04 11:49:17 +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
4083b1b045
Merge branch 'TheHollidayInn-api-v3-ops-release-both' into api-v3
2016-04-04 11:46:56 +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
c755cb5d26
Merge pull request #7003 from TheHollidayInn/api-v3-ops-release-pets
...
Ported release pets, added unit tests, added route with integration t…
2016-04-03 22:19:25 +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
d133fc08f2
Merge pull request #7004 from HabitRPG/api-v3-coupons
...
[Api v3] Coupons
2016-04-02 19:44:06 +02: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
3b98fe377f
Merge pull request #6999 from piousbox/shared-code-update-stats
...
Shared code update stats
2016-04-01 23:16:35 +02:00
7f3feedd12
shared-code-update-stats
2016-04-01 20:50:28 +00: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
e54bd0f364
Merge branch 'TheHollidayInn-api-v3-open-mystery-item3' into api-v3
2016-04-01 16:40:08 +02: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
ad0f1ee0f4
Merge branch 'TheHollidayInn-api-v3-ops-read-card' into api-v3
2016-04-01 16:30:59 +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
4b77dd171d
Merge branch 'TheHollidayInn-api-v3-hourglass-purchase2' into api-v3
2016-04-01 16:28:30 +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
41b3ee1df0
fix(world-boss): Correct generic Tavern text
2016-03-31 23:45:34 -05:00
a90562e3ad
Merge pull request #6992 from HabitRPG/sabrecat/spring-boss
...
Spring Fling 2016 World Boss
2016-03-31 21:51:10 -05:00
3281894d83
chore(news): World Boss Bailey
2016-03-31 19:54:13 -04:00
7aa668be4e
chore(gulp): compile sprites
2016-03-31 18:41:10 -05:00
a07aed331c
fix(world-boss): add chat message, Bailey handling, animation
2016-03-31 19:38:43 -04:00
def6b6cd5c
chore(gulp): compile sprites
2016-03-31 17:20:30 -05: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
7e9520b920
fix(test): make sure error is catched using done() callback
2016-03-30 23:32:12 +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
4fa8c6dfbd
chore(news): Bailey 2016-03-30
2016-03-30 15:39:12 -04: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
5c34f7586d
Merge pull request #6984 from lbraun/develop
...
Remove extra 'it' from spec description
2016-03-29 23:29:12 -04:00
ee9dc7c196
Remove extra 'it' from spec description
2016-03-29 22:11:36 -04:00
9a1e7a0ad7
Merge pull request #6981 from Alys/develop
...
cron timezone fix (stage 1): cron records current timezone in preferences.timezoneOffsetAtLastCron
2016-03-29 23:05:50 +10: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
Matteo Pagliazzi