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

1771 Commits

Author SHA1 Message Date
Alys dad60909f7 move locales strings from api-v3.json to other locales files (#7347) 
* move locales strings from api-v3.json: authentication strings -> front.json

* move locales strings from api-v3.json: authentication strings -> tasks.json

* move locales strings from api-v3.json: authentication strings -> groups.json

* move locales strings from api-v3.json: authentication strings -> challenge.json

* move locales strings from api-v3.json: authentication strings -> groups.json (again)

* move locales strings from api-v3.json: authentication strings -> quests.json

* move locales strings from api-v3.json: authentication strings -> subscriber.json

* move locales strings from api-v3.json: authentication strings -> spells.json

* move locales strings from api-v3.json: authentication strings -> character.json

* move locales strings from api-v3.json: authentication strings -> groups.json (PMs)

* move locales strings from api-v3.json: authentication strings -> npc.json

* move locales strings from api-v3.json: authentication strings -> pets.json

* move locales strings from api-v3.json: authentication strings -> miscellaneous

* move locales strings from api-v3.json: authentication strings -> contrib.json and settings.json

* move locales strings from api-v3.json: delete unused string (invalidTasksOwner), delete api-v3.json, whitespace cleanup
 2016-05-18 16:56:05 +02:00
Matteo Pagliazzi d1f9e9e7ca v3: update footer with links to developer resources 2016-05-18 16:06:05 +02:00
Matteo Pagliazzi 034e464bf2 Merge branch 'api-v3' of github.com:HabitRPG/habitrpg into api-v3 2016-05-18 15:30:46 +02:00
Matteo Pagliazzi 7ea581bb38 v3 client: fix predicatbale random 2016-05-18 15:30:23 +02:00
Matteo Pagliazzi 210ac57165 v3: misc fixes 2016-05-18 12:16:31 +02:00
Blade Barringer 4f1d738272 fix: Provide default history [] for habit in score route 2016-05-17 15:51:31 -05:00
Blade Barringer 7ac67315e6 Merge branch 'develop' into api-v3 2016-05-17 15:50:31 -05:00
Matteo Pagliazzi a0f8b715aa v3: move TAVERN_ID to common code 2016-05-17 22:49:31 +02:00
Matteo Pagliazzi 2064db364f v3 client: more user friendly errors 2016-05-17 19:22:35 +02:00
Matteo Pagliazzi a757df9f5b v3: fix notifications 2016-05-17 19:12:39 +02:00
Matteo Pagliazzi d293b2d6ee v3 client: fix ability to send cards 2016-05-17 17:35:49 +02:00
Alys 1cf2c89171 adjust locales text, key names, and files for Rebirth, Reset, and Fortify / ReRoll for consistency with existing strings (#7321) 2016-05-17 15:48:58 +02:00
Sabe Jones beb4a0d8bb feat(content): May 2016 pet quest (#7310) 2016-05-16 15:18:51 -05:00
Alys daa0955ac1 rename buyPotion and buy-potion to buyHealthPotion and buy-health-potion; fix apidoc param error 2016-05-16 23:15:01 +10:00
Matteo Pagliazzi ad03cc8f9a Merge branch 'api-v3' of github.com:HabitRPG/habitrpg into api-v3 2016-05-16 12:55:14 +02:00
Matteo Pagliazzi 4d08fde068 v3: fix auto allocation 2016-05-16 12:17:26 +02:00
Matteo Pagliazzi 793ca3b172 v3: fix tasks saving and selection for rebirth reroll and reset (server-only) 2016-05-16 12:04:09 +02:00
Matteo Pagliazzi ba1628427e v3: fix stealth casting 2016-05-16 11:38:22 +02:00
Blade Barringer 21203c3f2e feat: Add modify inventory debug menu 2016-05-15 16:07:30 -05:00
Matteo Pagliazzi 52bedc3563 v3 client: fix casting spells 2016-05-15 21:17:17 +02:00
Matteo Pagliazzi 0be5d1da9c v3: misc fixes 2016-05-15 15:10:41 +02:00
Matteo Pagliazzi cb0939a38c v3 client: fix filtering by tag and correctly show tag tooltip 2016-05-15 12:31:27 +02:00
Sabe Jones 6ceea9346f chore(news): misc announcements 2016-05-14 20:56:22 +00:00
Blade Barringer c534f31593 Merge pull request #7226 from Alys/api-v3-pubChalsMinPrize-rename 
[API v3] rename and reword pubChalsMinPrize to reflect that it's only for the Tavern
 2016-05-14 10:19:43 -05:00
Blade Barringer e654b47537 Merge branch 'Alys-api-v3-cron-comments-etc' into api-v3 2016-05-14 09:21:55 -05:00
Blade Barringer 3e57620666 fix: Set gems sent notification as translatable string 2016-05-14 06:54:44 -05:00
Alys 2e078f4776 allows players to send gems to each other; other minor related changes - fixes https://github.com/HabitRPG/habitrpg/issues/7227 2016-05-14 05:58:40 -04:00
Alys fd13c7aa60 rename and reword pubChalsMinPrize to reflect that it's only for Tavern challenges 2016-05-14 16:40:40 +10:00
Alys 6acaef50e6 minor improvements to cron code for clarity; fix inaccurate comments; add TODOs for rest-in-inn actions 2016-05-14 13:26:26 +10:00
Blade Barringer 0a8b8236c1 fix: Correct checklist on client 
Closes #7207
 2016-05-13 22:05:00 -05:00
Matteo Pagliazzi 199732539f chore(): rename website/src -> website/server and website/public -> website/client (#7199) 2016-05-13 15:35:12 +02:00
Blade Barringer de1f2c2788 fix: Only apply captureStackTrace if it exists on the error object 2016-05-12 18:57:49 -05:00
Sabe Jones 0eb7bc537d fix(contact): add clear subscription trouble email 2016-05-11 18:43:59 +00:00
Matteo Pagliazzi 998c679e96 Merge branch 'api-v3' into api-v3-client 2016-05-11 16:01:54 +02:00
Matteo Pagliazzi a947afa5c6 Merge branch 'develop' into api-v3 2016-05-11 14:36:58 +02:00
Sabe Jones 7f11e766c3 Sabrecat/glasses chairs (#7182) 
* feat(customization): new chairs, eyeglass sprites

* feat(avatar): finish glasses implementation

* fix(test): include glasses in base equipment
 2016-05-10 16:07:46 -05:00
Keith Holliday 632a1ebbf3 Fixed linting and some tests 2016-05-10 15:15:55 -05:00
Keith Holliday a0939155c9 Updated login headers save. Added task service to user service. Sync user tasks 2016-05-10 15:15:55 -05:00
Keith Holliday a92359e119 Moved markPMSRead to common.ops. Added tests 2016-05-10 15:15:55 -05:00
Keith Holliday c88cae4ddb Added mark pms read route. Fixed error checking and extra code. 2016-05-10 15:15:55 -05:00
Keith Holliday b037ddd14c Ported User Serivce to client side and to api v3 2016-05-10 15:15:55 -05:00
Matteo Pagliazzi b3a78fba97 v3 payments: fix tests 2016-05-10 18:14:28 +02:00
Matteo Pagliazzi e980b3ce0a Merge branch 'api-v3' into sabrecat/v3-payments 2016-05-08 19:19:20 +02:00
Matteo Pagliazzi e19130bd8c fix typo custsomerId -> customerId 2016-05-08 15:50:38 +02:00
Sphinx 7bfd9b0fd9 shieldSpecialSpring2015RogueNotes typo (#7144) 2016-05-05 19:55:02 +10:00
Sabe Jones d5b3bbfaad Sabrecat/armoire 201605 (#7142) 
* feat(content): May BGs and Armoire

* chore(news): Bailey 20160503
 2016-05-03 15:20:00 -05:00
Sabe Jones 166a37d53f chore(event): end Spring Fling 2016 2016-05-02 01:36:03 +00:00
Matteo Pagliazzi 72f4bd0aab Merge branch 'api-v3' into sabrecat/v3-payments 2016-05-02 00:26:02 +02:00
Matteo Pagliazzi 01c07ae6df Merge branch 'api-v3' into api-v3-client 2016-05-02 00:25:25 +02:00
Matteo Pagliazzi a0e63c0eb2 use uuid module for uuids 2016-05-01 15:01:00 +02:00