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
e7cd3ff533
Set DailySchema’s ‘frequency’ default to weekly to maintain backwards compatibility.
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
2ba1a1fc85
Merge branch 'hairlessbear-challenge-achievement-display-fix-redux' into develop
2015-05-15 07:41:46 -05:00
89d1d63b24
Merge pull request #5198 from SabreCat/pet-skins
...
Pet Skins and Ears
2015-05-13 15:44:23 -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
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
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
f7f126c352
Add alert box to dailies resting in the inn message
2015-05-13 07:29:17 -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
4050e9ad0c
Fix guilds not loading ＼(^ω^＼)
2015-05-12 22:28:06 -05:00
ff41a2c240
Refactor group tests
2015-05-12 08:08:55 -05:00
d448ca3ac5
fix(groups): do not try to add members to a party when it does not exists
2015-05-11 22:13:31 +02:00
ae8b170446
fix(emails): remove base url from server
2015-05-11 20:44:52 +02:00
30fd8e26e6
revert last 2 commits
2015-05-11 17:02:36 +02:00
e966de7bf0
feat(emails): add field to keep track of weekly recap emails
2015-05-11 16:54:44 +02:00
fc1f6ba0b9
fix(emails): always use main site as base url
2015-05-11 15:43:35 +02:00
8badc7d1a9
Add coupon api tests
2015-05-10 14:54:45 -05:00
109ca1b67c
Correct bullet list position; fixes #5181
2015-05-10 14:16:11 -05: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
5123bdb4c4
Merge pull request #5080 from joyclark/develop
...
Fixing the grid view for mounts so that the animals are aligned correctly.
2015-05-10 19:01:56 +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
382add82c3
feat(tutorial): put tut back in, we just need to replace it in near future
2015-05-08 12:58:43 -04:00
09a713dbde
Changed menu title to "promo codes" instead of "coupons".
2015-05-08 19:36:14 +05:30
4ccfaa974f
Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop
2015-05-08 08:45:24 -05:00
8569f7b749
Merge branch 'joyclark-autocomplete-click-behavior' into develop
2015-05-08 08:45:06 -05:00
ef0b96e5e4
Changed promo code text.
2015-05-08 10:33:26 +05:30
38056a4837
fix(stats) removed extraneous class bonus
...
Even leveled users below level 100 were showing an extra 0.5 stat class bonus. This was due to the level bonus being a float, instead of an integer. Used `Math.ceil` to fix the level bonus, thus removing the extraneous 0.5 class bonus.
2015-05-08 00:05:44 +01:00
30546ccf12
remove extraneous comment
2015-05-07 17:51:51 -05:00
9884ed71f8
Merge branch 'develop' into TheHollidayInn-join-button-fix
2015-05-07 17:50:57 -05:00
47121fa70d
Update tests to use get url, added not member tests, and updated logic to prevent users from being added to public guilds
2015-05-07 15:59:21 -05:00
e628dba5e8
Merge pull request #5087 from negue/copyMessageTodo
...
copy chat messages as todo
2015-05-07 22:21:42 +02:00
4f7c9cd445
feat(guide): temporarily remove current tutorial, add simple ? to expand help
2015-05-07 14:31:53 -04:00
cb9738251f
Add isUserInvited to if statement
2015-05-07 13:26:22 -05:00
25fe1d34d6
fix(groups): you should not be able to join a group you are not invited to
2015-05-07 18:56:41 +02:00
2a375a120c
feat(backgrounds): prettify news
2015-05-06 19:48:47 -05:00
00db42b6c0
feat(backgrounds): May BGs
2015-05-06 19:41:54 -05:00
7d08358791
fix(registration) do not re-enable registrations if the first one is successfull
2015-05-06 16:23:15 +02:00
8066589268
disable registration while request in progress
2015-05-06 15:43:30 +02:00
bcb7b75380
Fixed conditional and spacing
2015-05-05 20:13:53 -05:00
84a4c36c7e
Merge branch 'NotGonnaGitUs-RestingatInnText' into develop
2015-05-05 19:45:42 -05:00
d482fdcea5
Refactor tavern view
2015-05-05 19:45:05 -05:00
d2198c7572
remove invite friends from settings page
2015-05-05 19:52:06 +02:00
ca90de7a55
Merge pull request #5144 from NotGonnaGitUs/FrontPageLinkFix
...
Fixed broken business link
2015-05-05 17:34:53 +02:00
Blade Barringer