Michael Looby
5f8a76e579
Fix for issue #3477 , 'No "Contact Us" at Bottom of the page. Added the new link and used the existing env.t('contactUs') string so all the translations are correct. Also added the link to layout.jade because that was stubbed out there in comments. Both links go to a new page with other links as described in the issue.
2014-08-26 15:10:33 -04:00
Tyler Renelle
592ffd9818
feat(registration): show some basic registration information on Settings
...
> Site (if facebook, then "Registered with Facebook". If local, then
username & email)
2014-08-25 18:01:57 -06:00
Tyler Renelle
2cc251149c
feat(mystery): august mystery
2014-08-25 17:16:41 -06:00
Tyler Renelle
13f6c5fddd
Merge pull request #3913 from negue/pushToTopTooltip
...
Tooltip: Push to top
2014-08-25 12:22:52 -06:00
Negue
0ddcea95f1
fix level tooltip
2014-08-25 19:04:03 +02:00
Negue
c74f983c03
Tooltip: Push to top
2014-08-25 00:35:22 +02:00
Tyler Renelle
ef548ec9ed
Merge pull request #3588 from negue/feat_pushToTop
...
feat(todolist): Push To Top Button
2014-08-23 17:05:32 -06:00
Tyler Renelle
184e145914
Merge remote-tracking branch 'refs/remotes/nmjones/develop' into develop
...
Conflicts:
views/options/settings.jade
2014-08-23 16:05:17 -06:00
Alice Harris
fdf8aa696e
add quest image to party page for collection quests - fixes https://github.com/HabitRPG/habitrpg/issues/3892
2014-08-21 06:27:01 +10:00
Tyler Renelle
50a34eb6c7
fix(tags): fix sortable tags by separating edit & !edit into diff
...
<ul>s (cc @Fandekasp)
2014-08-19 15:21:39 -06:00
Tyler Renelle
88d27e2153
Merge branch 'Fandekasp-sortable_tags' into develop
...
Conflicts:
public/js/directives/directives.js
2014-08-19 15:00:36 -06:00
Tyler Renelle
750135b673
feat(sortable): use angular-ui-sortable instead of jqueryui directly
2014-08-19 14:35:10 -06:00
Tyler Renelle
3ca84d8ef1
Merge pull request #3139 from mapleoin/partygems
...
fix Guild Gems strings on the party tab
2014-08-19 12:55:11 -06:00
Tyler Renelle
faed77f186
bailey(mobile):
2014-08-18 19:58:47 -06:00
Tyler Renelle
ab9393b694
bailey(audio): add bailey for audio
2014-08-18 19:12:05 -06:00
Tyler Renelle
a88fde9862
feat(quests): parrot quest
2014-08-18 19:04:31 -06:00
Matteo Pagliazzi
6d251aeb91
feat(mobile): adapt boss box to mobile
2014-08-17 15:39:12 +02:00
Matteo Pagliazzi
4c8309c8cc
fix(jade): fix warings
2014-08-17 13:32:09 +02:00
Matteo Pagliazzi
0837f2c39b
fix(mobile): start adapting boss to mobile
2014-08-17 13:29:40 +02:00
Tyler Renelle
39911ef8e0
feat(audio): refactor user.preferences.{sound,soundTheme} into just
...
user.preferences.sound. Fix audio dropdown bug by moving to list-items instead
2014-08-15 18:13:59 -06:00
Tyler Renelle
06b6b4cde0
Merge pull request #3856 from Fandekasp/add_audio
...
Add audio
2014-08-15 17:30:12 -06:00
Tyler Renelle
fb16458efd
bailey(quests): lvl 15 ATOM drop
2014-08-12 16:18:26 -07:00
Adrien Lemaire
e5bb299ad0
Make tags sortable with drag&drop
2014-08-10 23:00:27 +09:00
Adrien Lemaire
d7aaec2262
fix bug switch audio wasn't working
2014-08-09 18:57:17 +09:00
Adrien Lemaire
a5f1e30880
fix bug music not playing if music menu not open + integrate daily/todo/reward sounds
2014-08-09 17:29:56 +09:00
Adrien Lemaire
dcbd460331
fix audio menu style
2014-08-09 16:58:49 +09:00
Adrien Lemaire
2cf8083693
improving music menu
2014-08-08 23:37:04 +09:00
Adrien Lemaire
3d2d8fbfef
clean branch from develop to add audio
2014-08-08 23:03:52 +09:00
Alice Harris
e500407466
change Request Feature link in footer, Tavern link box, CONTRIBUTING.md
2014-08-07 09:59:31 +10:00
Tyler Renelle
f3707dfe15
bailey(backgrounds): august backgrounds
2014-08-05 15:16:49 -06:00
deilann
0871dd074c
Merge pull request #3837 from vIiRuS/patch-4
...
display avatar with closed eyes when sleeping
2014-08-04 16:41:25 -07:00
Alice Harris
34a2e4c07a
Merge pull request #3841 from Alys/defaultAvatar
...
split hairstyles into Base (free) and Set 1 (gems) fixes https://github.com/HabitRPG/habitrpg/issues/1529
2014-08-05 08:14:09 +10:00
benmanley
a6d101202c
fix(avatar.jade): change .notBackground to .noBackgroundImage
...
avatar.jade was applying a class of .notBackground, but the css in
avatar.styl used .noBackgroundImage.
* Changed .notBackground to .noBackgroundImage in avatar.jade and
avatar.styl
* Consolidated css and added more comments
* Amended spacing as Stylus wasn’t compiling correctly
* Removed #profileStable and .pet css as couldn’t find reference to
them anywhere else.
* Commented out styles indicating who is party leader for now. Need a
solution that doesn’t involve background color.
2014-08-04 22:45:10 +01:00
Tyler Renelle
b8b76d6ce9
fix(bailey): tweak
2014-08-04 13:46:25 -06:00
Tyler Renelle
2b2dd97f80
bailey(mobile): update on mobile fix
2014-08-04 13:43:41 -06:00
Matteo Pagliazzi
50d888e7f8
feat(backgrounds): move backgrounds to mixin
2014-08-04 14:41:59 +02:00
Phillip Thelen
49d056fe14
display avatar with closed eyes when sleeping
...
Display the sleeping version, when users are in the inn.
CAUTION: For this to work, this pull request will have to be merged first: https://github.com/HabitRPG/habitrpg-shared/pull/269
Otherwise the _sleep images are missing. ;)
2014-08-03 20:39:09 +02:00
Matteo Pagliazzi
1d92ddd645
feat(i18n): add change language button on front page, fix #3530
2014-08-03 18:23:13 +02:00
Alice Harris
e340d584cd
split hairstyles into Base (free) and Set 1 (gems) https://github.com/HabitRPG/habitrpg/issues/1529
2014-08-03 15:56:44 +10:00
Alice Harris
46dbb0b78a
Merge pull request #3799 from Alys/avatarNameContribColour
...
apply contributor tier color to avatar name - fixes https://github.com/HabitRPG/habitrpg/issues/3735
2014-08-02 13:08:20 +10:00
Alice Harris
2c70c25028
Merge pull request #3792 from Alys/showMoreBackground
...
show more avatar background (remove Lvl, hide avatar name)
2014-08-02 13:06:07 +10:00
Jeremy Lee
26741773c9
split Player Tiers table into entries for individual tiers; partially implement new moderator and staff tiers (still invisible to users)
2014-08-02 10:46:16 +10:00
Tyler Renelle
04f1459cca
bailey(dilatory): forgot announcement on drag'on defeat
2014-08-01 13:44:43 -06:00
Tyler Renelle
38f64c71c2
bailey(august):
2014-07-31 17:37:18 -06:00
Tyler Renelle
072881f986
Merge pull request #3793 from Alys/backgroundOrder
...
display backgrounds in reverse chronological order (most recent at top)
2014-07-30 23:08:12 -06:00
Tyler Renelle
9efda1d955
fix(bailey): small tweaks to 7/31 (spacing, remove project files)
2014-07-30 17:17:51 -06:00
Lemoness
983aaf9682
7/31 Bailey Announcement
2014-07-30 16:08:55 -07:00
Lemoness
4f5b450b38
Bailey reminder - 7/31
2014-07-30 15:55:17 -07:00
Alice Harris
a87b651caf
apply contributor tier color to avatar name
2014-07-29 08:53:23 +10:00
Blade Barringer
d7351932aa
Merge branch 'develop' of git://github.com/HabitRPG/habitrpg into develop
2014-07-27 19:56:09 -05:00