Commit Graph

284 Commits

Author SHA1 Message Date
Sabe Jones 00a212660a feat(greeting-cards): Thank-You & Greets 2015-08-13 16:58:31 -05:00
Sabe Jones f57e3e69a1 WIP(greeting-cards): Working send + modals 2015-08-13 15:43:51 -05:00
Sabe Jones b2100c2c54 WIP(greeting-cards): Abandon spell refactor 2015-08-13 14:31:34 -05:00
Sabe Jones 3c8424a83e Merge branch 'crookedneighbor/refactor_cards' into sabrecat/greeting-cards 2015-08-12 11:53:28 -05:00
Blade Barringer 203a26b6df Refactor how cards are recieved 2015-08-12 08:36:57 -05:00
Alys 879ba83002 change habitrpg.com to habitica.com where appropriate - email addresses in static Contact page and various in-game URLs 2015-08-12 16:12:59 +10:00
Sabe Jones 68cc0fd56a fix(avatar): Delist Splashy Skins
Also removes a style that was causing hair colors to be the only 40x40 buttons on a page full of 60x60 buttons.
2015-08-04 15:17:38 -05:00
Matteo Pagliazzi 4f333c4f8a fix(amazon-payments): swap colors between paypal and amazon 2015-08-03 18:41:34 +02:00
Blade Barringer 5ed5ca8126 Merge branch 'adjustments-to-challenge-participant-pr' into develop 2015-08-03 08:47:30 -05:00
Blade Barringer 01237df213 Add buttons to challenge participant modal 2015-08-03 08:40:33 -05:00
Sabe Jones af4bb5e23f chore(news): End Summer Splash 2015-08-02 14:09:26 -05:00
Simon Gabler c9e7b4d73d Make challenge participant's name clickable in progress modal. Fixes #5558 2015-08-01 16:12:58 +02:00
Sabe Jones 8492541636 fix(visuals): Armoire and Seasonal Shop
Cleans up the Enchanted Armoire sprite and fixes bad alignment of Gem prices on the Seasonal Shop page.
2015-07-28 13:35:17 -05:00
Blade Barringer e72543641c Puts keys of the kennel modal on the inventory ctrl so pet counting variables can be accesssed
Closes #5668
2015-07-25 23:22:35 -05:00
Blade Barringer 6aae668b8c Rework gem adjustment so it actually makes sense 2015-07-24 17:30:47 -05:00
Blade Barringer a89b612bbe Impliment challenge controller changes in view 2015-07-24 17:30:42 -05:00
TheHollidayInn fce622ddc7 Added hide and error message when a user tries to create a challenge for HabitRPG group and they have no gems 2015-07-24 17:30:36 -05:00
Blade Barringer 65c14b1e3f Refactor inventory ctrl variables 2015-07-20 12:51:10 -05:00
Blade Barringer 4f5626b73b Merge branch 'hairlessbear-fix-ian-popover' into develop 2015-07-18 17:00:32 -05:00
Blade Barringer 4e6c2e7335 Add missing classes 2015-07-18 16:59:54 -05:00
hairlessbear c61c572887 '.row.col-md-12' changed to '.row: .col-md-12' 2015-07-16 21:10:48 -04:00
hairlessbear eae7f79363 Fixed time traveler items repositioning strangely on window resize 2015-07-16 20:37:14 -04:00
hairlessbear e2073f75b8 Refactored inventory file NPCs to use Bootstrap v3 grid and CSS instead of tables 2015-07-16 20:19:32 -04:00
Matteo Pagliazzi e0bfd60eb1 amazon payments: switch to green button 2015-07-15 20:07:17 +02:00
Blade Barringer 6c6c9b3464 Change Ian on quests page to not use tables 2015-07-15 08:19:39 -05:00
hairlessbear a9b3e6bf49 Refactored active time travlers code to move popover closer to NPCs 2015-07-15 01:14:21 -04:00
hairlessbear 4f65bab7bf Refactored inventory files with NPCs to cause popovers to be close to NPC 2015-07-15 01:00:08 -04:00
hairlessbear b591428717 Changed number of columns for ian and popover 2015-07-15 00:13:06 -04:00
Alys 9ccab259b0 add message to Inventory/Market (drops) page to explain where quests have gone 2015-07-15 13:29:03 +10: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 1adb3c479b Merge branch 'blurbs' into develop 2015-07-14 18:21:37 -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
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
Sabe Jones 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
Blade Barringer 87f5449267 Merge branch 'develop' into quests-fix-merge-coflicts 2015-07-13 08:20:52 -05:00
Blade Barringer 148e418c8a Change file names to use hyphen syntax 2015-07-13 08:19:15 -05:00
Blade Barringer fe5bbfadde Remove credit 2015-07-12 14:35:08 -05:00
Blade Barringer 4e9c252367 Removed extraneous jade file 2015-07-12 14:27:53 -05:00
Blade Barringer 0b53da0798 Double-check seasonal shop jades 2015-07-12 14:24:18 -05:00
Blade Barringer 316c3e9c2e Sort out conflicts from develop 2015-07-12 13:51:42 -05:00