krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 15:17:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
13,156 Commits 64 Branches 1,225 Tags
116839ca81a8ec3a49ae5cc7cb2881e4dbd6c20c
Commit Graph

675 Commits

Author SHA1 Message Date
Victor Piousbox
9704c47293 Merge branch 'api-v3' into shared-code-webhooks 2016-04-07 21:23:38 +00:00
Victor Piousbox
4c0f9ed1c8 resolving conflicts 2016-04-07 21:23:16 +00:00
Keith Holliday
fec9ce3dbe Ported rebirth. Add unit tests. Added rebirth route. Added integration tests 2016-04-07 15:02:55 -05:00
Matteo Pagliazzi
81d665513c Merge branch 'api-v3-ops-revive' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-ops-revive 2016-04-06 23:24:14 +02:00
Keith Holliday
621bf9609e Ported revive. Added unit tests. Add revive route. Added integration tests 2016-04-06 15:59:42 -05:00
Keith Holliday
2bd710a882 Ported unlock. Add unit tests. Create unlock route. Add integration tests 2016-04-06 15:53:32 -05:00
Keith Holliday
05b41bb41c Ported sell function. Add unit tests. Create sell route. Add integration tests 2016-04-06 08:27:18 -05:00
Victor Piousbox
14b0ec8b03 shared-code-webhooks 2016-04-04 16:31:48 +00:00
Matteo Pagliazzi
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
Matteo Pagliazzi
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
Keith Holliday
c916c74775 Ported release both, added unit tests, add release both route with integration tests 2016-04-03 14:44:00 -05:00
Keith Holliday
487a26ec43 Ported release pets, added unit tests, added route with integration tests 2016-04-03 14:37:20 -05:00
Keith Holliday
24b7b4c838 Ported release mounts, add unit tests, added release mounts route with integration tests 2016-04-03 14:34:43 -05:00
Matteo Pagliazzi
e95837f69f Merge branch 'develop' into api-v3 2016-04-02 11:34:04 +02:00
Alys
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
Victor Piousbox
7f3feedd12 shared-code-update-stats 2016-04-01 20:50:28 +00:00
Matteo Pagliazzi
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
Victor Piousbox
e6e2c26a12 shared-code-user-score-task 2016-04-01 16:11:37 +00:00
Matteo Pagliazzi
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
Matteo Pagliazzi
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
Matteo Pagliazzi
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
Matteo Pagliazzi
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
Keith Holliday
6d9617e345 Ported read card, added unit tests, added read card route and integration tests 2016-04-01 09:17:40 -05:00
Keith Holliday
3fe88fd8d0 Ported open mystery item, added unit tests, added route, and integration tests 2016-04-01 08:23:40 -05:00
Keith Holliday
ad0bc58028 Ported purchase, add unit tests, created new user purchase route, and added tests 2016-04-01 08:14:15 -05:00
Keith Holliday
dd12443166 Ported Hourglass Purchase, add unit tests. Created new hourglass purchase route and tests 2016-04-01 08:11:26 -05:00
Matteo Pagliazzi
c5f17b4011 Merge branch 'develop' into api-v3 2016-04-01 11:50:41 +02:00
Sabe Jones
a07aed331c fix(world-boss): add chat message, Bailey handling, animation 2016-03-31 19:38:43 -04:00
Sabe Jones
f51653b7a5 WIP(world-boss): partial build 2016-03-31 17:29:21 -04:00
Matteo Pagliazzi
3089658cc7 Merge branch 'develop' into api-v3 2016-03-30 23:40:00 +02:00
Sabe Jones
95fa91522a Merge pull request #6955 from HabitRPG/wheelchair 
Wheelchair
 2016-03-30 14:25:12 -05:00
Alys
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
Blade Barringer
a9d227b490 Merge branch 'develop' into wheelchair 2016-03-28 21:12:52 -05:00
Matteo Pagliazzi
3002c9b7fd v3: port getBuyList and shared.updateStore 2016-03-26 16:25:15 +01:00
Matteo Pagliazzi
d89d1e50dd Merge branch 'develop' into api-v3 2016-03-25 15:58:04 +01:00
Keith Holliday
d7b6e0b760 Ported refPush and added tests 2016-03-25 08:33:55 -05:00
Matteo Pagliazzi
192409a0b5 Merge branch 'api-v3' into api-v3-equip-feed-hatch2 2016-03-25 12:22:55 +01:00
Matteo Pagliazzi
0a65e6a6f1 v3: port hatch, equip and feed ops 2016-03-24 18:59:09 +01:00
Matteo Pagliazzi
159b9eaa8d port disable classes and change class ops 2016-03-24 14:25:30 +01:00
Nick Bunn
0f9cf57613 feat: Add wheelchair to avatar customization 2016-03-24 07:57:13 -05:00
Sabe Jones
be159adf77 fix(event): pastel skin, not hair 2016-03-23 15:36:24 -04:00
Sabe Jones
1286b6fbee fix(event): make spring hair/skin available server side 2016-03-23 15:36:24 -04:00
Sabe Jones
f7027b5cf3 feat(event): subscriber items 2016-03 2016-03-23 15:36:24 -04:00
Matteo Pagliazzi
0bde9e2df2 Merge branch 'develop' into api-v3 2016-03-21 23:03:28 +01:00
Matteo Pagliazzi
f04d8d4d97 do not remove ops/fns from common/script/index.js until they have been ported everywhere 2016-03-21 22:50:18 +01:00
Matteo Pagliazzi
bd3c162b97 port allocateNow and autoAllocate 2016-03-20 20:21:15 +01:00
Matteo Pagliazzi
480194f53c add routes for buy ops and integration tests 2016-03-20 17:41:17 +01:00
Matteo Pagliazzi
fea2e0d8c0 correctly stub methods and test errors 2016-03-20 16:06:31 +01:00
Matteo Pagliazzi
657f19af0d add tests for shared.ops.buySpecialSpell and partially fix shared.ops.buy 2016-03-20 13:46:56 +01:00
Matteo Pagliazzi
2560096466 port buyQuest tests 2016-03-20 13:33:34 +01:00