Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,559 Commits 64 Branches 1,256 Tags
2bddd79ffd928b32bf6f45ac151e734e9a2eaf9e
Commit Graph

733 Commits

Author SHA1 Message Date
Mel Marley 2bddd79ffd Some things I tried 2015-09-08 13:59:34 +01:00
melarish b2bb6016fa Added +1 Hourglass to debug menu 2015-09-02 18:12:48 +01:00
Sabe Jones 3ead359538 chore(news): August Last Chance Bailey 2015-08-30 21:06:25 -05:00
Blade Barringer ee0bcb5309 Correct class name 2015-08-30 17:52:16 -05:00
Blade Barringer 4af1a4d6ac Rename image rendering class 2015-08-28 21:48:42 -05:00
Blade Barringer dd1e69b9d5 Merge branch 'RossBrunton-develop' into develop 2015-08-28 21:42:16 -05:00
Blade Barringer df3c498fcc Add rasterize class 2015-08-28 21:41:53 -05:00
Sabe Jones 9e45017faa Merge branch 'develop' into sabrecat/onboarding-tweaks 
Conflicts:
	common/dist/sprites/habitrpg-shared.css
	common/dist/sprites/spritesmith2.css
	common/dist/sprites/spritesmith2.png
	common/dist/sprites/spritesmith3.css
	common/dist/sprites/spritesmith3.png
	common/dist/sprites/spritesmith4.css
	common/dist/sprites/spritesmith4.png
 2015-08-28 13:24:10 -05:00
Sabe Jones 8d713a53c4 feat(tutorial): Splash screen overhaul complete 2015-08-28 13:58:30 -04:00
Sabe Jones f88c536836 chore(news): Back to School Bailey 2015-08-27 16:20:15 -05:00
Sabe Jones c4012ad762 WIP(tutorial): New intro splash 2015-08-27 16:04:59 -04:00
Sabe Jones 6564cb52dc fix(news): wording tweak 2015-08-25 13:10:33 -04:00
Sabe Jones c23312f771 feat(mystery): 2015 August items 2015-08-24 17:19:12 -04:00
Alys 5b8c161932 changed habitrpg.wikia.com to habitica.wikia.com 2015-08-23 12:31:10 +10:00
Blade Barringer 9643b6e650 Merge branch 'develop' into TheHollidayInn-menu-hide-when-navigate-away 2015-08-22 17:03:26 -05:00
Alys f9a0e494a7 changed "The Dreadful Cheetah" to "Such a Cheetah" 2015-08-21 20:49:58 +10:00
Alys 28e360d7f4 change Janet Janet Mongilio to janetmango 2015-08-20 11:23:29 +10:00
Sabe Jones 99c8f941e6 chore(news): August pet Bailey 2015-08-19 17:39:11 -04:00
Sabe Jones 190fdd5bb9 feat(pets): August cheetah quest 2015-08-19 16:55:14 -04:00
TheHollidayInn e762a51e4c Moved menu expand directive and created menu close directive 2015-08-19 08:53:51 -05:00
Blade Barringer 5b02c2776e Fix habitica in privacy policy 2015-08-19 08:06:02 -05:00
Blade Barringer fa7f957ccc Update habitrpg.com to habitica.com where applicable 2015-08-19 08:00:34 -05:00
Blade Barringer 1fecc7dc89 Change wiki links to habitica 2015-08-19 07:46:25 -05:00
Alys 53f861f3c0 allow challenges to be edited, deleted, closed by admin users (moderators and staff) through the web UI (not by API calls) 2015-08-16 16:51:53 +10:00
Alys 8c186f3068 add close button audio menu on mobile web view - fixes https://github.com/HabitRPG/habitrpg/issues/5359 2015-08-15 15:21:17 +10:00
Blade Barringer 9e47bc3f4c Merge branch 'GitHubSphinx-Sphinx-i18n-db1' into develop 2015-08-14 20:11:37 -05:00
Blade Barringer 2821e25451 Reinstate the string interpolation 2015-08-14 18:04:04 -05:00
Blade Barringer 28dda9ae9e Fix string interpolation 2015-08-14 17:49:51 -05:00
Blade Barringer 80a6b2dcf9 Merge branch 'develop' into card_tweaks 2015-08-14 17:29:17 -05:00
Matteo Pagliazzi a58c3d1e8b Merge pull request #5789 from HabitRPG/paglias/loading-times 
Stringify into window.env only what is used on the client
 2015-08-14 22:14:54 +02:00
Matteo Pagliazzi 2e1b046701 add TODO comments, send mods to client as they are used there 2015-08-14 21:05:04 +02:00
Matteo Pagliazzi f896fdf16f use only client vars on index.jade 2015-08-14 20:58:57 +02:00
Matteo Pagliazzi 3cda8b0b56 remove newrelic javascript from client 2015-08-14 20:40:51 +02:00
Matteo Pagliazzi 1840c3907b fix avatar export page 2015-08-14 15:37:04 +02:00
Blade Barringer 80ba33bf7c Fix issue where card strings required quotes 2015-08-14 08:13:05 -05:00
Matteo Pagliazzi e1620bad2b stringify into window.env only what we really need, save a lot of KBs 2015-08-14 14:53:17 +02:00
Blade Barringer 6be339fc77 Fix bug where armoire notes would not display correctly 2015-08-14 06:59:23 -05:00
Sabe Jones ab91a6fba9 Merge pull request #5781 from HabitRPG/sabrecat/greeting-cards 
Greeting and Thank-You Cards
 2015-08-13 22:35:25 -05:00
Blade Barringer 610ce048cb Refactor card achievements 2015-08-13 22:27:14 -05:00
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
Matteo Pagliazzi f750c53ccc remove quote from filename 2015-08-13 17:52:38 +02:00
GihHubSphinx dd7ace7eb3 Reconstructing pets and mounts progress strings 
Second take, keeping the previous view
 2015-08-13 20:39:23 +05:00
Matteo Pagliazzi 61cd8f58af start using cloudfront for frontpage assets 2015-08-13 17:16:24 +02:00
Blade Barringer bf4d690a7c Merge pull request #5775 from HabitRPG/item_store_fix 
Split out potion and armoire out of the itemStore object
 2015-08-12 22:35:54 -05:00
Blade Barringer bcf7c9712e Split out potion and armoire out of the itemStore object 
Fixes #5743
 2015-08-12 18:53:49 -05:00
GihHubSphinx c711074809 Duplicating 2 strings for better i18n 
Duplicating strings "Pets Found" and "Mounts Tamed" used in inventory
and in stats with different order of numbers - words
 2015-08-12 23:39:11 +05:00
Sabe Jones 3c8424a83e Merge branch 'crookedneighbor/refactor_cards' into sabrecat/greeting-cards 2015-08-12 11:53:28 -05:00
Blade Barringer c7edbfb9b2 Remove empty object in close 2015-08-12 08:42:01 -05:00