Commit Graph

4761 Commits

Author SHA1 Message Date
Tyler Renelle ffa21ca1f7 feat(backAccessory): add optional collar to back accessories. If you
name it the same name + _collar (eg, back_base_0.png + back_base_0_collar.png), it's automatically handled
2014-04-13 22:57:05 -06:00
Tyler Renelle 01b3df06af Merge pull request #3275 from chrisdotcode/develop
Add missing `angular-ui` dependency.
2014-04-13 21:07:50 -06:00
Tyler Renelle 5108344f67 Merge pull request #3274 from thepeopleseason/pnotify-update
Updated width and positioning of pnotify items
2014-04-13 21:05:47 -06:00
chrisdotcode 9350b86fc8 Add missing angular-ui dependency. 2014-04-13 22:24:47 -04:00
James Hsiao abed47d80f updated width and positioning of pnotify items 2014-04-13 20:56:21 -04:00
Tyler Renelle eaa6b0c9fd Merge pull request #3237 from thepeopleseason/pnotify
Replace growl with pnotify
2014-04-12 16:37:48 -06:00
Tyler Renelle c6d5f9cf1c Merge pull request #3253 from dekz/api_fix
Fix API reference.
2014-04-12 16:27:10 -06:00
Tyler Renelle cb30a5ed09 Merge pull request #3256 from thepeopleseason/vagrant-update
Updated vagrant environment
2014-04-12 16:25:30 -06:00
James Hsiao 5ff0b9503b pinning express to 3.5.0 2014-04-11 11:28:14 -04:00
James Hsiao 326b65a8e0 Updated base vagrant box. added full provisioning of HRPG env. 2014-04-11 10:18:01 -04:00
Jacob Evans 30ec32124b Fix API reference.
Added the required Group ID (gid) for /groups/{gid}/chat for the API reference documentation
2014-04-11 14:31:24 +10:00
James Hsiao 1811585165 Added pnotify in place of growl 2014-04-08 22:16:05 -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