Commit graph

6002 commits

Author SHA1 Message Date
Blade Barringer
406edcb761 Added releaseBoth script and refactored keys to the kennel modal 2015-01-02 13:33:41 -06:00
Blade Barringer
1049e5e152 Key shows up when you have either 90 pets or 90 mounts. Opens lg modal 2015-01-02 13:08:45 -06:00
Blade Barringer
7f2648eafb Renamed release scripts 2015-01-02 12:43:40 -06:00
Blade Barringer
6807368c5c Removed comment 2015-01-01 21:29:27 -06:00
Blade Barringer
e2403c52ad Converted more ng-shows to ng-ifs 2015-01-01 21:24:21 -06:00
Blade Barringer
f2d62784f4 Converted ng-show to ng-if 2015-01-01 21:23:39 -06:00
Blade Barringer
e219c0d110 Corrected mountmasterProgress variable name 2015-01-01 21:23:05 -06:00
Blade Barringer
08d13660fb Hid mounts area in stats until dropx enabled 2015-01-01 21:21:53 -06:00
Blade Barringer
04a12542e5 Corrected the achievemnts page to show the right medal for mountmaster 2015-01-01 21:17:58 -06:00
Blade Barringer
71a2ef91ca Fixed modals from not popping up when beastMaster and mountMaster
achieved
2015-01-01 20:52:55 -06:00
Blade Barringer
488a53f1cf Corrected comment title 2015-01-01 17:16:23 -06:00
Blade Barringer
a45797a1ba Adjusted text in view to show mountMaster progress 2015-01-01 17:06:34 -06:00
Blade Barringer
7172df7dbb Corrected second half of mountmaster text to only show if mountmaster
has been achieved at least once
2014-12-31 16:46:13 -06:00
Blade Barringer
0fd3f290b8 Merge branch 'develop' into mountmaster 2014-12-31 13:14:11 -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
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
Melissa Mcewen
8bdc0d55b9 Private Message (PM / DM) textbox is too small #4425 2014-12-28 23:53:15 -06:00
Melissa Mcewen
c4e62fc79b Private Message (PM / DM) textbox is too small #4425 2014-12-28 23:51:37 -06:00
Melissa Mcewen
f8cdcd2e75 Inconsistent alignment of Gem prices in Seasonal Shop #4434 2014-12-28 23:35:47 -06:00
Alice Harris
1ff19efac5 Merge pull request #4431 from andyzinsser/develop
Fix #4396 - Duplicate class tour dialogs
2014-12-28 12:07:47 +10:00
Andy Zinsser
1a4455550d Remove duplicate equipment-tab classes 2014-12-27 17:49:58 -08:00
Negue
a082e88b5d Filter Array only once and one time binding - closes #4429 2014-12-27 23:26:30 +01:00
Matteo Pagliazzi
85f4a2884a add some more debugging for cron 2014-12-27 12:56:54 +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