632faafa4f
fix(quests): Refactoring
...
Based on feedback from @crookedneighbor and @gisikw. Removes double ternary in the block that normalizes the item type string, and reverts the notification logic to if/else if format instead of switch/case. Also removes a block of commented-out code once used for death notifications.
2015-07-20 14:17:35 -05:00
3f8a4a0957
fix(quests): Remove controller instantiation
2015-07-16 16:35:21 -05:00
ffc441ab82
feat(quests): Improve drop notif
2015-07-16 16:22:49 -05:00
2407c9eeb8
feat(quests): Improve buy confirm dialog
2015-07-16 12:56:26 -05:00
668a8bb6f6
chore(i18n): update locales
2015-07-16 12:04:10 -05:00
73a1c7c596
fix(style): Remove extra class
2015-07-16 11:29:04 -05:00
e25819f6de
feat(party): Conclude invite experiment
2015-07-16 11:22:19 -05:00
695c793f6e
Merge pull request #5632 from HabitRPG/paglias/amazon-payments
...
Amazon Payments: implement one time purchases
2015-07-16 13:24:42 +02:00
239f7c9c95
change message on Armoire when it is empty to say that new gear arrives in the first week of the month
2015-07-16 12:56:28 +10:00
c15f2b1f80
Merge branch 'sabrecat/quests-page' into develop
2015-07-15 14:12:05 -05:00
4a54363966
fix(quests): Show info modal for Gold quests
2015-07-15 14:02:49 -05:00
e0bfd60eb1
amazon payments: switch to green button
2015-07-15 20:07:17 +02:00
ecc98411c7
refactor amazon payments and add one time purchases once again
2015-07-15 20:07:17 +02:00
bade139b4b
wip amazon payments donation
2015-07-15 20:07:17 +02:00
de32461787
feat(amazon-payments): WIP add donations
2015-07-15 20:07:17 +02:00
8a97b597f5
Resize sea foam image
...
Fixes #5609
2015-07-15 07:53:12 -05:00
3e1f1f191d
Merge pull request #5619 from gisikw/habitica-console
...
Add a 'gulp console' method which preloads Mongo, models
2015-07-15 06:58:04 -05:00
38ac664284
chore(i18n): update locales
2015-07-15 13:17:57 +02:00
d8e7108098
moved twoHanded:true out of bracketed region in rancherLasso - it was causing "Error processing the string"
2015-07-15 14:56:57 +10:00
9ccab259b0
add message to Inventory/Market (drops) page to explain where quests have gone
2015-07-15 13:29:03 +10:00
9645f08769
Add a 'gulp console' method which preloads Mongo, models, and sets up utility methods
2015-07-14 23:22:02 -04:00
0bc5db4885
Merge branch 'aedotj-patch-1' into develop
2015-07-14 21:10:05 -05:00
3437975ba3
Change order of quests
2015-07-14 19:44:55 -05:00
e5a740a74f
Adjust spacing
2015-07-14 19:32:45 -05:00
32a74471db
Merge branch 'sabrecat/quests-page' into develop
2015-07-14 18:56:32 -05:00
435d33724b
Set test to listen on rootScope.openModal
2015-07-14 18:32:50 -05:00
1adb3c479b
Merge branch 'blurbs' into develop
2015-07-14 18:21:37 -05:00
08e9f4f769
fix(test): Quest buy typo
2015-07-14 17:42:15 -05:00
6cad2df6a3
test(quests): Add user.ops.buyQuest test
...
Also adds the Bailey announcement for the day and implements "locked" quest scrolls for the beginning quests in extant quest chains.
2015-07-14 17:34:01 -05:00
8f9fa7942a
fix(settings): use correct value for inactivity emails
2015-07-15 00:13:17 +02:00
1fe900db25
pets.jade: IE better support
...
It is currently impossible to see how fed a pet is in IE. The width of the .progress-bar-success is "{{user.items.pets["Wolf-Base"]/.5}}%".
Now, it works.
2015-07-14 22:58:24 +02:00
5e0d754553
fix(test): Inject Content
2015-07-14 14:55:13 -05:00
79b3597693
fix(tests): Buy specific quest keys
2015-07-14 14:27:25 -05:00
af5b7d4d24
fix(test): Partial tests fix
2015-07-14 14:24:11 -05:00
eb3a72995c
test(quests): Buy quest tests
2015-07-14 12:43:02 -05:00
0955d63998
test(quests): Fix tests
2015-07-14 11:46:13 -05:00
7ad2839f05
Adjust look of page blurbs
2015-07-14 08:18:02 -05:00
cdc54038ba
Remove bad file encoding
2015-07-14 07:56:53 -05:00
7e60864d41
Fixing color on blurbs
2015-07-14 07:46:57 -05:00
1789bf3c6a
Making suggests changes to issue 5513
2015-07-14 07:44:51 -05:00
a25296a855
adding more links to heroes blurb and links not included in json
2015-07-14 07:44:51 -05:00
65b7465081
adding blurbs to pages
2015-07-14 07:44:51 -05:00
6cf0840c71
chore(i18n): update locales
2015-07-14 13:55:03 +02:00
a01b2756f2
Merge pull request #5605 from hairlessbear/join-party-quest-invite-fix
...
Invite a new party member to a quest if the quest is still in the invitation stage (fixes #5598 )
2015-07-13 22:37:46 -05:00
266b6b87e2
test(quests): Quests Service spec WIP
...
First test on new Quests Service. Also fix Armoire tests to account for new items.
2015-07-13 19:16:29 -05:00
b9f795529b
feat(quests): Dilatory Distress
...
Implements the "Dilatory Distress" quest chain, purchasable for Gold. Also adds four new items to the Enchanted Armoire.
2015-07-13 18:21:32 -05:00
cb9f5bcff3
Merge pull request #5523 from hairlessbear/update_isOnQuest_logic
...
Removed user.party.quest.key checks from isOnQuest and added check for user ID in quest members
2015-07-14 08:11:35 +10:00
209989d7aa
Merge pull request #5601 from crookedneighbor/quests-fix-merge-coflicts
...
fix merge conflicts for quests refactor
2015-07-13 12:18:27 -07:00
7223eeb681
Invites a new party member to a quest if the quest is still in the invitation stage ( fixes #5598 )
2015-07-13 13:01:35 -04:00
60e92805dd
Remove unneeded comment
2015-07-13 08:36:01 -05:00
Sabe Jones