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

1150 commits

Author SHA1 Message Date
Tyler Renelle
503fd9ff51 refactor(services): remove un-used authService, cleanup authCtrl 2015-01-17 18:59:28 -07:00
Tyler Renelle
2306b7c572 refactor(services): move to a single "habitrpg" module for services / 
directives / filters
 2015-01-17 18:43:37 -07:00
Tyler Renelle
90c7142da5 refactor(config): move httpInterceptor from website/app.js to habitrpg-shared/config.js. 2015-01-16 16:48:53 -07:00
Tyler Renelle
35e8097b0c refactor(challenges): wrap group.challenges as $resources, so they're 
convenience functions $join/$leave/etc can be called directly
 2015-01-15 15:24:02 -07:00
K Bell
0f2adcad14 highlight spell item when it has class of 'active' 2015-01-10 10:35:27 -05:00
Sabe Jones
689b13ecb6 fix(world-boss): Justin not stressed yet 2015-01-09 10:00:16 -06:00
Sabe Jones
cda16d5bc0 Merge pull request #4494 from SabreCat/stressbeast 
World boss for Winter Wonderland 2015
 2015-01-08 15:51:04 -06:00
Sabe Jones
ee339fba4a feat(event): World boss 
Implements the second HabitRPG world boss, the Abominable Stressbeast of Stoïkalm!
 2015-01-08 15:22:42 -06:00
Tyler Renelle
cba232ef83 feat(presskit): add presskit page cc @lemoness 2015-01-08 13:41:23 -07:00
Blade Barringer
eca252a269 Corrected moment code to use new format instead of depreciating format 2015-01-07 10:28:46 -06: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
Blade Barringer
33abd30217 Adjusted look of gem wallet in modal 2015-01-01 23:22:40 -06: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
Sabe Jones
d1355faa31 Merge pull request #4452 from SabreCat/nye 
New Year's event features
 2014-12-30 22:18:11 -06: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
51acc477fe feat(NYE): New Year's cards 2014-12-30 19:57:24 -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
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
Negue
a082e88b5d Filter Array only once and one time binding - closes #4429 2014-12-27 23:26:30 +01:00
Blade Barringer
2bb1e5cf7f Merge branch 'confirm-delete' into develop 2014-12-26 21:04:48 -06:00
Blade Barringer
695c463b40 Added confirmation dialog before deleting message 2014-12-26 21:04:22 -06:00
Alice Harris
af7e68259d Merge pull request #4404 from sbreiler/develop 
Fix #4296 (Subscription "Update Card" message is cut off)
 2014-12-27 12:29:04 +10:00
Verabird
8852ad61b2 Add dateFormat preference field to user model and make settingsCtrl change the field when form is changed 2014-12-26 15:52:42 -05:00
Verabird
7297429888 Make it possible to choose between MM/dd and dd/MM date format 2014-12-26 15:52:42 -05:00
Sabe Jones
0e28f04c90 feat(event): Implement Seasonal Shop 2014-12-25 14:33:11 -06:00
benmanley
118ba88d3d fix(tasks): improve UI consistency and layout 
* Match UI elements with rest of site
* Tidy up layout
 2014-12-24 09:53:41 +00:00
benmanley
8cf3cd66cc fix(avatar): prevent avatar from obscuring name 
Increase z-index of avatar-name so that avatar image doesn’t obscure it
when riding a mount
 2014-12-24 09:53:40 +00:00
breiste
e1eaefa943 Fix #4296 (Subscription "Update Card" message is cut off) 2014-12-24 00:14:08 +01:00
Blade Barringer
9406b3cf70 Removed unnecessary console.log 2014-12-18 22:36:52 -06:00
Blade Barringer
7f10049b37 Merge branch 'develop' of github.com:HabitRPG/habitrpg into add-flag-to-chat 
Conflicts:
	views/options/social/chat-message.jade
 2014-12-18 21:55:50 -06:00
Blade Barringer
7db273c0be Merge pull request #3773 from benlind/buttonless_habits_full_space 
Fixes #3260: Buttonless habits full width
 2014-12-18 13:52:01 -06:00
Sabe Jones
eadedd5897 Merge pull request #4383 from SabreCat/seasonal 
Seasonal Shop Basics
 2014-12-16 21:51:02 -06:00
Blade Barringer
9cdbca8c2b Reverted routing for groups back 2014-12-14 20:05:01 -06:00
Blade Barringer
d1b1a866ac Fixed when routing. Closes #4371 2014-12-14 19:01:52 -06:00
Sabe Jones
7988dfcf82 fix(seasonal): Corrections for Shop 
Fix Jade indenting, add state control, add menu option
 2014-12-14 14:01:25 -06:00