dcc48ea7f7
chore(i18n): update locales
2015-05-17 16:07:18 +02:00
d6547682be
chore(i18n): update locales
2015-05-17 15:54:18 +02:00
86ee687b8b
Moved battle gear popover to right
2015-05-17 09:31:28 -04:00
c1097230a9
Merge pull request #5210 from kma3a/fixes-issue-5183
...
Fixes issue #5183 Leave button and edit group button don't line up
2015-05-17 00:02:34 -05:00
69cd5f8490
Merge branch 'develop' into fixes-issue-5183
2015-05-17 00:44:15 -04:00
43cb46d83d
Merge pull request #5174 from agentx999/skills_clickontask
...
added "click on task" to necessary skill descriptions
2015-05-16 23:08:11 -05:00
da20a493c6
Merge branch 'hairlessbear-level_100_attribute_message' into develop
2015-05-16 22:50:57 -05:00
bc967dd850
Adjust wording of attribute points warning
2015-05-16 22:50:24 -05:00
9017ba7d7e
Hide attribute points counter if you're over 100 and have 0 left
2015-05-16 17:08:06 -05:00
52d869b195
Fixed issue #5203
2015-05-16 16:52:58 -04:00
074b748c80
Merge pull request #5220 from crookedneighbor/fix-front-page-sharing-issue
...
Fix front page avatar sharing issue
2015-05-15 23:25:43 -05:00
3c35b52d27
Hide contributor level if contribText func is not available; put math on scope
2015-05-15 23:08:26 -05:00
f3a6eeb426
Changed button default behavior based on quest progress
2015-05-16 00:01:29 -04:00
d6385a94e9
Front page now shows avatar with link
2015-05-15 22:31:47 -05:00
905c4e8273
Added tabbed display to quest in progress, added profile links, changed button behavior
2015-05-15 23:28:01 -04:00
dd1b2a4b07
In taskDefaults method, added default values for new fields: startDate, everyX, and frequency.
2015-05-15 20:24:47 -07:00
d1805f9181
Fixed issue where incorrect time type passed in for shouldDo’s ‘day’ argument (should be a Date, sometimes Moment is passed in). Fixed incorrect comparison between Moment and Date.
2015-05-15 20:24:47 -07:00
e7cd3ff533
Set DailySchema’s ‘frequency’ default to weekly to maintain backwards compatibility.
2015-05-15 20:24:47 -07:00
fbb636a339
Removed stray debugging console logs.
2015-05-15 20:24:47 -07:00
a763a3a3da
Cleaned up task.jade file:
...
- moved ugly html newlines into the stylesheet
- renamed temporary var for datePicker’s ngmodel from _dateString to _tempDateForPicker
- renamed open -> openDatePicker, and have the function track datePicker’s open/closed state on a per task instead of global basis
2015-05-15 20:24:47 -07:00
1ecf608408
Added support in daily tasks for specifying ’every X days’ and ‘every X weeks on specific days of the week’.
...
- shouldDo() now takes the entire task as an input instead of just the ‘repeat’ (days of the week) dictionary.
- the ‘start’ date for a task can be specified (and can also be in the future, in which case it will be greyed out until then.) ‘start’ date also affects ‘every X days’ and ‘every X weeks’.
- no migration code yet.
2015-05-15 20:24:46 -07:00
420a2a661a
Changed initial tab to invitation list
2015-05-15 19:41:49 -04:00
6ba795ae8c
New style of pending quest display
2015-05-15 15:16:07 -04:00
f06e286f64
adding changes that were suggested from crookedneighbor to make the edit and save button be btn-sm
2015-05-15 11:00:26 -04:00
2ba1a1fc85
Merge branch 'hairlessbear-challenge-achievement-display-fix-redux' into develop
2015-05-15 07:41:46 -05:00
56b6794c66
Correct test string
2015-05-14 22:09:36 -05:00
d7ce151500
Add translatable strings
2015-05-14 21:56:16 -05:00
547d234b46
Add final test for push notifications
2015-05-14 21:32:28 -05:00
ca70e010ca
Merge branch 'develop' into fixes-issue-5183
2015-05-14 21:33:04 -04:00
0af264ef87
changing padding for the leave button on the party page so it will line up with the edit group button
2015-05-14 21:09:41 -04:00
7a2e2fa227
Add tests for invites to guilds or parties
2015-05-14 17:29:33 -05:00
84aaeedfff
Add challenges test
2015-05-14 07:32:16 -05:00
2fac464160
Remove extranious pushSpy declaration
2015-05-13 19:35:26 -05:00
023458b6e5
Add test for getting push notification when gifted a subscription
2015-05-13 19:31:26 -05:00
3cbd5fd9ff
Merge branch 'develop' into negue-WIP-Push-notifications
2015-05-13 19:11:57 -05:00
d6e1d765da
adjust Inn message when user is already Resting - https://github.com/HabitRPG/habitrpg/issues/5128#issuecomment-99233779
2015-05-14 08:13:13 +10:00
89d1d63b24
Merge pull request #5198 from SabreCat/pet-skins
...
Pet Skins and Ears
2015-05-13 15:44:23 -05:00
84b333e5c1
fix(unlocks): Handle undefined/null balance
2015-05-13 15:34:23 -05:00
6e27b7af9d
fix(purchases): Handle undefined/null balance
2015-05-13 15:15:40 -05:00
68ce9a8457
fix(test): Unlock takes query, not params
2015-05-13 14:34:20 -05:00
0cb1d8ec9a
test(purchases): Gem buying tests
...
Also corrects the byline for Inn improvements to credit primary coder @hairlessbear.
2015-05-13 14:21:13 -05:00
05f6e5e14d
fix(flags): correctly send flag reports emails
2015-05-13 20:08:46 +02:00
b639896ae6
chore(i18n): update locales
2015-05-13 19:47:59 +02:00
35ff90b4d3
Merge remote-tracking branch 'origin/new_inn_behavior_PR' into pet-skins
2015-05-13 12:12:57 -05:00
3abec07119
chore(news): Bailey
2015-05-13 11:44:52 -05:00
2b8414766b
chore(grunt): compile sprites
2015-05-13 11:19:33 -05:00
29109051d7
feat(customize): Animal skins and ears
...
Implements a base-pet-themed set of avatar skins and head accessories, the latter of which has additional handling for the user to purchase them from the Avatar Customization page.
2015-05-13 11:19:08 -05:00
8e5cdbd742
Fixed challenges achievement always displaying (again)
...
Unearned achievements are hidden when viewing others' profiles, but are visible when a user views their own profile. Currently, the challenges achievement is displayed when viewing other users' profiles, even when they have not won any. This PR makes the challenges achievement display to other users' only when one or more challenges have been won.
2015-05-13 12:12:03 -04:00
5ee6e94190
Merge pull request #3 from HabitRPG/develop
...
Update from original
2015-05-13 12:04:01 -04:00
93472c8a1e
Merge pull request #2 from HabitRPG/develop
...
Update from original
2015-05-13 12:02:37 -04:00
Matteo Pagliazzi