Commit Graph

754 Commits

Author SHA1 Message Date
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
Matteo Pagliazzi 52bedc3563 v3 client: fix casting spells 2016-05-15 21:17:17 +02:00
Matteo Pagliazzi cb0939a38c v3 client: fix filtering by tag and correctly show tag tooltip 2016-05-15 12:31:27 +02:00
Blade Barringer e654b47537 Merge branch 'Alys-api-v3-cron-comments-etc' into api-v3 2016-05-14 09:21:55 -05: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
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 e19130bd8c fix typo custsomerId -> customerId 2016-05-08 15:50:38 +02: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 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
Matteo Pagliazzi f5144fddaa v3 adapt v2: fix tags _id, stickyHeader and unlocking 2016-05-01 12:51:32 +02:00
Matteo Pagliazzi 115c5374cb Merge branch 'api-v3' into api-v3-client 2016-04-30 19:28:16 +02:00
Matteo Pagliazzi 6380161321 Api v3 Migration (WIP) (#7131)
* v3 migration: remove old code and polish user migration

* v3 migration: start to work on challenges

* wip v3 migration

* wip v3 migration: fix _id -> id for reminders, tags and checklists
2016-04-30 18:34:16 +02:00
Matteo Pagliazzi 3437744f62 Merge branch 'api-v3' into api-v3-client 2016-04-30 16:51:15 +02:00
Matteo Pagliazzi f69a566178 Merge branch 'develop' into api-v3 2016-04-30 16:49:44 +02:00
Matteo Pagliazzi 3364019fcc v3 and adapted v2: bugs fixes for groups, challenges and tasks 2016-04-29 11:49:12 +02:00
Sabe Jones 7bc89aa55c fix(sprites): updateabee 2016-04-27 17:14:49 +00:00
Blade Barringer f415810a0f Merge branch 'markdown_rework' into develop 2016-04-26 12:53:47 -05:00
Blade Barringer e7315253dd feat: Switch out js-emoji for habtiica-markdown 2016-04-26 08:19:47 -05:00
Keith Holliday ea490c9a1f Ported groups service to user new api v3 and ported dependent controllers (#7108)
* Ported groups service to user new api v3 and ported dependent controllers

* Remove  and extra remove inviation code. Fixed group service caching and update group service tests

* Fixed test logic and added party cache support

* Added promise rejections and updated http interceptor
2016-04-25 23:11:23 +02:00
Sabe Jones 974896ce7b feat(events): April Mystery and Floral Potions (#7107)
* feat(events): April Mystery and Floral Potions
Also reorganizes the spritesmith folders for mounts so that head, body, and icon sprites are in separate folders.
2016-04-25 14:17:31 -05:00
Blade Barringer b86348dd0e refactor: Remove MOBILE_APP logic 2016-04-25 07:44:05 -05:00
Blade Barringer ad57dedecb refactor: Swap out remarkable for habitica flavored markdown-it 2016-04-25 07:36:02 -05:00
Matteo Pagliazzi 2d87cb0d87 Merge branch 'develop' into api-v3 2016-04-22 17:43:48 +02:00
Matteo Pagliazzi 6ba1afe479 Merge branch 'api-v3' into api-v3-unlock-fix 2016-04-22 12:33:39 +02:00
Matteo Pagliazzi 1fe2220aa1 v3: improve docs and fix bugs 2016-04-22 12:15:24 +02:00
Sabe Jones 867146dc19 fix(xss): Update site to use remarkable instead of marked
https://snyk.io/vuln/npm%3Amarked%3A20150520
https://github.com/chjj/marked/pull/592
2016-04-21 13:23:53 -05:00
Matteo Pagliazzi 6568fcfd5e res.respond: allow for thrid parameter (message), refactor shared ops responses and adapt tests 2016-04-21 00:52:03 +02:00
Keith Holliday 9e3d8ba4ac Separated out buy functions into buyGear, buyArmoire, and buyPotion (#7065) 2016-04-19 16:50:04 +02:00
Matteo Pagliazzi f44dbbbd71 Merge branch 'develop' into api-v3 2016-04-19 12:16:22 +02:00
Matteo Pagliazzi 2dd633a471 better organize common/index 2016-04-19 12:11:10 +02:00
Matteo Pagliazzi 7aa6587f2f Merge branch 'shared-code-random-drop' of https://github.com/piousbox/habitrpg into piousbox-shared-code-random-drop2 2016-04-19 12:07:18 +02:00
Sabe Jones 62f44771af fix(stable): rename Bumblebees throughout code 2016-04-18 21:02:24 +00:00
Matteo Pagliazzi dea693f799 v3: start to fix unlocking 2016-04-16 20:51:16 +02:00
Victor Pudeyev 715bb5e047 shared-code-statsComputed (#7067)
* shared-code-statsComputed

* \$w is in common/script/index.js
2016-04-16 19:24:13 +02:00
Blade Barringer 887aa478ec chore: merge in develop 2016-04-15 10:11:54 -05:00
Blade Barringer 10936d9a4d chore: Switch to custom eslint-config 2016-04-15 09:03:59 -05:00