Commit graph

4750 commits

Author SHA1 Message Date
James Hsiao
326b65a8e0 Updated base vagrant box. added full provisioning of HRPG env. 2014-04-11 10:18:01 -04:00
deilann
c1a219380b clarify no adding members to existing quests
Should hopefully cut back on the number of newer players starting a quest and thinking they can add other folks
2014-04-07 15:59:16 -07:00
Tyler Renelle
1789317326 chore(bailey): update to bailey egg quest 2014-04-06 22:59:05 -06:00
Tyler Renelle
45dcd0329f chore(bailey): bailey for eggQuest 2014-04-06 21:42:27 -06:00
Tyler Renelle
8505e81764 feat(eggQuest): add supporting ng-if for egg quest, so you can't feed
eggs. temporary, we should make something more robust like
"canFeed:false". Also, uses jade mixins to DRY the egg stuff
2014-04-06 21:31:06 -06:00
Tyler Renelle
2d444c5ccc chore(bailey): pastel hair 2014-04-03 23:01:48 -07:00
Tyler Renelle
c48e8cd343 refactor(customizer): use jade mixins for 2G/locked 2014-04-03 22:52:07 -07:00
Tyler Renelle
7e56bff843 feat(hair): add limited ed pastel colors 2014-04-03 22:52:07 -07:00
Matteo Pagliazzi
2cd9dfb470 Merge pull request #3187 from denis-sokolov/reward-item-cursor
fix(rewards): no move cursor on shop and spells
2014-04-02 15:25:02 +02:00
Tyler Renelle
3212a60039 chore(bailey): bailey april mystery 2014-04-02 00:15:53 -06:00
Tyler Renelle
8c23bd0d21 chore(april-fools): revert april fools 2014-04-02 00:05:33 -06:00
Matteo Pagliazzi
7a806097b9 Merge pull request #3191 from denis-sokolov/footer-proper-debug-condition
fix(footer): correct logic to show debug panel
2014-04-01 16:52:04 +02:00
Tyler Renelle
a30d491b62 fix(april-fools): matt boch 2014-03-31 20:55:53 -06:00
Tyler Renelle
71a23096cc feat(april-fools): april fools (revert here when done) 2014-03-31 20:12:16 -06:00
Tyler Renelle
d4bdeaeff1 chore(bailey): april fools bailey 2014-03-31 20:12:16 -06:00
Tyler Renelle
e76e545e6a fix(challenges): temporarily remove $elemMatch on challenge/user/progress, see #2947 2014-03-31 19:01:08 -06:00
Denis Sokolov
1bc2d74f67 fix(footer): correct logic to show debug panel
In the controller, the actions behind the buttons are only defined in development.
As a result, if the environment is neither production, nor development,
the buttons would show up but do nothing.

After this fix, the buttons only show up in development.
2014-03-31 21:22:37 +03:00
Denis Sokolov
4d37314b6d fix(rewards): no move cursor on shop and spells, close #2910 2014-03-31 16:03:05 +03:00
deilann
f659206042 Merge pull request #3184 from denis-sokolov/avatar-unlocks-3175
improve(profile): clarify the cost of unlocks, fix #3175
2014-03-31 02:07:23 -07:00
Denis
41ae15c913 improve(profile): clarify the cost of unlocks, fix #3175 2014-03-31 11:59:45 +03:00
Tyler Renelle
301bebe1bd refactor(subscriptions): move unsubscribe message to the cancelSub button 2014-03-30 18:36:44 -06:00
Tyler Renelle
2647ac2f46 chore(bailey): bailey on last-day march subs 2014-03-30 18:22:22 -06:00
Tyler Renelle
c7f7a07aed chore(ultimateGear): take ultimategear offline until it's fixed (see https://github.com/HabitRPG/habitrpg/issues/2232) 2014-03-30 18:20:05 -06:00
Tyler Renelle
2031b23a91 Merge pull request #3172 from PeterHatch/back-accessory-layer-beneath-skin
Draw the back accessory layer before the skin layer.
2014-03-30 10:32:08 -06:00
Tyler Renelle
97928e9ec9 Merge pull request #3174 from denis-sokolov/patch-2
feat(readme): code climate badge
2014-03-30 10:20:38 -06:00
Denis
7dfe7cbc64 feat(readme): code climate badge 2014-03-30 12:16:28 +03:00
Peter Hatch
aa80a0c051 Draw the back acessory layer before the skin layer. 2014-03-29 13:37:22 -07:00
Tyler Renelle
b13ee70cf8 Merge pull request #3141 from benmanley/fix-herostats
Prevent .hero-stats header styles from applying globally
2014-03-26 15:32:12 -06:00
deilann
610b5b81fa Merge pull request #3147 from denis-sokolov/patch-1
feat(mystery): typo in bailey
2014-03-25 01:01:33 -07:00
Denis
84a5a513cf feat(mystery): typo in bailey 2014-03-25 09:53:21 +02:00
Tyler Renelle
92c8dbba3e feat(mystery): bailey + migration for march mystery items 2014-03-24 23:42:08 -06:00
Tyler Renelle
d807719565 Merge pull request #3142 from HabitRPG/paypal-recurring
Paypal recurring
2014-03-24 22:12:48 -06:00
Tyler Renelle
123f8192f4 feat(subscriptions): add misc. IPN handler. For this case, it will catch
off-site cancelled subscriptions
2014-03-24 21:51:49 -06:00
Tyler Renelle
440a2e2884 refactor(subscriptions): move all payments stuff to it's own controller 2014-03-24 21:51:20 -06:00
Tyler Renelle
0f430e102e feat(subscriptions): add paypal recurring cancelation. refactor stripe & paypal code to use auth.authWithUrl. 2014-03-24 20:47:25 -06:00
Tyler Renelle
b686b56282 feat(subscriptions): refactor subscription & gem-purchase code, misc bug fixes 2014-03-24 20:47:22 -06:00
Tyler Renelle
10c9595662 feat(subscriptions): convert paypal gem purchases from client-side javascriptButtons to serverside NVP 2014-03-24 20:47:18 -06:00
Tyler Renelle
d1a2fbbbd9 feat(subscriptions): implement partial paypal-recurring. It's having issues with cookies 2014-03-24 20:47:10 -06:00
benmanley
43d9ccaa2e Prevent .hero-stats header styles from applying globally 2014-03-24 21:38:54 +00:00
Sabe Jones
e109128570 fix(alerts): Align alerts better with new toolbar
Changes the top offset for Experience, Gold, etc. alerts so that they don't obscure the currency set in the new top toolbar.
2014-03-22 11:37:21 -05:00
Sabe Jones
450a4e4ff5 feat(market): Implement Deer egg purchase
Adds the Ghost Stag quest to the list of pet quests that unlock egg purchases in Market after 2 completions.
2014-03-21 22:53:19 -05:00
Tyler Renelle
547c195ae9 chore(bailey): bailey for stag quset 2014-03-21 21:34:37 -06:00
Tyler Renelle
16977bc108 fix(api): sortTask positive on score route definition, not going
next(). Fixes #3118
2014-03-21 20:28:41 -06:00
Tyler Renelle
0da696b861 chore(bailey): bailey for spring fling event 2014-03-21 16:00:50 -06:00
Tyler Renelle
239e8abf68 feat(equipment): remove base gear from equipment. index.coffee is now
such that when you click the same gear you have equipped, it un-equips.
2014-03-21 15:03:46 -06:00
Tyler Renelle
bfc6bf44ff feat(accessories): head accessory 2014-03-21 13:17:17 -06:00
Tyler Renelle
531fe5eb31 feat(flower): add flower customization option 2014-03-21 12:29:57 -06:00
Tyler Renelle
2661034fbd Merge pull request #3076 from benmanley/toolbar-restyle
Redesign navbar
2014-03-21 12:29:06 -06:00
deilann
5c60389350 Merge pull request #3100 from PeterHatch/develop
In class choice popup, added a space between 'Choose your' and 'Class!'.
2014-03-19 08:43:40 -07:00
benmanley
3a899cf3a4 Fix broken logout link in submenu 2014-03-19 14:31:25 +00:00