73ebdf01af
Merge pull request #3898 from lynnyliz/develop
...
Columns were made longer by hovering over the last task in the list
2014-08-21 11:04:29 -06:00
7e9e00a593
fixed an issue where hovering over the last item in a column would cause the column to lengthen if the item contained an Extra Notes bubble
2014-08-20 21:11:28 -04:00
2f6e49f8bb
Merge pull request #3897 from Alys/questImage
...
add quest image to party page for collection quests - fixes https://github.com/HabitRPG/habitrpg/issues/3892
2014-08-20 18:08:06 -06:00
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
50a34eb6c7
fix(tags): fix sortable tags by separating edit & !edit into diff
...
<ul>s (cc @Fandekasp)
2014-08-19 15:21:39 -06:00
88d27e2153
Merge branch 'Fandekasp-sortable_tags' into develop
...
Conflicts:
public/js/directives/directives.js
2014-08-19 15:00:36 -06:00
750135b673
feat(sortable): use angular-ui-sortable instead of jqueryui directly
2014-08-19 14:35:10 -06:00
ba8cda2e51
Merge pull request #3425 from denis-sokolov/user-findtask-patch
...
chore(user): tiny cleanup in findTask function
2014-08-19 13:12:51 -06:00
978d0e0528
Merge remote-tracking branch 'remotes/denis-sokolov/patch-1' into develop
...
Conflicts:
README.md
2014-08-19 13:05:43 -06:00
3ca84d8ef1
Merge pull request #3139 from mapleoin/partygems
...
fix Guild Gems strings on the party tab
2014-08-19 12:55:11 -06:00
b85caaf248
Merge pull request #2079 from fmarier/optimized_images
...
Optimized images
2014-08-19 12:50:13 -06:00
cac37d75bf
Merge pull request #3846 from titilambert/develop
...
Add docker file
2014-08-19 12:48:08 -06:00
6340312695
fix(fbAuth): get user email @lefnire this should be all we need but not having the keys i can not test before going live
2014-08-19 04:41:04 +02:00
faed77f186
bailey(mobile):
2014-08-18 19:58:47 -06:00
ab9393b694
bailey(audio): add bailey for audio
2014-08-18 19:12:05 -06:00
a88fde9862
feat(quests): parrot quest
2014-08-18 19:04:31 -06:00
81b96b0f7e
fix(i18n): add support for latin american spanish
2014-08-18 19:17:40 +02:00
6db5b53c81
fix(groupsServices): allow for direct modification of data @lefnire it is necessary for mobile but does not break anything
2014-08-18 13:48:01 +02:00
6d251aeb91
feat(mobile): adapt boss box to mobile
2014-08-17 15:39:12 +02:00
4c8309c8cc
fix(jade): fix warings
2014-08-17 13:32:09 +02:00
0837f2c39b
fix(mobile): start adapting boss to mobile
2014-08-17 13:29:40 +02:00
15641b5f37
fix(i18n): add moment support for chinese
2014-08-16 20:16:44 +02:00
890db5bd6d
Merge pull request #3858 from pizzeys/develop
...
Fix gem text alignment on the menubar.
2014-08-15 20:07:22 -06:00
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
06b6b4cde0
Merge pull request #3856 from Fandekasp/add_audio
...
Add audio
2014-08-15 17:30:12 -06:00
fb16458efd
bailey(quests): lvl 15 ATOM drop
2014-08-12 16:18:26 -07:00
2ad5d4b00b
Merge pull request #3870 from Alys/dropNotifications
...
adds drop notifications for eggs, food - partial? fix for https://github.com/HabitRPG/habitrpg/issues/3787
2014-08-12 07:29:41 +10:00
2566ddac94
fixes missing drop notifications - fixes https://github.com/HabitRPG/habitrpg/issues/3787
2014-08-12 07:14:50 +10:00
e5bb299ad0
Make tags sortable with drag&drop
2014-08-10 23:00:27 +09:00
46809f1f3e
remove migration script
2014-08-09 20:01:24 +09:00
e00ea4c248
add missing sound actions
2014-08-09 19:09:58 +09:00
d7aaec2262
fix bug switch audio wasn't working
2014-08-09 18:57:17 +09:00
a5f1e30880
fix bug music not playing if music menu not open + integrate daily/todo/reward sounds
2014-08-09 17:29:56 +09:00
dcbd460331
fix audio menu style
2014-08-09 16:58:49 +09:00
da6f7a4418
Fix gem text alignment on the menubar.
...
I'm not much of a frontend guy so I'm not sure if there was some reason
for this one being different, but it throws the alignment off so I
assume it was a mistake.
Fixes #3855
2014-08-08 18:00:12 +01:00
2cf8083693
improving music menu
2014-08-08 23:37:04 +09:00
3d2d8fbfef
clean branch from develop to add audio
2014-08-08 23:03:52 +09:00
b19649ce37
Merge pull request #3832 from jobywalker/fix-hurts-the-boss
...
Fix hurts the boss
2014-08-07 10:52:09 -06:00
cd40470f28
Update docker file
2014-08-07 00:39:57 -04:00
8d1b17320a
Update to wrap async calls with async.parallel
2014-08-06 21:10:54 -07:00
a8ad9f89e8
reinsert default blue flower https://github.com/HabitRPG/habitrpg/issues/1529
2014-08-07 13:50:29 +10:00
2d34c1cb9b
Merge pull request #3818 from cstyles/null-history
...
Don't display chart if history is empty (#3691 )
2014-08-06 18:38:30 -06:00
38a49b577f
Merge pull request #3849 from Alys/requestAF
...
change Request Feature link in footer, Tavern link box, CONTRIBUTING.md fixes https://github.com/HabitRPG/habitrpg/issues/3848
2014-08-07 10:13:46 +10:00
e500407466
change Request Feature link in footer, Tavern link box, CONTRIBUTING.md
2014-08-07 09:59:31 +10:00
f3707dfe15
bailey(backgrounds): august backgrounds
2014-08-05 15:16:49 -06:00
33b2e8c4fe
fix(flower): remove default on flower for now, #1529 @Alys
2014-08-05 13:08:40 -06:00
a355d8856d
Add docker file
2014-08-05 11:58:01 -04:00
0871dd074c
Merge pull request #3837 from vIiRuS/patch-4
...
display avatar with closed eyes when sleeping
2014-08-04 16:41:25 -07:00
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
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