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

728 Commits

Author SHA1 Message Date
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 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
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
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
Sabe Jones 2d8fdab496 WIP(party-page): Roll back to 1x invites 
Also a draft of logic for 1-step create group + invite people.
 2015-08-12 11:29:36 -05:00
Blade Barringer c7edbfb9b2 Remove empty object in close 2015-08-12 08:42:01 -05:00
Blade Barringer 203a26b6df Refactor how cards are recieved 2015-08-12 08:36:57 -05:00
Alys dbbd03e6cb remove one-time binding from "You're resting in the inn" banner above Dailies column - fixes https://github.com/HabitRPG/habitrpg/issues/5693 2015-08-12 16:53:51 +10: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
Blade Barringer 869b27d786 Correct markdown 2015-08-11 20:01:45 -05:00
Blade Barringer 0dc10b5f8e Convert valentines to markdown 2015-08-11 18:47:12 -05:00
Blade Barringer a29dd4cc16 Correct styling for focusable buttons 
Fixes #5767
 2015-08-11 18:34:46 -05:00
Sabe Jones 5b15d603aa WIP(party-page): Broken multi-invite 2015-08-10 15:16:45 -05:00
Sabe Jones beacce7fe0 Merge branch 'develop' into sabrecat/party-page 2015-08-10 13:43:44 -05:00
Sabe Jones 28ae6afd92 WIP(party-page): UI draft 2015-08-10 13:42:36 -05:00
Sabe Jones f97012798e WIP(party-page): Party preview graphic 2015-08-06 16:36:28 -05:00
Sabe Jones f1704a6a92 WIP(party-page): Active party page 2015-08-06 12:13:50 -05:00
Blade Barringer 787cb6cabb Final adjustments to PR 
- Rename strings to make them easier to expand upon in the future
- adjust line break formatting
- remove terniary operator
 2015-08-05 18:27:24 -05:00
Simon Gabler 2343e4720c Add tooltips for day buttons to show "due" or "not due" 2015-08-05 22:25:03 +02:00
Simon Gabler 1997338751 Show popover for daily and weekly dailies 2015-08-05 22:23:41 +02:00
Sabe Jones c275db6b4b Merge branch 'develop' into sabrecat/party-page 2015-08-05 12:43:56 -05:00
Simon Gabler 99bdf4c541 Add hint for "Repeat every" option title. Fixes #5603 2015-08-05 17:02:02 +02: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