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

1186 Commits

Author SHA1 Message Date
Blade Barringer ee6fe4f756 Use _.find for clickStart Quest 2015-08-18 08:02:23 -05:00
Blade Barringer 2e289777d5 Clean up groups page 2015-08-18 07:46:01 -05:00
Blade Barringer a57e19bdba Convert to private methods 2015-08-18 07:34:49 -05:00
Blade Barringer ab7a23ad00 Add quest abort function back in 2015-08-17 22:15:51 -05:00
Blade Barringer 14ae3b1046 Add one time binding 2015-08-17 22:07:09 -05:00
Blade Barringer ba2988ac98 Use new content for mixin 2015-08-17 21:51:08 -05:00
Blade Barringer f792155b45 Order quests with array 2015-08-17 21:48:58 -05:00
Blade Barringer 344eded949 Merge branch 'develop' into sabrecat/party-page 2015-08-17 19:04:25 -05:00
Alys 8e667b1019 delete an outdated favicon.ico file - partial fix for https://github.com/HabitRPG/habitrpg/issues/5464 2015-08-16 14:35:38 +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 426acf44c8 Wrap task analytics in if statement 2015-08-14 23:43:47 -05: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 b31966b1ee use assign in place of merge, make sure references to tavern and mods are not lost 2015-08-14 22:02:19 +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
Sabe Jones c4c563aca1 WIP(party-page): Restore Guild invite modal 2015-08-14 13:17:19 -05:00
Sabe Jones 572e64e3ed WIP(party-page): Refactor groups service 2015-08-14 12:58:46 -05:00
Sabe Jones 0f31873262 Merge branch 'develop' into sabrecat/party-page 
Conflicts:
	common/dist/sprites/habitrpg-shared.css
	common/dist/sprites/spritesmith1.css
	common/dist/sprites/spritesmith1.png
	common/dist/sprites/spritesmith4.css
	common/dist/sprites/spritesmith4.png
	website/views/options/social/index.jade
 2015-08-14 11:23:35 -05:00
Matteo Pagliazzi 1840c3907b fix avatar export page 2015-08-14 15:37:04 +02:00
Matteo Pagliazzi dc4c6fa6e7 add TODO commit about logging errors catched when party invite code is invalid 2015-08-14 15:21:17 +02:00
Blade Barringer 80ba33bf7c Fix issue where card strings required quotes 2015-08-14 08:13:05 -05:00
Matteo Pagliazzi 289d288f38 fix typo 2015-08-14 15:02:46 +02:00
Matteo Pagliazzi d3c78bb890 revert dataexport controller changes 2015-08-14 15:02:16 +02: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
Matteo Pagliazzi 34dd4494ec in locals middleware require tavern and mods only once 2015-08-14 13:10:53 +02:00
Matteo Pagliazzi ca457df36a fix typo catatories -> categories 2015-08-14 12:23:10 +02:00
Matteo Pagliazzi 491652d712 fix several typypos and a missing dep 2015-08-14 12:00:09 +02:00
Matteo Pagliazzi 47f6f2febe refactor middlewares in their own folder, move buildFiles to libs/buildFiles 2015-08-14 11:50:09 +02: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
Matteo Pagliazzi 4993d67f2f export avatars to separate folder in s3 bucket 2015-08-13 14:12:32 +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 7c6641482a Merge pull request #5776 from crookedneighbor/qhUQxV7Q_add_number_of_user_tasks_to_analytics 
Analytics improvements
 2015-08-12 22:31:44 -05:00
Blade Barringer ceec310e5f Use human readable name 2015-08-12 22:16:30 -05:00
Blade Barringer 9a27b2e8cb Add task numbers to analytics 2015-08-12 21:47:04 -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