Commit Graph

13343 Commits

Author SHA1 Message Date
Matteo Pagliazzi a63d5ae97f v3: fix tags tests 2016-05-01 13:25:19 +02:00
Matteo Pagliazzi f5144fddaa v3 adapt v2: fix tags _id, stickyHeader and unlocking 2016-05-01 12:51:32 +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 f69a566178 Merge branch 'develop' into api-v3 2016-04-30 16:49:44 +02:00
Alys 590e185ecd fix spelling mistake: reseting to resetting 2016-04-29 18:44:49 -04:00
Sabe Jones 1787342951 chore(news): Last Chance Bailey 201604 2016-04-29 22:16:36 +00:00
Matteo Pagliazzi 3364019fcc v3 and adapted v2: bugs fixes for groups, challenges and tasks 2016-04-29 11:49:12 +02:00
Blade Barringer 2aa3a3175f Merge branch 'develop' into kelsin-develop 2016-04-27 19:11:56 -05:00
Matteo Pagliazzi f78bc2e6a8 v3 migration: barebone migration 2016-04-27 19:35:07 +02:00
Sabe Jones 7bc89aa55c fix(sprites): updateabee 2016-04-27 17:14:49 +00:00
Sabe Jones bf7ce46ea4 chore(news): Be-Wilder conclusion 2016-04-27 04:16:35 +00:00
Blade Barringer a326873935 chore: Add emoji lib back in
The 3rd party chat extension was breaking because this library was
missing. Remove this after the chat extension is updated

https://github.com/Horacious/HabitRPG-Chat-Extension/pull/40
2016-04-26 23:07:15 -05:00
Blade Barringer ebe3eefcc5 chore: reorganize quest sprites 2016-04-26 21:13:06 -05:00
Sabe Jones 0d4532c12e fix(elastic-beanstalk): extend connection timeout for ELB 2016-04-26 19:09:36 +00:00
Blade Barringer ee3aa056f9 feat: Add eb extension to increase deploy timeout to 30 minutes (#7049) 2016-04-26 14:07:28 -05:00
Blade Barringer f415810a0f Merge branch 'markdown_rework' into develop 2016-04-26 12:53:47 -05:00
Blade Barringer b5de787c4d refactor: Remove uneeded emoji images 2016-04-26 12:53:18 -05:00
Blade Barringer e88d0ff450 feat: switch to version number for habitica-markdown 2016-04-26 12:52:59 -05:00
Blade Barringer 4f1a4393e1 fix: Adjust spacing of emoji in tags 2016-04-26 12:50:37 -05:00
Blade Barringer e7315253dd feat: Switch out js-emoji for habtiica-markdown 2016-04-26 08:19:47 -05:00
Sabe Jones d96b13ed43 chore(news): Floral Potions Bailey 2016-04-25 21:20:21 +00: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 d6ea0a3b40 v3: fix setting challenge.official 2016-04-25 14:34:59 +02:00
Matteo Pagliazzi 5b217ec3db v3: fix setting challenge.official 2016-04-25 14:21:00 +02:00
Matteo Pagliazzi 6cad3616f3 v3: define migration spec (add files) 2016-04-25 13:53:42 +02:00
Matteo Pagliazzi 12b05b9492 v3: define migration spec and misc fixes 2016-04-25 13:51:08 +02:00
Matteo Pagliazzi b6f79aff0b Merge branch 'api-v3' of github.com:HabitRPG/habitrpg into api-v3 2016-04-24 15:08:54 +02:00
Matteo Pagliazzi 6197fcea3b Merge branch 'develop' into api-v3 2016-04-24 15:08:13 +02:00
Matteo Pagliazzi c78c3b9fd8 v3: first iteration of users migration 2016-04-24 15:07:45 +02:00
Keith Holliday 050539d8f3 Added tests for cron (#7081)
* Added inital cron tests

* Added more subscribe tests and updated various tests for syntax and expectations
2016-04-24 00:54:50 +02:00
Matteo Pagliazzi c608d03e35 v3: start writing migrations 2016-04-23 15:00:55 +02:00
Sabe Jones 8355dbe63f chore(news): Bewildered Bailey 2016-04-23 04:00:30 +00:00
Matteo Pagliazzi 7dab7939cc v3: fix tavern during tests 2016-04-23 03:33:00 +02:00
Matteo Pagliazzi c5aa15cf47 v3: fix ability to join public guild you were already a member of 2016-04-23 03:08:03 +02:00
Matteo Pagliazzi 2d87cb0d87 Merge branch 'develop' into api-v3 2016-04-22 17:43:48 +02:00
Matteo Pagliazzi 91314a497c Merge branch 'api-v3-unlock-fix' into api-v3 2016-04-22 12:33:55 +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 2cdb30bd5b fix(NR): remove metric check that crashed 2016-04-21 22:47:04 +00: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
Sabe Jones 43f8e943f6 Merge pull request #7097 from vIiRuS/patch-7
Fix timezone issue with iOS app
2016-04-21 12:54:44 -05:00
Phillip Thelen a5fbc08016 Set timezoneOffset to 0 as default
Fixes an issue with the iOS app not setting the offset, when no initial value exists.
2016-04-21 19:41:39 +02:00
Blade Barringer 5c1d86c513 Merge branch 'develop' into MathWhiz-mount-images 2016-04-21 07:52:21 -05:00
mathwhiz 45bc69308c mounts 2016-04-20 23:52:26 +00: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
Alys 823f51e727 revert npm 3 to npm 2 for vagrant installs; adjust instructions so novice users don't try to run commands before doing 'vagrant ssh' 2016-04-20 09:25:05 +10:00
Sabe Jones cdf4a384d6 fix(sprites): add Bee mount icon 2016-04-19 21:07:03 +00:00
Keith Holliday 9e3d8ba4ac Separated out buy functions into buyGear, buyArmoire, and buyPotion (#7065) 2016-04-19 16:50:04 +02:00