e7315253dd
feat: Switch out js-emoji for habtiica-markdown
2016-04-26 08:19:47 -05:00
d96b13ed43
chore(news): Floral Potions Bailey
2016-04-25 21:20:21 +00:00
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
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
b86348dd0e
refactor: Remove MOBILE_APP logic
2016-04-25 07:44:05 -05:00
ad57dedecb
refactor: Swap out remarkable for habitica flavored markdown-it
2016-04-25 07:36:02 -05:00
d6ea0a3b40
v3: fix setting challenge.official
2016-04-25 14:34:59 +02:00
5b217ec3db
v3: fix setting challenge.official
2016-04-25 14:21:00 +02:00
6cad3616f3
v3: define migration spec (add files)
2016-04-25 13:53:42 +02:00
12b05b9492
v3: define migration spec and misc fixes
2016-04-25 13:51:08 +02:00
f2d5c921ed
Merge branch 'api-v3' into api-v3-client
2016-04-24 15:09:10 +02:00
b6f79aff0b
Merge branch 'api-v3' of github.com:HabitRPG/habitrpg into api-v3
2016-04-24 15:08:54 +02:00
6197fcea3b
Merge branch 'develop' into api-v3
2016-04-24 15:08:13 +02:00
c78c3b9fd8
v3: first iteration of users migration
2016-04-24 15:07:45 +02:00
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
c608d03e35
v3: start writing migrations
2016-04-23 15:00:55 +02:00
8355dbe63f
chore(news): Bewildered Bailey
2016-04-23 04:00:30 +00:00
537facd118
Merge branch 'api-v3' into api-v3-client
2016-04-23 03:33:32 +02:00
7dab7939cc
v3: fix tavern during tests
2016-04-23 03:33:00 +02:00
4cda56e3eb
Merge branch 'api-v3' into api-v3-client
2016-04-23 03:08:37 +02:00
c5aa15cf47
v3: fix ability to join public guild you were already a member of
2016-04-23 03:08:03 +02:00
2d87cb0d87
Merge branch 'develop' into api-v3
2016-04-22 17:43:48 +02:00
91314a497c
Merge branch 'api-v3-unlock-fix' into api-v3
2016-04-22 12:33:55 +02:00
6ba1afe479
Merge branch 'api-v3' into api-v3-unlock-fix
2016-04-22 12:33:39 +02:00
1fe2220aa1
v3: improve docs and fix bugs
2016-04-22 12:15:24 +02:00
2cdb30bd5b
fix(NR): remove metric check that crashed
2016-04-21 22:47:04 +00:00
73e4c719b2
Merge pull request #7096 from piousbox/v3-payments-5
...
V3 payments 5
2016-04-21 14:45:41 -05:00
578e28b6b6
Merge pull request #7095 from piousbox/v3-payments-4
...
V3 payments 4
2016-04-21 14:42:58 -05:00
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
43f8e943f6
Merge pull request #7097 from vIiRuS/patch-7
...
Fix timezone issue with iOS app
2016-04-21 12:54:44 -05:00
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
5c1d86c513
Merge branch 'develop' into MathWhiz-mount-images
2016-04-21 07:52:21 -05:00
cbf1a4c8d3
breaking changes promisifying amazon payments
2016-04-21 04:37:25 +00:00
54a94db2de
working on amazon payments
2016-04-21 03:52:29 +00:00
612e3b725f
little changes to lint
2016-04-21 00:25:43 +00:00
f9915c3f77
recovering last weeks work on promisifying amazon payments
2016-04-21 00:07:58 +00:00
45bc69308c
mounts
2016-04-20 23:52:26 +00:00
6568fcfd5e
res.respond: allow for thrid parameter (message), refactor shared ops responses and adapt tests
2016-04-21 00:52:03 +02:00
62b059d4d8
little changes, no console.log
2016-04-20 22:27:37 +00:00
3cba6d934b
resolving conflicts
2016-04-20 22:04:31 +00:00
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
cdf4a384d6
fix(sprites): add Bee mount icon
2016-04-19 21:07:03 +00:00
9e3d8ba4ac
Separated out buy functions into buyGear, buyArmoire, and buyPotion ( #7065 )
2016-04-19 16:50:04 +02:00
4138eab155
v3: undo changes to client that were necessary to test v2
2016-04-19 12:16:39 +02:00
f44dbbbd71
Merge branch 'develop' into api-v3
2016-04-19 12:16:22 +02:00
2dd633a471
better organize common/index
2016-04-19 12:11:10 +02:00
ad77922cf0
Merge branch 'piousbox-shared-code-random-drop2' into api-v3
2016-04-19 12:07:31 +02:00
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
ea9900d27f
Fix installation of test dependencies in vagrant provisioning ( #7069 )
...
* Fix #7054 installation test dependencies in vagrant provisioning
* Fix small typo in output during vagrant provisioning
2016-04-19 17:28:17 +10:00
5d040ac442
change habitrpg.com to habitica.com in new profile edit message
2016-04-19 10:39:04 +10:00
Blade Barringer