carolstone
3fa3b491dc
Modified common/script/index.coffee to display dayStart, but send back a
...
variable of dayStart for processing, instead of having the object directly
updated at the time of edit.
Modified website/views/options/settings.jade to allow a timestamp to be
cast to an iso timestamp because lastCron is saved as an iso timestamp,
and as a straight moment()-based timestamp in order to compare timestamps.
Modified website/public/js/controllers/settingsCtrl.js to do the
following:
Accept the new proposed dayStart
Calculate the timestamp of the old dayStart and the new dayStart
These two steps were necessary because dayStart is an integer between
and including 0 and 23. I tested and confirmed the current production
dayStart does not allow 24 to be entered but does allow 0. I was
careful to NOT change how that worked.
Cast the old dayStart, the new dayStart and lastCron to the moment()
version of time so they could be compared.
Cast the new dayStart to the iso timestamp for storage in lastCron
The important change is the following:
if oldDayStart < lastCron AND lastCron < newDayStart then lastCron
should be set to newDayStart. I modified this to include if oldDayStart
= lastCron, although I think that's pretty unlikely to be possible.
When I tested this, my lastCron was a mere 17 seconds after my
oldDayStart, so it seemed to me that the equal case should be included
with the less than case.
2015-07-17 21:17:07 -04:00
Blade Barringer
e924157fdf
Merge pull request #5508 from Alys/trivial-difficulty
...
add Trivial difficulty/priority setting to task Advanced Options
2015-07-03 10:08:46 -05:00
Matteo Pagliazzi
f6480faf22
chore(i18n): update locales
2015-07-03 10:49:35 +02:00
Sabe Jones
fb81c79b78
feat(analytics): Invite Friends experiment
...
Disables the prior landing page Google Experiment and begins a new one involving the placement and captioning of the button for inviting friends to the user's party.
2015-07-02 16:13:22 -05:00
Blade Barringer
4d7a3afc93
Merge branch 'LionC-develop' into develop
2015-07-02 07:58:59 -05:00
Blade Barringer
4bcff71859
Adjust login modal
...
* Rename loginForm
* Use larger buttons for logging in or registering
* Use fully translated placeholder text
2015-07-02 07:58:11 -05:00
Blade Barringer
fe7642e33a
Add find the cub art
...
Closes #5545
2015-07-01 20:19:46 -05:00
Blade Barringer
ba85487b29
Correct naming of backgrounds
2015-07-01 19:50:49 -05:00
Sabe Jones
d248b74569
fix(event): Splash visual tweaks
2015-07-01 14:21:37 -05:00
Sabe Jones
25dd82ffa0
feat(event): Summer Splash cont'd
...
Summer backgrounds, the Seafoam transformation item, and announcements for same.
2015-07-01 13:11:53 -05:00
Alys
eeb9793eb8
Merge pull request #5526 from Alys/cron-fix-yet-again-2015-06-30
...
make api.shouldDo use the day being checked as the default date instead of today
2015-07-01 13:17:01 +10:00
Sabe Jones
46a7591492
Merge branch 'release-june-30th-2015' into develop
2015-06-30 13:39:51 -05:00
Matteo Pagliazzi
cca3e8bfdf
chore(i18n): update locales
2015-06-30 17:59:11 +02:00
Alys
2cd34b0f6e
make api.shouldDo use the day being checked as the default date instead of today - fixes https://github.com/HabitRPG/habitrpg/issues/5521
2015-06-30 14:28:00 +10:00
Blade Barringer
4304e56e70
Merge pull request #5511 from Alys/use-costume-explanation-2015-06-28
...
make costume option more noticeable and understandable
2015-06-29 19:25:44 -05:00
Blade Barringer
547523c8f7
Merge branch 'crookedneighbor-blade-refactor-clone-challenges' into release-june-30th-2015
2015-06-29 17:56:42 -05:00
Matteo Pagliazzi
2f48534342
chore(i18n): update locales
2015-06-29 18:14:46 +02:00
Alys
a946f2b5a5
rename "show more/less" locale keys to be generic; change to those keys for Use Costume text and Custom Day Start text; move Use Costume "show less" link to bottom of section
2015-06-29 21:49:54 +10:00
Alys
a4e9e5dbfc
replace Gokul Theme audio files with new versions https://github.com/HabitRPG/habitrpg/pull/5407#issuecomment-116251843
2015-06-29 13:16:14 +10:00
Alys
11396d4756
make costume option more noticeable and understandable - fixes https://github.com/HabitRPG/habitrpg/issues/5204
2015-06-28 19:40:39 +10:00
Alys
122920975d
add Trivial difficulty/priority setting to task Advanced Options (also remove whitespace at ends of lines)
2015-06-28 14:41:02 +10:00
Blade Barringer
2dd7894a2c
Merge branch 'image-min' into develop
2015-06-27 16:41:24 -05:00
Alys
eceae75631
Merge pull request #5482 from Alys/startDate-fix-2015-06-25
...
Refactor api.shouldDo and fix https://github.com/HabitRPG/habitrpg/issues/5395
2015-06-28 07:31:04 +10:00
Blade Barringer
7aa2bb0db5
Chore(compile sprites)
2015-06-27 16:24:12 -05:00
Alys
d7a203ccc2
set all daily repeat code and tests to use true/false instead of 1/0 for consistency with DailySchema; comment-out unused default Daily repeat code
2015-06-27 20:06:04 +10:00
Matteo Pagliazzi
fd11b054eb
chore(i18n): update locales
2015-06-26 18:17:14 +02:00
Andy Martin
0fb911016a
shrink spritesmith images to reduce page load
2015-06-25 22:25:14 -06:00
Sabe Jones
335acd276c
fix(sprites): Reposition snorkely things
2015-06-25 15:08:26 -05:00
Sabe Jones
775f903c3d
feat(events): Limited edition
...
Summer Splash skins and June mystery item. Also announces the Gokul sound theme.
2015-06-25 11:19:01 -05:00
Matteo Pagliazzi
7f0b826943
chore(i18n): update locales
2015-06-25 11:51:48 +02:00
Alys
51fb278438
stop changing the task's actual Start Date, move related task Start Date code tothe same place, adjust comments
2015-06-25 12:19:27 +10:00
Alys
9b8b7af7d5
replace api.numDaysApart (not used elsewhere and new to the EveryXDays code) with moment#diff
2015-06-25 12:19:26 +10:00
Alys
e7e82a2aed
keep startDate as a moment(), fix check for Start Date in future (ignore time, don't do incorrect CDS conversion), add comments
2015-06-25 12:19:26 +10:00
Alys
266055c0d4
rename 'day' variable to 'startOfDayWithCDSTime' (more verbose, sorry, but clearer)
2015-06-25 12:19:26 +10:00
Alys
99bc09fb25
move dayOfWeekNum to correct scope and improve comment
2015-06-25 12:19:26 +10:00
Alys
f6cdc57228
move dailyTask.repeat error handling to correct location; add dailyTask.everyX error handling (might not be needed)
2015-06-25 12:19:26 +10:00
Alys
bacd35b895
refactor shouldDo check for Daily's startDate being in the future
2015-06-25 12:19:26 +10:00
Matteo Pagliazzi
782ae4f81c
chore(i18n): update locales
2015-06-23 10:43:29 +02:00
Matteo Pagliazzi
e03bf6a711
fix(i18n): remove unused, empty string that was breaking Transifex
2015-06-23 10:38:30 +02:00
Matteo Pagliazzi
2c41553d7a
chore(i18n): update locales
2015-06-23 10:31:10 +02:00
Matteo Pagliazzi
afc6fba5bf
chore(i18n): update locales
2015-06-22 18:24:37 +02:00
Blade Barringer
38e24571da
Merge branch 'develop' into TheHollidayInn-challenges-clone
...
Take specHelper off of global scope
2015-06-21 18:59:11 -05:00
Alys
c6256d7fa1
fix https://github.com/HabitRPG/habitrpg/issues/5439 for the other darned gear types that I freaking forgot about
2015-06-21 17:32:46 +10:00
Alys
fc9f511542
allow Body Accessory equipment to be purchased from Seasonal Shop - fixes https://github.com/HabitRPG/habitrpg/issues/5439
2015-06-21 16:37:56 +10:00
Sabe Jones
c3b4950314
Merge branch 'sabrecat/summer-splash' into develop
2015-06-20 23:08:03 -05:00
Sabe Jones
3641bea441
feat(event): Summer Splash 2015
...
Summer seasonal event for 2015, including festive NPC graphics, the summer edition of the Seasonal Shop, and new class equipment available in Rewards.
2015-06-20 23:07:14 -05:00
Blade Barringer
96162b37bd
Merge pull request #5433 from gisikw/ultimate-gear-fix
...
Ultimate gear fix
2015-06-20 17:34:47 -05:00
Alys
6eac1174a2
sort eligibleEquipment before choosing random item from Enchaned Armoire - possible partial fix for https://github.com/HabitRPG/habitrpg/issues/5376#issuecomment-111799217
2015-06-20 20:22:27 +10:00
Kevin Gisi
f32305458a
Fix armoire edge case
2015-06-20 01:58:54 -04:00
Sabe Jones
f6fafc5b6d
WIP(event): Summer Splash 2015
2015-06-19 10:42:20 -05:00