sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-05 03:52:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
6008 commits 3 branches 0 tags 1.6 GiB
Commit graph

6008 commits

This branch
This branch
All branches
Author SHA1 Message Date
Alice Harris
dc7c6f8625 Merge pull request #4476 from jdpopkin/stat_tooltips_3223 
Add tooltip with exact health/exp/mana
 2015-01-05 18:06:57 +10:00
Jackson Popkin
b409e589f1 Add tooltip with exact health/exp/mana 2015-01-04 17:26:11 -05:00
Blade Barringer
ff3d942696 Merge branch 'issue4454try' of https://github.com/melissamcewen/habitrpg into melissamcewen-issue4454try 2015-01-04 16:11:22 -06:00
Tyler Renelle
fe1672e82d Merge pull request #4441 from crookedneighbor/stripe-name-error 
Stripe name error
 2015-01-03 15:25:29 -07:00
negue
d5eb5bbfe0 fix(content): Cannot call 'toString' of undefined 2015-01-03 23:20:16 +01:00
Tyler Renelle
a98f73dd8d tmp(newrelic) remove newrelic until #4471 fixed 2015-01-03 13:59:56 -07:00
Sabe Jones
09f827e9fe fix(news): Improved plot 2015-01-03 13:18:47 -06:00
Matteo Pagliazzi
3e0118a25a Merge pull request #4463 from negue/contentTranslation 
maybe fixes the multilingual content result
 2015-01-02 15:23:23 +01:00
Blade Barringer
914c780053 Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop 2015-01-01 23:23:08 -06:00
Blade Barringer
33abd30217 Adjusted look of gem wallet in modal 2015-01-01 23:22:40 -06:00
Sabe Jones
3a0de8f9c4 chore(January): news and deactivate cards 2015-01-01 23:20:59 -06:00
Blade Barringer
fc4e43bef8 Merge branch '4401_multiple_buy_gems_popups_with_mixins' of https://github.com/lucymhdavies/habitrpg into gems-mixin 
Conflicts:
	views/shared/gems.jade
	views/shared/modals/buy-gems.jade
 2015-01-01 23:18:28 -06:00
Blade Barringer
c561562009 Merge branch 'lucymhdavies-4401_multiple_buy_gems_popups' into develop 
closes #4401
 2015-01-01 23:12:10 -06:00
Negue
1051c0d50e maybe fixes the multilingual content result 2015-01-02 02:22:22 +01:00
Lucy Davies
0cfb705762 Add behaviour specific to the buy-gems popup. 2015-01-02 00:01:44 +00:00
Lucy Davies
0754b58cc2 Source the new mixin file, and call the mixins in place of including the former gems.jade 2015-01-01 23:58:28 +00:00
Lucy Davies
153e0db71d And of course convert this into a mixin 2015-01-01 23:57:08 +00:00
Lucy Davies
6f3ee14842 Move views/shared/gems.jade -> views/shared/mixins.jade 2015-01-01 23:50:38 +00:00
Melissa Mcewen
9d6d375663 Salt spell d 
oesn't check to see if you have enough Gold #4454 adjusting check
 2015-01-01 14:31:11 -06:00
Melissa Mcewen
cf40ef8a72 Salt spell doesn't check to see if you have enough Gold #4454 check if spell uses gold 2014-12-31 20:37:54 -06:00
Melissa Mcewen
37a6091638 Salt spell doesn't check to see if you have enough Gold #4454 2014-12-31 19:29:08 -06:00
Blade Barringer
5f179baf60 Adjusted look of tasks on mobile devices 2014-12-31 10:41:40 -06:00
Blade Barringer
5d958b1456 Adjusted styles for snowball and spookDust so they would align like the coins 2014-12-31 09:31:56 -06:00
Alice Harris
774bb7bc3a add 'items.' to 'gear.owned' 2014-12-31 15:44:50 +10:00
Sabe Jones
ccfe48099f fix(NYE): fix cards 
Improve random messages and have Bailey give instruction on where to find cards.
 2014-12-30 23:25:34 -06:00
Sabe Jones
438516b26f fix(NYE): Correct achievement badge 2014-12-30 22:56:40 -06:00
Sabe Jones
d1355faa31 Merge pull request #4452 from SabreCat/nye 
New Year's event features
 2014-12-30 22:18:11 -06:00
Sabe Jones
230482c578 chore(news): Bailey 2014-12-30 21:58:15 -06:00
Sabe Jones
1f1b4371b7 feat(NYE): Migrate hats 2014-12-30 21:48:02 -06:00
Tyler Renelle
8eebaea3dd woops.. :/ 2014-12-30 20:41:54 -07:00
Tyler Renelle
edf66cbb59 feat(discount) google discount & use sub.key instead of sub.months 2014-12-30 20:05:07 -07:00
Sabe Jones
e35722865a fix(NYE): I18N for random text 2014-12-30 20:52:06 -06:00
Sabe Jones
51acc477fe feat(NYE): New Year's cards 2014-12-30 19:57:24 -06:00
Blade Barringer
303d30a270 Merge pull request #4439 from crookedneighbor/transparent-gems 
Added transparent class to gem purchasing if zero gems are available for purchase
 2014-12-30 11:11:32 -06:00
Sabe Jones
d8cfc1dd4b WIP(NYE): New Year's cards 2014-12-29 20:58:28 -06:00
Blade Barringer
33e5802333 Added image to stripe checkout 2014-12-29 20:35:07 -06:00
Blade Barringer
ffa8072800 Made name field HabitRPG so sms will be correct. Uncomented description 
and put the old name field
 2014-12-29 20:31:59 -06:00
Sabe Jones
53fff0dbc6 feat(seasonal): Implement Snowball 
Adds the snowball from Winter 2014 to the Seasonal Shop.
 2014-12-29 19:40:11 -06:00
Blade Barringer
4eca27f19e Corrected class name closes #4434 2014-12-29 19:15:51 -06:00
Blade Barringer
0ddbbc93a3 Merge branch 'develop' of https://github.com/melissamcewen/habitrpg into melissamcewen-develop 2014-12-29 18:33:14 -06:00
Blade Barringer
ae8542eaf1 Removed extraneous console logs left while testing 2014-12-29 15:50:44 -06:00
Blade Barringer
efba545147 Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop 2014-12-29 15:44:06 -06:00
Blade Barringer
b3025c36b1 Fixed checklist not advancing to next input. Closes #4430 2014-12-29 15:43:20 -06:00
Matteo Pagliazzi
756fa83418 fix(date): typo 2014-12-29 22:26:12 +01:00
Matteo Pagliazzi
cb13b5ac26 fix(date): add YYYY/MM/DD format 2014-12-29 22:16:58 +01:00
Matteo Pagliazzi
3105b61cb5 Merge branch 'Verabird-dateformat' into develop 2014-12-29 21:24:44 +01:00
Matteo Pagliazzi
4a37bec652 fix(pr): indentation and simplify 2014-12-29 21:21:54 +01:00
Blade Barringer
4e1b298a42 Corrected spelling error in comment 2014-12-29 14:16:25 -06:00
Matteo Pagliazzi
752161b284 Merge branch 'dateformat' of git://github.com/Verabird/habitrpg into Verabird-dateformat 2014-12-29 21:09:04 +01:00
Blade Barringer
760381041f Added transparent class to gem purchasing if zero gems are available for purchase 2014-12-29 11:18:01 -06:00