c7c6181bbc
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
2014-01-30 22:26:28 +01:00
76db2d49c2
18n(merge): merge @Sinza- pr, @lefnire now it is ready
2014-01-30 22:25:42 +01:00
44d9ea2a15
i18n(interpolation): Add string interpolation
2014-01-30 18:25:25 -02:00
3660f1a85c
feat(premium): backport server code for premium subs (it's just ccard
...
handling & uer model stuff)
2014-01-30 10:51:32 -07:00
5f0cf6575c
fix(settings): remove unnecessary code
2014-01-30 18:44:53 +01:00
e9fb7d0343
Merge pull request #2627 from Sinza-/subscriber
...
i18n(subscriber): replace subscriber hard-coded strings for env.t
2014-01-30 09:37:42 -08:00
a6d66f68ba
Merge remote-tracking branch 'upstream/sabe/attributes' into develop
2014-01-30 11:10:09 -06:00
f6e12fa25e
fix(allocateNow): Send empty object to user.ops per @colegleason suggestion
...
Tested with both implemented allocation modes, looks good!
2014-01-30 07:55:27 -06:00
aeb705b652
style(tavern): add space between 2 and gems
2014-01-29 17:38:32 -02:00
2b17b041ca
Merge pull request #2533 from Sinza-/buy-quest
...
Add information to quests on the Market before you buy them
2014-01-28 18:49:29 -08:00
cd4cb0a552
i18n(subscriber): replace subscriber hard-coded strings for env.t
2014-01-28 22:30:05 -02:00
ffe415e6f3
chore(bailey): add announcement re: STWC processing time
2014-01-28 12:44:19 -08:00
a4524cdb9a
chore(bailey): add bailey for group plans + perfect day achiev. Keep
...
basic-plan announcement up for a bit longer
2014-01-28 12:27:30 -08:00
9226b83d84
Merge pull request #2591 from Alys/patch-2
...
Market "Sell..." button: add spaces, remove bracket
2014-01-28 10:48:54 -08:00
5028707c7b
feat(marketing): add video tuts on "learn more" page until we have some copy
2014-01-28 10:44:33 -08:00
a582a0546d
feat(marketing): some frontpage updates, a screenshot, & "contact us"
...
button mods
2014-01-28 10:36:05 -08:00
abdbaa6fe3
Merge pull request #2583 from Sinza-/split-main-json
...
Split main.json
2014-01-28 10:25:31 -08:00
3785dad215
Merge pull request #2605 from Sinza-/split-fix
...
Remove duplicated 'none' and minor adjusts
2014-01-28 10:24:37 -08:00
f15d825dc5
Merge pull request #2600 from Sinza-/envt-drops
...
Replace hard-coded strings for env.t on drops.jade file
2014-01-28 10:24:13 -08:00
66f95cdd4c
feat(premium): updates to group plans info page
2014-01-28 09:22:46 -08:00
76a7ab5bcc
feat(attributes): Add backfill button in flat and classbased allocation modes
...
Partial implementation of a "distribute points now" button for backfilling accrued Attribute points. Works with flat and classbased allocation so far; taskbased will require much fancier handling.
2014-01-28 08:57:29 -06:00
f7f4a0c166
feat(administrators): start adding features page for admin accounts
2014-01-27 18:24:24 -08:00
0ddaae4d75
feat(homepage): start cleaning up homepage, add navbar for play button & upcoming links
2014-01-27 17:40:43 -08:00
f8bc2d7618
Remove duplicated 'none' and minor adjusts
2014-01-27 23:27:11 -02:00
2e18f0eb82
feat(premium): backport client-side premium code to public repo, it's
...
client-side anyway (@colegleason @paglias)
2014-01-27 16:34:22 -08:00
aa6ee57ca7
Replace hard-coded strings for env.t on drops.jade file
2014-01-27 15:45:46 -02:00
06200accad
fix(translation): Fix #2585 .
...
Since it was working before the env.t replacement I put this as translation (and also because I didn't know what else to put =p).
2014-01-27 14:21:50 -02:00
a0dad56a9b
Market "Sell..." button: add spaces, remove bracket
...
Fix some text appearance issues:
- Use item.text instead of item.key so that users see "Tiger Cub" rather than "TigerCub".
- Remove unwanted ) from end of gold value so that users see "3 Gold" instead of "3) Gold". Bracket had been left over from the end of the old env.t(...) function call - see https://github.com/HabitRPG/habitrpg/commit/4f07ab39b0868764c665bbf914474745e11ecc32
- Add spaces between words so that users see "Sell Fox for 3 Gold" instead of "SellFoxfor3Gold". There are other shorter/neater ways to insert those spaces, but making them really obvious with nbsp is probably the best way to ensure they don't get accidentally removed again.
2014-01-27 19:27:06 +10:00
51bff23885
fix(stable): show hatchable combo when petOwned>0 (fyi @deilann)
2014-01-26 17:46:09 -08:00
5caaff1cea
fix(beastmaster): fixes #2557 , adds opacity to previously-owned pets
...
after they're mounted. You can earn them back again
2014-01-26 17:24:48 -08:00
47bcaf83e7
feat(homepage): use .marketing for centering, add playbutton as static
...
in footer. This is pretty
ugly (http://gyazo.com/215e20729569689ab48cf56c71c1fe28 ), let's iterate
/ prettify. @deilann
2014-01-26 14:22:01 -08:00
286a69fd46
chore(bailey): udpated bailey for premium
2014-01-26 13:59:41 -08:00
62af638e8a
Merge pull request #2570 from deilann/patch-1
...
removed stray paren in profile.jade
2014-01-26 12:41:06 -08:00
4ca67bdee8
Merge pull request #2574 from deilann/copy-3
...
new landing copy
2014-01-26 12:37:49 -08:00
c09d89f872
Fix version conflict
2014-01-26 17:39:36 -02:00
8d41c44ad7
Fix version conflict
2014-01-26 17:37:54 -02:00
8f4016d669
Split main.json
2014-01-26 17:30:41 -02:00
bc1adeb127
fix(mounts): Move avatar upward when mounted regardless of pet
...
Step 1 toward fixing some of our mount sprite positioning issues. If the avatar always moves up when mounted, we gain substantial freedom to reposition the mount, especially on the vertical axis.
2014-01-26 11:02:59 -06:00
4274090205
fix(translations): fix #2564 and similar ones
2014-01-26 14:48:38 +01:00
b44f7088ad
new landing copy
2014-01-25 18:21:56 -08:00
2c0f5fc5d0
removed stray paren
...
Stray parentheses was cutting off destination for the string submitted upon changing names in profiles.
2014-01-25 13:17:01 -08:00
2a91cee0ff
Merge branch 'round-boss' into develop
2014-01-25 13:22:49 -06:00
1412570484
revert(party): Round boss health up instead of to nearest integer
...
This reverts commit 626da5681fFixes #2563 .
2014-01-25 13:22:24 -06:00
11b37c6047
Merge pull request #2553 from djuretic/mark_collected_items
...
Mark collected items in collection quests
2014-01-24 17:36:22 -08:00
1dc68112d1
fix(paypal): fixes #2492 , remove environment check for now, only have
...
production-mode option. revisit
2014-01-24 17:29:10 -08:00
70001b1feb
Mark collected items in collection quests
2014-01-24 22:28:19 -03:00
17c63cdc6e
Replace string for env.t
2014-01-24 20:26:33 -02:00
2eb7ea5e91
Merge pull request #2550 from HabitRPG/paglias/translations-refactoring
...
Refactor translations
2014-01-24 13:53:46 -08:00
5336134c7d
refactor(translations)
2014-01-24 22:49:36 +01:00
0c935f9c9a
Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop
2014-01-24 15:29:17 -06:00
Matteo Pagliazzi