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

10553 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Blade Barringer 6be339fc77 Fix bug where armoire notes would not display correctly 2015-08-14 06:59:23 -05:00
Blade Barringer 576688c15b Clean up content file 2015-08-14 06:41:10 -05:00
Matteo Pagliazzi 34dd4494ec in locals middleware require tavern and mods only once 2015-08-14 13:10:53 +02:00
Matteo Pagliazzi fbeeb18923 Merge pull request #5788 from HabitRPG/paglias/loading-times 
Refactor middlewares
 2015-08-14 12:53:02 +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
Matteo Pagliazzi 078ea4768a upgrade jade version 2015-08-14 10:58:19 +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 534cb48dce Merge pull request #5782 from crookedneighbor/card_tweaks 
Tweaks to card PR
 2015-08-13 22:21:56 -05:00
Blade Barringer c7282dc10a Remove blank space 2015-08-13 20:33:19 -05:00
Blade Barringer 4adc19caf0 Fix test 2015-08-13 19:55:13 -05:00
Blade Barringer b1b4522b4b Fix test 2015-08-13 19:40:25 -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
Alys 619b33795a remove mention of ads from locale strings, delete ads strings that are no longer used - fixes https://github.com/HabitRPG/habitrpg/issues/5765 2015-08-13 16:46:02 +10:00
Blade Barringer 3f941c3534 chore(i18n): update locales 2015-08-12 22:37:52 -05: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 a5efc2af2b Merge pull request #5762 from crookedneighbor/transifex_test 
Transifex test
 2015-08-12 22:35:38 -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 39ead02d6c Remove comment 2015-08-12 19:09:11 -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 f4c89f9379 initialise buyThis message variable at point of declaration - fixes https://github.com/HabitRPG/habitrpg/issues/5770 2015-08-12 21:26:51 +10: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
Alys 665c32ee54 change Fortify Potion description for blue tasks making the game too easy - fixes https://github.com/HabitRPG/habitrpg/issues/5758 2015-08-12 11:25:08 +10:00
Blade Barringer 60f92a8997 chore(i18n): update locales 2015-08-11 20:02:59 -05:00
Blade Barringer 869b27d786 Correct markdown 2015-08-11 20:01:45 -05:00
Blade Barringer 6861f1460a chore(i18n): update locales 2015-08-11 18:50:51 -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
Alys 8360aa93fb Merge pull request #5756 from Alys/cron-missed-days-ignore-multiple-2015-07-21 
make cron count multiple missed days as one missed day (part 2)
 2015-08-12 08:35:37 +10:00
Blade Barringer 1477c5601c Merge branch 'develop' into transifex_test 2015-08-11 08:16:09 -05:00
Blade Barringer 455dae1032 chore(i18n): update locales 2015-08-11 08:15:34 -05:00
Blade Barringer 5750da4a13 chore(i18n): update locales 2015-08-11 08:13:41 -05:00
Blade Barringer 9d9e99045d Add exceptions to not check for malformities 2015-08-11 08:12:03 -05:00
Blade Barringer 3b0993c781 Merge branch 'develop' into transifex_test 2015-08-11 07:55:15 -05:00