sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-03 08:21:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
10058 commits 3 branches 0 tags 1.6 GiB
Commit graph

957 commits

Author SHA1 Message Date
Sabe Jones
c286d08bc8 WIP(death): New death modal 2015-07-20 16:24:05 -05:00
Blade Barringer
11f56d491c Remove close button from menu 
Closes #3820
 2015-07-19 19:08:48 -05:00
Blade Barringer
dc2fab14d0 Merge branch 'GitHubSphinx-Sphinx-i18n-db1' into develop 2015-07-18 17:06:26 -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
Matteo Pagliazzi
86eaff7cb0 fix(i18n): string for amazon payments 2015-07-17 15:28:55 +02: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
Sabe Jones
2407c9eeb8 feat(quests): Improve buy confirm dialog 2015-07-16 12:56:26 -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
GihHubSphinx
e48703602a Make colon is stats hideable 2015-07-16 12:00:56 +05:00
GihHubSphinx
aa0aec8d4b Revert "New string in stats if gear has no benefits (take 2)" 
This reverts commit fdbd18a8ed.
 2015-07-16 10:54:17 +05: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
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
Blade Barringer
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
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
Alys
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
hairlessbear
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
Blade Barringer
60e92805dd Remove unneeded comment 2015-07-13 08:36:01 -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