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
11368 commits 3 branches 0 tags 1.6 GiB
Commit graph

945 commits

Author SHA1 Message Date
Sabe Jones
22caaa7eda feat(sharing): More opt outs 
Also fixes a bug where "Display Now" didn't work for pets with a space in their name.
 2015-10-28 17:48:16 -04:00
Sabe Jones
aad3e5ade6 fix(sharing): Add social service to Inventory 
Also fixes accidental 'only' in tests.
 2015-10-28 16:52:07 -04:00
Sabe Jones
f4ea6c1d5d feat(sharing): Opt Out WIP 
First draft of support for opting out of future modal display on specific events, and adds the second barebones target page for sharing.
 2015-10-28 16:36:47 -04:00
Sabe Jones
27e3797307 Merge branch 'develop' into sabrecat/more-modals 
Conflicts:
	common/locales/en/challenge.json
 2015-10-28 14:54:55 -04:00
Blade Barringer
cdc58c78fd Merge branch 'nicolevonvon-develop' into develop 2015-10-27 20:19:09 -05:00
Blade Barringer
c812c0ae90 Add popover to no owner label 2015-10-27 20:18:39 -05:00
nicolevonvon
47ec2e1f93 Challenges now display'no owner' if original owner deletes account 2015-10-27 22:15:19 +02:00
Alys
1cc7ea872f chore(news): Exhaust Strike Bailey - recommiting after temporary removal 2015-10-27 19:18:05 +10:00
Alys
23059763eb revert Exhaust Strike Bailey change (commit f5d6c92897) to allow urgent deployment 2015-10-27 18:45:30 +10:00
Sabe Jones
f5d6c92897 chore(news): Exhaust Strike Bailey 2015-10-27 00:24:11 -04:00
Blade Barringer
c04b27ffd5 Simplify community guidelines string 2015-10-26 18:08:45 -05:00
Blade Barringer
f0e4149adb Merge branch 'develop' into ksami-develop 2015-10-26 17:56:05 -05:00
Blade Barringer
4dd368a028 Merge pull request #6082 from anilanar/reroll-syntax-bug 
fix a minor syntax error when opening reroll modal.
 2015-10-26 17:55:16 -05:00
Sabe Jones
392889c7da feat(mystery): October 2015 subscriber set 2015-10-23 15:45:43 -04:00
ksami
f2c856f6e6 Make link translatable in options/inventory/time-travelers 2015-10-23 23:40:11 +08:00
ksami
b3cc58886c Make strings translatable in options/social/chat-box 2015-10-23 23:20:59 +08:00
Sabe Jones
78416f68da fix(sharing): Better social button positioning 2015-10-22 16:00:55 -04:00
Sabe Jones
152fb72899 fix(sharing): Needed return object 2015-10-22 15:08:04 -04:00
Sabe Jones
e2cfd1bd54 feat(sharing): Load widgets from service 2015-10-22 14:37:29 -04:00
Sabe Jones
281411f423 Merge branch 'develop' into sabrecat/more-modals 2015-10-22 14:05:26 -04:00
Sabe Jones
bcc522f08d feat(sharing): Add Tumblr button 2015-10-22 13:52:26 -04:00
Sabe Jones
d08a3efbcd fix(news): Bogus trailing slash 2015-10-22 12:04:43 -05:00
Anil Anar
e269e04172 fix a minor syntax error when opening reroll modal. 2015-10-22 09:24:04 +02:00
Sabe Jones
9fb671f068 fix(social): Better share image 2015-10-21 16:25:03 -05:00
Sabe Jones
a2c0e02283 fix(social): Correct OG tag errors 2015-10-21 16:37:33 -04:00
Sabe Jones
d32f6f23cc feat(sharing): Improved front page FB share 2015-10-21 15:59:17 -04:00
Sabe Jones
44818882f6 feat(sharing): Pretty Tweet button for level up 2015-10-21 15:23:31 -04:00
Sabe Jones
5fbd6814b0 fix(pets): Realign frog sprites 
Also adds a note about the To-Do sorting fix to the Bailey announcement
 2015-10-20 18:55:57 -04:00
Sabe Jones
1ad6ffd35d Merge branch 'develop' into sabrecat/more-modals 2015-10-20 12:50:34 -04:00
Sabe Jones
d0a34fc0ad feat(quests): 2015-10 Pet 
Also adds Exhaust Strike-specific text to the remaining affected NPCs.
 2015-10-20 12:32:45 -04:00
Sabe Jones
0a6d9fa23a WIP(pets): Frog quest 2015-10-19 23:12:24 -04:00
Blade Barringer
9ad1dbd8ce Adjust mystic hourglass string to take in interpolation 2015-10-19 08:10:37 -05:00
Blade Barringer
1a2510e4da Adjsut string to take in interpolation 2015-10-19 08:03:27 -05:00
Sabe Jones
22ec450521 feat(modals): Won Challenge 
Draft of the modal that appears when a user wins a challenge. Needs better logic for when to display.
 2015-10-16 23:36:57 -04:00
ksami
65dc274e49 Make text in options/settings translatable 2015-10-16 20:48:12 +08:00
Sabe Jones
338aced208 feat(modals): Grew Mount 
A modal now appears when you raise a pet into a mount, which allows the user to immediately equip the new mount.
 2015-10-15 17:33:20 -04:00
Sabe Jones
c6dd2a0d10 feat(modals): Hatch Pet modal 
Complete except for the planned addition of a heart sprite over the pet.
 2015-10-15 16:34:53 -04:00
Sabe Jones
380265731f feat(world-boss): Exhaust Ian's text 2015-10-14 21:02:59 -04:00
Sabe Jones
e88030e15f Merge pull request #6039 from HabitRPG/sabrecat/halloween-mount 
Jack-O'-Lantern mounts
 2015-10-14 16:46:55 -05:00
Sabe Jones
59b2c1662e fix(news): Revised Bailey 2015-10-14 12:54:33 -04:00
Rory O’Kane
4a23f40415 Fix capitalization of “GitHub” on Contact Us page 
The live page is at https://habitica.com/static/contact.
 2015-10-14 03:55:46 -04:00
Sabe Jones
6505824cb6 feat(modals): Levelup modal 
Introduces a new modal that displays whenever the user levels up.
 2015-10-13 16:32:07 -04:00
Sabe Jones
5eacba54b8 feat(modals): Slim scroll notif 
Establishes a new template for modal notifications, to be used across the app including a number of new notifications.
 2015-10-13 14:20:51 -04:00
Sabe Jones
dcf17b5505 feat(event): Jack-O'-Lantern mounts 2015-10-12 14:49:12 -04:00
Alys
ece3e0d0aa add FAQ item for World Bosses 2015-10-12 21:26:59 +10:00
Phillip Thelen
87012f6a7c Add iOS start app banner 2015-10-10 13:52:53 +02:00
Sabe Jones
f00bbd9652 feat(modals): Small style scroll award 2015-10-09 15:39:36 -04:00
Sabe Jones
b775b8f399 feat(modals): Simplified scroll drop 
Conflicts:
	website/views/shared/modals/quests.jade
 2015-10-09 14:07:54 -04:00
Sabe Jones
291a135fe1 Merge pull request #6023 from HabitRPG/sabrecat/world-boss 
Fall 2015 World Boss
 2015-10-08 11:15:00 -05:00
Sabe Jones
51355f7eea fix(quest-eggs): Short-circuit canBuy 
Also corrects the FAQ link in the site footer to use the new static FAQ page instead of the wiki.
 2015-10-06 16:56:17 -04:00