8b347bca8b
Remove everyX check from weeklies; Change UI of frequency selection; Prep for monthlies in UI
2015-05-26 17:59:11 -05:00
cfd2f7003b
Merge branch 'develop' into fallenpanda1-improved_dailies
2015-05-23 08:44:56 -05:00
90dd078a6a
Fixed bug where we were using moment.startOf instead of api.startOfDay in shouldDo.
2015-05-23 02:29:06 -07:00
56f0e3ae4a
Removed unnecessary TODOs.
2015-05-22 22:18:17 -07:00
664bf491d2
Adjust fallenPanda's PR
...
* Use enum for frequency in task model
* Adjust ui of task selection
* Correct check for hasStarted
* Remove semicolons
* Set default start day to today
* Correct perfect day and resting in inn tests to have dailies with start dates of a week ago
* Add tests for dailies/weeklies functionality
2015-05-22 22:14:58 -07:00
1f0dbef3c7
Merge pull request #5234 from hairlessbear/ethereal_surge_split_fix
...
Fixed Ethereal Surge notification split
2015-05-22 23:23:34 -05:00
fe2e0618b8
Make Invite-friends-to-group dialog translatable
...
UI strings of the dialog of invitation to the group made translatable
2015-05-23 02:44:32 +05:00
2440b312a2
Made two lines translatable
...
Addressing #10 and #11 in the OP of
https://github.com/HabitRPG/habitrpg/issues/4522
* "Send gift" (in the form that pops up when you click on username
label)
* "Invite Friends" button (in "Members" section in guilds and party)
2015-05-21 17:12:16 +05:00
13faf8d0c7
feat(pets): Sheep Quest
2015-05-20 20:45:18 -07:00
2b72050827
fix(accessories): Buyback for ears
...
Fixes #5236 .
2015-05-20 13:10:05 -07:00
bd76b762e6
Merge pull request #5212 from HabitRPG/negue-WIP-Push-notifications
...
Negue wip push notifications
2015-05-18 11:14:53 -05:00
fd8fabad43
Fixed Ethereal Surge notification split
2015-05-18 00:45:44 -04:00
46c426856d
Correct text
2015-05-17 10:06:40 -05:00
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
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
52d869b195
Fixed issue #5203
2015-05-16 16:52:58 -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
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
d7ce151500
Add translatable strings
2015-05-14 21:56:16 -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
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
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
dca45d7845
Enable new inn behavior
2015-05-13 08:44:08 -05:00
2ac763cc50
add message about Resting in the Inn to top of Dailies column when preferences.sleep is true
2015-05-13 16:56:52 +10:00
1cc07129f1
Merge branch 'develop' into pushNotifications2
...
Conflicts:
test/api.mocha.coffee
2015-05-10 22:01:41 +02:00
c123ca6a42
Correct casing of translatable string
2015-05-10 09:13:05 -05:00
6c5d9f3a6c
Tried to make line translatable
...
Tried to make the "Only group leader can create challenges" line in the
guild creation dialog translatable
2015-05-10 08:59:43 -05:00
1dec4ba7a6
allow MP gained for Habits and Dailies to be increased when a critical hit occurs (crits are triggered in addPoints)
2015-05-10 18:17:17 +10:00
71c65c7a73
change coupon route in angular router to promo
2015-05-08 21:24:57 -05:00
1bfc82c636
Merge branch 'develop' into NotGonnaGitUs-develop
2015-05-08 21:02:09 -05:00
84979b137d
Update spells.json
...
modified Backstab, Brutal Smash, Burst of Flames, and Pickpocket descriptions
2015-05-08 18:32:18 -07:00
90edb7719f
Merge branch 'develop' into pushNotifications2
2015-05-08 23:21:18 +02:00
ef0b96e5e4
Changed promo code text.
2015-05-08 10:33:26 +05:30
e628dba5e8
Merge pull request #5087 from negue/copyMessageTodo
...
copy chat messages as todo
2015-05-07 22:21:42 +02:00
040e6e0a41
chore(grunt):compile sprites
2015-05-06 19:53:08 -05:00
00db42b6c0
feat(backgrounds): May BGs
2015-05-06 19:41:54 -05:00
a91b544830
typo
2015-05-06 16:18:14 +02:00
a1fb1468ba
chore(i18n): update locales
2015-05-05 19:52:20 +02:00
a090fed10b
feat(analytics): "motivate yourself" 3 variants @lemoness
2015-05-04 15:31:00 -04:00
Blade Barringer