Commit graph

5240 commits

Author SHA1 Message Date
Tyler Renelle
6af2eb2fc7 Merge pull request #3920 from negue/fixLevelTooltip
fix level tooltip
2014-08-25 12:19:34 -06:00
Negue
0ddcea95f1 fix level tooltip 2014-08-25 19:04:03 +02:00
Negue
8fa565e9a0 get a list of buyable gear 2014-08-25 18:23:04 +02:00
Alice Harris
a2b0612212 allow bower install to run without asking for permission to collect stats 2014-08-25 12:32:15 +10: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
494e7eeff4 Merge pull request #3907 from Alys/notifHiding
allow notifications icon to go grey when all messages have been seen - fixes https://github.com/HabitRPG/habitrpg/issues/3270
2014-08-23 16:09:56 -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
1ca981d90a allow notification icon to go grey by deleting seen message data instead of setting to false 2014-08-23 14:51:34 +10:00
Alice Harris
f307f5593c add migration script to remove undefined guild notifications and false guild notifications 2014-08-23 12:19:41 +10:00
Tyler Renelle
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
lynnyliz
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
Tyler Renelle
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
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
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
Tyler Renelle
978d0e0528 Merge remote-tracking branch 'remotes/denis-sokolov/patch-1' into develop
Conflicts:
	README.md
2014-08-19 13:05:43 -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
b85caaf248 Merge pull request #2079 from fmarier/optimized_images
Optimized images
2014-08-19 12:50:13 -06:00
Tyler Renelle
cac37d75bf Merge pull request #3846 from titilambert/develop
Add docker file
2014-08-19 12:48:08 -06:00
Matteo Pagliazzi
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
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
81b96b0f7e fix(i18n): add support for latin american spanish 2014-08-18 19:17:40 +02:00
Matteo Pagliazzi
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
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
Alice Harris
3c971b630e create a mongodb JavaScript script to report on how many users own specified gear 2014-08-17 17:25:53 +10:00
Matteo Pagliazzi
15641b5f37 fix(i18n): add moment support for chinese 2014-08-16 20:16:44 +02:00
Tyler Renelle
890db5bd6d Merge pull request #3858 from pizzeys/develop
Fix gem text alignment on the menubar.
2014-08-15 20:07:22 -06: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
Alice Harris
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
Alice Harris
2566ddac94 fixes missing drop notifications - fixes https://github.com/HabitRPG/habitrpg/issues/3787 2014-08-12 07:14:50 +10:00
Adrien Lemaire
e5bb299ad0 Make tags sortable with drag&drop 2014-08-10 23:00:27 +09:00
Adrien Lemaire
46809f1f3e remove migration script 2014-08-09 20:01:24 +09:00
Adrien Lemaire
e00ea4c248 add missing sound actions 2014-08-09 19:09:58 +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
Sam Pizzey
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
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
Tyler Renelle
b19649ce37 Merge pull request #3832 from jobywalker/fix-hurts-the-boss
Fix hurts the boss
2014-08-07 10:52:09 -06:00
Thibault Cohen
cd40470f28 Update docker file 2014-08-07 00:39:57 -04:00