Commit Graph

4729 Commits

Author SHA1 Message Date
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
Peter Hatch 31af4bdfcc In class choice popup, added a space between 'Choose your' and 'Class!'. 2014-03-19 00:06:48 -07:00
Tyler Renelle 809008e753 chore(bailey): pet mechanics, wondercon, LH poll 2014-03-18 16:19:06 -06:00
benmanley ea650c8acf Fix gap at bottom of toolbar and remove unused code 2014-03-18 20:14:29 +00:00
benmanley a5bce9e8b6 Close submenu when a navigation link is clicked 2014-03-18 17:33:14 +00:00
benmanley 055c25fac3 Remove gold and silver totals from Reward list 2014-03-18 17:30:57 +00:00
benmanley addb05686b Hide .navbar-info on mobile until toggled 2014-03-17 23:47:43 +00:00
benmanley bd79234570 Hide toolbar-submenu until toggled 2014-03-17 23:42:04 +00:00
Tyler Renelle 7c531af4fc Merge pull request #3082 from Sepero/patch-1
Fix day start max hour
2014-03-17 17:27:28 -06:00
Sabe Jones 835be7f1e8 Merge pull request #3087 from HabitRPG/sabe/quests
Allow purchase of quest pet eggs in Market
2014-03-17 14:47:14 -05:00
Tyler Renelle b8a6366d1a Revert "chore(cluster): set max #cores to 1 for now (we're maxing memory again)"
This reverts commit 3f5221755c.
2014-03-17 13:09:35 -06:00
sabrecat 7102943aa1 feat(quests): Allow purchase of quest pets
Implements purchase in the Market of the two currently available pet quest eggs, after the user has completed the corresponding quest at least twice. This is a hard-code solution; @lefnire or others a little more adept in Angular might be able to make this generic and extensible with an ng-repeat--I just couldn't get the expression quite right.
2014-03-17 12:20:27 +00:00
Tyler Renelle 5b3302202d Merge pull request #3045 from thepeopleseason/vagrant-setup
Vagrant configuration update
2014-03-16 22:58:59 -06:00
Sabe Jones d62d94c4fc WIP: Enable quest eggs in Market after two runs 2014-03-16 22:23:23 -05:00
benmanley 1fc549e6c1 Add herobox background colour variables 2014-03-16 23:53:51 +00:00
benmanley 543e3695c2 Improve navbar layout
Make navbar fixed for desktop and static for mobile.
2014-03-16 23:53:15 +00:00
Sepero 974a840016 Fix day start max hour
A 24 hour clock goes from 0 to 23.

A friend of mine plays your game and referred me to your "dailies" bounty. This probably won't fix that issue, but I'll submit anyway.  :)
2014-03-16 10:22:58 -04:00
benmanley 6ca6bbedec Move sync button from submenu into navbar 2014-03-15 18:21:11 +00:00
benmanley 495e0fe60f Change hardcoded text to variable 2014-03-15 13:05:31 +00:00
benmanley c63f4b7c4c Change navbar background-color
Correct navbar background-color and remove some redundant styles
2014-03-15 08:26:25 +00:00
benmanley 0ec5ca48f5 Remove flying pig custom styles
Remove styles that haven’t been pulled into habitrpg
2014-03-14 23:43:18 +00:00
benmanley eef5e55ad9 Redesign navbar
Restyle navigation and improve mobile layout
2014-03-14 23:32:32 +00:00