mirror of
https://github.com/HabitRPG/habitica.git
synced 2025-12-17 22:57:21 +01:00
Merge branch 'teh-maxh-patch-1' into develop
This commit is contained in:
@@ -26,9 +26,9 @@ footer.footer(ng-controller='FooterCtrl')
|
|||||||
li
|
li
|
||||||
a(target='_blank', href='http://blog.habitrpg.com/')=env.t('companyBlog')
|
a(target='_blank', href='http://blog.habitrpg.com/')=env.t('companyBlog')
|
||||||
li
|
li
|
||||||
a(href='http://habitrpg.wikia.com/wiki/App_and_Extension_Integrations', target='_blank')=env.t('companyExtensions')
|
a(href='http://habitica.wikia.com/wiki/App_and_Extension_Integrations', target='_blank')=env.t('companyExtensions')
|
||||||
li
|
li
|
||||||
a(target='_blank', href='http://habitrpg.wikia.com/wiki/FAQ')=env.t('FAQ')
|
a(target='_blank', href='http://habitica.wikia.com/wiki/FAQ')=env.t('FAQ')
|
||||||
li
|
li
|
||||||
a(href='/static/privacy')=env.t('companyPrivacy')
|
a(href='/static/privacy')=env.t('companyPrivacy')
|
||||||
li
|
li
|
||||||
@@ -45,28 +45,28 @@ footer.footer(ng-controller='FooterCtrl')
|
|||||||
li
|
li
|
||||||
a(target='_blank', href='https://trello.com/c/odmhIqyW/440-read-first-table-of-contents')=env.t('communityFeature')
|
a(target='_blank', href='https://trello.com/c/odmhIqyW/440-read-first-table-of-contents')=env.t('communityFeature')
|
||||||
li
|
li
|
||||||
a(target='_blank', href='https://habitrpg.com/static/api')=env.t('API')
|
a(target='_blank', href='https://habitica.com/static/api')=env.t('API')
|
||||||
li
|
li
|
||||||
a(href='http://habitrpg.wikia.com/wiki/App_and_Extension_Integrations', target='_blank')=env.t('communityExtensions')
|
a(href='http://habitica.wikia.com/wiki/App_and_Extension_Integrations', target='_blank')=env.t('communityExtensions')
|
||||||
li
|
li
|
||||||
a(target='_blank', href='http://habitrpg.wikia.com/wiki/Special:Forum')=env.t('communityForum')
|
a(target='_blank', href='http://habitica.wikia.com/wiki/Special:Forum')=env.t('communityForum')
|
||||||
li
|
li
|
||||||
a(target='_blank', href='http://www.kickstarter.com/projects/lefnire/habitrpg-mobile')=env.t('communityKickstarter')
|
a(target='_blank', href='http://www.kickstarter.com/projects/lefnire/habitrpg-mobile')=env.t('communityKickstarter')
|
||||||
li
|
li
|
||||||
a(target='_blank', href='https://www.facebook.com/Habitrpg')=env.t('communityFacebook')
|
a(target='_blank', href='https://www.facebook.com/Habitica')=env.t('communityFacebook')
|
||||||
li
|
li
|
||||||
a(target='_blank', href='http://www.reddit.com/r/habitrpg/')=env.t('communityReddit')
|
a(target='_blank', href='http://www.reddit.com/r/habitrpg/')=env.t('communityReddit')
|
||||||
.col-sm-3
|
.col-sm-3
|
||||||
if (env.NODE_ENV == 'production' && !env.IS_MOBILE)
|
if (env.NODE_ENV == 'production' && !env.IS_MOBILE)
|
||||||
h4=env.t('footerSocial')
|
h4=env.t('footerSocial')
|
||||||
.addthis_toolbox.addthis_default_style(addthis:url='https://habitrpg.com', addthis:title=env.t('socialTitle'))
|
.addthis_toolbox.addthis_default_style(addthis:url='https://habitica.com', addthis:title=env.t('socialTitle'))
|
||||||
table
|
table
|
||||||
tr
|
tr
|
||||||
td
|
td
|
||||||
a.addthis_button_facebook_like(fb:like:layout='button_count')
|
a.addthis_button_facebook_like(fb:like:layout='button_count')
|
||||||
tr
|
tr
|
||||||
td
|
td
|
||||||
a.addthis_button_tweet(tw:via='habitrpg')
|
a.addthis_button_tweet(tw:via='habitica')
|
||||||
tr
|
tr
|
||||||
td
|
td
|
||||||
iframe(src='/bower_components/github-buttons/github-btn.html?user=habitrpg&repo=habitrpg&type=watch&count=true', allowtransparency='true', frameborder='0', scrolling='0', width='85px', height='20px')
|
iframe(src='/bower_components/github-buttons/github-btn.html?user=habitrpg&repo=habitrpg&type=watch&count=true', allowtransparency='true', frameborder='0', scrolling='0', width='85px', height='20px')
|
||||||
|
|||||||
Reference in New Issue
Block a user