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
14b01836c5
fix(merge)
2014-01-28 19:10:07 +01:00
6ac7f9e5c7
merge @speg pr
2014-01-28 19:08:35 +01:00
66f95cdd4c
feat(premium): updates to group plans info page
2014-01-28 09:22:46 -08: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
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
cc934b577e
chore(license): remove conflicting text ( fixes #2596 ), and simply reference the GPLv3 file by URL. Assets & content designed by BQ are CC-BY-SA, for HabitRPG are CC-BY-NC-SA
2014-01-27 15:42:42 -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
51bff23885
fix(stable): show hatchable combo when petOwned>0 (fyi @deilann)
2014-01-26 17:46:09 -08:00
1d8539837c
Merge pull request #2576 from Sinza-/mult-sell-buttons
...
Fix multiple sell buttons appearing simultanously when clicking on food + egg or potion
2014-01-26 17:26:42 -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
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
de2c0280b2
Fix multiple sell buttons appearing simultanously when clicking on food + egg or potion
2014-01-26 01:18:54 -02:00
b44f7088ad
new landing copy
2014-01-25 18:21:56 -08:00
117c26cfd3
Added tests for translations (env.t)
2014-01-25 21:01:43 -03: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
ecbe780e70
fix(find_uniq_user): fix
2014-01-24 17:04:01 -08:00
13131087ff
fix(translations): add env.t to rootScope
2014-01-24 23:19:17 +01: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
626da5681f
fix(party): Round boss health up instead of to nearest integer
...
If the boss has something like 0.2 HP it shows as 0 which is confusing
to the user. Let's round up instead.
Fixes #2504 .
2014-01-24 15:27:30 -06:00
d107db7013
refactor(translations)
2014-01-24 21:27:06 +01:00
8e99186e9c
refactor(translations): achievements
2014-01-24 20:07:02 +01:00
95f1dc6e60
improve(translation): allow for data interpolation
2014-01-24 18:08:54 +01:00
a9095f3464
fix(translations): remove translations for privacy & terms
2014-01-24 17:38:21 +01:00
756e7be751
Merge branch 'fix-spaces' of git://github.com/Sinza-/habitrpg into
...
Sinza--fix-spaces
2014-01-24 17:12:00 +01:00
ed71522131
Fix version conflict
2014-01-24 07:28:30 -02:00
fe99bca10f
Fix spacing errors #2536
2014-01-23 21:58:38 -02:00
38b4cea732
fix(tests): include select2 in test manifest
2014-01-23 10:12:17 -08:00
13a7cc9d55
improve(translations): merge pr and lots of fixes
2014-01-23 17:02:16 +01:00
50953ddf81
Merge pull request #2525 from Sinza-/develop
...
Replace a line for env.t
2014-01-23 06:01:06 -08:00
6f3229c679
Update tavern.jade
2014-01-23 10:16:32 +01:00
669789df67
Update index.jade
2014-01-23 09:45:34 +01:00
50f992b63c
Update hall.jade
2014-01-23 09:43:17 +01:00
ab84219835
Update group.jade
2014-01-23 09:40:31 +01:00
ed180692e3
Update create-group.jade
2014-01-23 09:36:32 +01:00
6fb88ee1b5
Update chat-message.jade
2014-01-23 09:35:18 +01:00
Matteo Pagliazzi