Commit Graph

10047 Commits

Author SHA1 Message Date
Blade Barringer 163b0545e8 Adjustments for error handling 2015-07-18 16:00:04 -05:00
Blade Barringer 6d5b57d139 Add class bonus calc function 2015-07-18 16:00:04 -05:00
Blade Barringer e5428f29c1 Add calculation for equipment stat bonus 2015-07-18 16:00:04 -05:00
Blade Barringer 841923e054 Add level bonus calculation script 2015-07-18 16:00:03 -05:00
Blade Barringer a9757c9dbb Refactor member service; Remove logic in functions that were never used 2015-07-18 16:00:03 -05:00
hairlessbear 6525cd6f8c Revert "First shot at modifying stats.jade attribute table to use ng-repeat"
This reverts commit 0d6bc403d0.
2015-07-18 16:00:03 -05:00
hairlessbear d8f74e5d9f First shot at modifying stats.jade attribute table to use ng-repeat 2015-07-18 16:00:03 -05:00
hairlessbear dbf406c921 Fixes #5623 and fixes #5135 (correctly displays equipment stats in member modals) 2015-07-18 16:00:02 -05:00
Matteo Pagliazzi 3fa8ab80b5 chore(i18n): update locales 2015-07-17 15:31:12 +02:00
Matteo Pagliazzi 86eaff7cb0 fix(i18n): string for amazon payments 2015-07-17 15:28:55 +02:00
Sabe Jones 2407c9eeb8 feat(quests): Improve buy confirm dialog 2015-07-16 12:56:26 -05:00
Blade Barringer 668a8bb6f6 chore(i18n): update locales 2015-07-16 12:04:10 -05:00
Sabe Jones 73a1c7c596 fix(style): Remove extra class 2015-07-16 11:29:04 -05:00
Sabe Jones e25819f6de feat(party): Conclude invite experiment 2015-07-16 11:22:19 -05:00
Matteo Pagliazzi 695c793f6e Merge pull request #5632 from HabitRPG/paglias/amazon-payments
Amazon Payments: implement one time purchases
2015-07-16 13:24:42 +02:00
Alys 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
Sabe Jones c15f2b1f80 Merge branch 'sabrecat/quests-page' into develop 2015-07-15 14:12:05 -05:00
Sabe Jones 4a54363966 fix(quests): Show info modal for Gold quests 2015-07-15 14:02:49 -05:00
Matteo Pagliazzi e0bfd60eb1 amazon payments: switch to green button 2015-07-15 20:07:17 +02:00
Matteo Pagliazzi ecc98411c7 refactor amazon payments and add one time purchases once again 2015-07-15 20:07:17 +02:00
Matteo Pagliazzi bade139b4b wip amazon payments donation 2015-07-15 20:07:17 +02:00
Matteo Pagliazzi de32461787 feat(amazon-payments): WIP add donations 2015-07-15 20:07:17 +02:00
Blade Barringer 8a97b597f5 Resize sea foam image
Fixes #5609
2015-07-15 07:53:12 -05:00
Blade Barringer 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
Matteo Pagliazzi 38ac664284 chore(i18n): update locales 2015-07-15 13:17:57 +02:00
Alys 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
Alys 9ccab259b0 add message to Inventory/Market (drops) page to explain where quests have gone 2015-07-15 13:29:03 +10:00
Kevin Gisi 9645f08769 Add a 'gulp console' method which preloads Mongo, models, and sets up utility methods 2015-07-14 23:22:02 -04:00
Blade Barringer 0bc5db4885 Merge branch 'aedotj-patch-1' into develop 2015-07-14 21:10:05 -05:00
Blade Barringer 3437975ba3 Change order of quests 2015-07-14 19:44:55 -05:00
Blade Barringer e5a740a74f Adjust spacing 2015-07-14 19:32:45 -05:00
Sabe Jones 32a74471db Merge branch 'sabrecat/quests-page' into develop 2015-07-14 18:56:32 -05:00
Blade Barringer 435d33724b Set test to listen on rootScope.openModal 2015-07-14 18:32:50 -05:00
Blade Barringer 1adb3c479b Merge branch 'blurbs' into develop 2015-07-14 18:21:37 -05:00
Sabe Jones 08e9f4f769 fix(test): Quest buy typo 2015-07-14 17:42:15 -05:00
Sabe Jones 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
Matteo Pagliazzi 8f9fa7942a fix(settings): use correct value for inactivity emails 2015-07-15 00:13:17 +02:00
Greg G. 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
Sabe Jones 5e0d754553 fix(test): Inject Content 2015-07-14 14:55:13 -05:00
Sabe Jones 79b3597693 fix(tests): Buy specific quest keys 2015-07-14 14:27:25 -05:00
Sabe Jones af5b7d4d24 fix(test): Partial tests fix 2015-07-14 14:24:11 -05:00
Sabe Jones eb3a72995c test(quests): Buy quest tests 2015-07-14 12:43:02 -05:00
Sabe Jones 0955d63998 test(quests): Fix tests 2015-07-14 11:46:13 -05:00
Blade Barringer 7ad2839f05 Adjust look of page blurbs 2015-07-14 08:18:02 -05:00
Blade Barringer cdc54038ba Remove bad file encoding 2015-07-14 07:56:53 -05:00
unknown 7e60864d41 Fixing color on blurbs 2015-07-14 07:46:57 -05:00
unknown 1789bf3c6a Making suggests changes to issue 5513 2015-07-14 07:44:51 -05:00
unknown a25296a855 adding more links to heroes blurb and links not included in json 2015-07-14 07:44:51 -05:00
unknown 65b7465081 adding blurbs to pages 2015-07-14 07:44:51 -05:00
Matteo Pagliazzi 6cf0840c71 chore(i18n): update locales 2015-07-14 13:55:03 +02:00