krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-19 15:48:04 +01:00
Code Issues Packages Projects Releases Wiki Activity
13,343 Commits 64 Branches 1,226 Tags
a63d5ae97ff8ff58151bbcf2b51aef151e5aa4f5
Commit Graph

1708 Commits

Author SHA1 Message Date
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
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
Matteo Pagliazzi
ad8834f4ed port tests for shared.ops.buyMysterySet.js 2016-03-20 13:12:06 +01:00
Matteo Pagliazzi
71f304786c add pickDeep utility function to pick nested properties from objects 2016-03-20 13:07:14 +01:00
Victor Piousbox
6d972ea9af resolving conflicts 2016-03-20 02:53:58 +00:00
Victor Piousbox
d2c1c2cec6 cleanup and moving text strings to a locale object 2016-03-19 17:37:08 +00:00
Matteo Pagliazzi
957e1d26d6 add tests for fns/ultimateGear, fns/handleTwoHanded, fns/randomVal, fns/predictableRandom and partial tests for ops/buy 2016-03-19 18:05:02 +01:00
Matteo Pagliazzi
ff72706cae wip(shared): port buy ops and linked fns 2016-03-19 16:04:27 +01:00
Kaitlin Hipkin
9f0704aa94 modal explaining new class gear is now class-agnostic 2016-03-18 23:23:12 -04:00
Sabe Jones
8447259016 Merge pull request #6921 from HabitRPG/sabrecat/spring-2016 
Spring Fling 2016
 2016-03-18 16:08:46 -05:00
Sabe Jones
b5f91a657f feat(event): Spring Fling complete 2016-03-18 16:56:16 -04:00
Blade Barringer
cd6ab23106 Merge pull request #6900 from doyler/develop 
Note about weekly progress update (fixes #6884)
 2016-03-18 07:37:32 -05:00
Victor Piousbox
4655e5061a api-v3 password reset 2016-03-17 14:47:22 -07:00
Sabe Jones
10a8476aaf WIP(event): Spring Fling cont'd 2016-03-17 13:10:05 -04:00
Sabe Jones
4effa79e17 WIP(event): Spring Fling partial 2016-03-17 13:04:12 -04:00