Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,124 Commits 64 Branches 1,256 Tags
6cbbdcdcbeb322e606c1c4de82812e5349ea9552
Commit Graph

1623 Commits

Author SHA1 Message Date
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 41b3ee1df0 fix(world-boss): Correct generic Tavern text 2016-03-31 23:45:34 -05:00
Sabe Jones 7aa668be4e chore(gulp): compile sprites 2016-03-31 18:41:10 -05:00
Sabe Jones a07aed331c fix(world-boss): add chat message, Bailey handling, animation 2016-03-31 19:38:43 -04:00
Sabe Jones def6b6cd5c chore(gulp): compile sprites 2016-03-31 17:20:30 -05: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
Matteo Pagliazzi d0383766e3 Merge pull request #6985 from HabitRPG/api-v3-update-user 
[Api v3] update user
 2016-03-30 23:16:28 +02:00
Sabe Jones 95fa91522a Merge pull request #6955 from HabitRPG/wheelchair 
Wheelchair
 2016-03-30 14:25:12 -05:00
Matteo Pagliazzi bf93275693 v3: port updateUser 2016-03-30 16:18:22 +02: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
Blade Barringer 02a60d90d8 Merge branch 'develop' into api-v3 2016-03-28 16:02:04 -05:00
Blade Barringer 6552f04b0c chore(i18n): update locales 2016-03-28 09:58:32 -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
Matteo Pagliazzi 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
Keith Holliday d7b6e0b760 Ported refPush and added tests 2016-03-25 08:33:55 -05:00
Keith Holliday 19a63e8128 Ported sendGift route and renamed it to transferGems. Refactored user.sendMessage logic. 2016-03-25 08:33:54 -05:00
Keith Holliday 95ea73d440 Fixed route namespace and added translation strings 2016-03-25 08:33:54 -05:00
Keith Holliday e9a9079c46 Ported sendPrivateMessage route and added initial tests 2016-03-25 08:33:54 -05:00
Keith Holliday 7f65707ee4 Ported user delete route and added initial tests 2016-03-25 08:32:49 -05:00
Matteo Pagliazzi 192409a0b5 Merge branch 'api-v3' into api-v3-equip-feed-hatch2 2016-03-25 12:22:55 +01:00
Blade Barringer cd6adf2421 fix: correct wheelchair spelling 2016-03-24 21:31:20 -05: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
Blade Barringer 2d55a2a31d chore: compile sprites 2016-03-24 07:57:57 -05:00
Blade Barringer c88f2ce580 refactor: Use resized version of wheelchair for selection 2016-03-24 07:57:57 -05: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
Blade Barringer 9b9722a7b4 chore(i18n): update locales 2016-03-22 17:40:42 -05:00
Bleu 521195ab95 fix: Unify html in translation strings 
Closes #6859
 2016-03-22 17:34:29 -05:00
Blade Barringer 92ac703ecc chore(i18n): update locales 2016-03-22 08:31:14 -05:00
Matteo Pagliazzi 0bde9e2df2 Merge branch 'develop' into api-v3 2016-03-21 23:03:28 +01:00
Matteo Pagliazzi d8dab49b79 Merge pull request #6898 from HabitRPG/api-v3-buy-ops 
[v3] Port several shared ops and their linked fns
 2016-03-21 23:00:43 +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
Victor Piousbox b555930e9e invalid login credentials fixes 2016-03-21 21:27:11 +00: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