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
12d5515879
Change motivate message
2015-07-03 19:13:31 -05:00
dc5b7f31d8
fix(build): Pin working zocial CSS commit
2015-07-03 18:19:39 -05:00
6845e8caf3
fix(experiment): Style fixes
...
Corrects the display of Google Experiment variants in the absence of an API callback, and widens the avatar stat bar for users who don't have a party.
2015-07-03 13:46:22 -05:00
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
fb912313b9
fix(amazon-payments): handle declined payments
2015-07-03 16:54:57 +02:00
313ac91020
improve(amazon-payments): do not redirect after cancellation with ?noRedirect=true
2015-07-03 14:56:19 +02:00
f6480faf22
chore(i18n): update locales
2015-07-03 10:49:35 +02:00
95c29c5c97
Remove one-time bindings
2015-07-02 20:26:31 -05:00
33f2ef7cef
Simplify start party button
2015-07-02 19:36:58 -05:00
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
4d7a3afc93
Merge branch 'LionC-develop' into develop
2015-07-02 07:58:59 -05:00
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
f2cd6f921c
Merge pull request #5543 from hairlessbear/pointer_on_notes_icon
...
Changed task notes icon from 'span' to 'a' element to cause cursor to show icon as clickable
2015-07-02 07:40:12 -05:00
fe7642e33a
Add find the cub art
...
Closes #5545
2015-07-01 20:19:46 -05:00
ba85487b29
Correct naming of backgrounds
2015-07-01 19:50:49 -05:00
ebbc6666a6
Modified broken challenge icon to cause cursor to show item as clickable
2015-07-01 18:00:49 -04:00
6e5f741e4a
Changed task notes from 'span' to 'a' element to cause cursor to show item as clickable
2015-07-01 17:53:45 -04:00
74d51e530f
Merge pull request #5541 from alexbragdon/gulp_fail_fix
...
Gulp Tests now report summaries even when some tests fail.
2015-07-01 15:44:49 -04:00
d248b74569
fix(event): Splash visual tweaks
2015-07-01 14:21:37 -05:00
d6a7bc36c7
Changes hard tabs to double space soft tabs in the error throwing failure block.
2015-07-01 15:20:47 -04:00
45ddc77eaa
Fixes a typo in test:api:safe, missed semicolon on line 97.
2015-07-01 14:45:27 -04:00
9b31cf462a
Creates safe versions of tests for Common, API, Karma, and E2E that don't pass errors via callback. The summary information will check if any tests failed and throw an error after all tests have been run.
2015-07-01 14:42:43 -04:00
5cb6f0f482
Small login form attribute improvements
...
Added "spellcheck='false'" to username inputs to make it less annoying to use on some devices where some usernames will be "corrected" by default.
Added "required" to user/email and password inputs on the login form.
2015-07-01 20:38:57 +02:00
d4b5620ada
Merge branch 'sabrecat/summer-splash' into develop
2015-07-01 13:13:23 -05:00
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
0ea98880be
Merge pull request #5537 from HabitRPG/paglias/amazon-payments
...
feat(amazon-payments): add a lastBillingDate attribute
2015-07-01 19:11:48 +02:00
4e7afcbe94
feat(amazon-payments): add a lastBillingDate attribute
2015-07-01 18:59:51 +02:00
75c25dc7a9
Rollback of /social/index.jade to reverse previous commits changes and return branch to upstream parity.
2015-07-01 10:13:10 -04:00
cbb0988679
Adds a space to social/index.jade to test development platform and git tracking.
2015-07-01 09:59:48 -04:00
851868296f
Merge branch 'Alys-guild-list-links-2015-06-28' into develop
2015-06-30 22:40:35 -05:00
a3f5f626a6
Put h3 and a on one line
2015-06-30 22:39:48 -05:00
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
ca36c5c632
Merge pull request #5531 from HabitRPG/paglias/amazon-payments
...
Amazon Payments Subscriptions
2015-07-01 01:40:27 +02:00
96ec70487f
fix(amazon-payments): remove unused config var
2015-07-01 01:39:52 +02:00
71d8fd2f0c
fix(analytics): Handle missing user object
2015-06-30 17:13:56 -05:00
3d15da61ec
fix(analytics): Correct user ID handling
2015-06-30 16:52:18 -05:00
46a7591492
Merge branch 'release-june-30th-2015' into develop
2015-06-30 13:39:51 -05:00
f88c5fb8b5
chore(news): June 30 Bailey
2015-06-30 12:35:16 -05:00
65f4aac23c
feat(amazon-payments): working subscriptions, put donations and gifts on hold
2015-06-30 17:59:30 +02:00
8747cf4cce
fix(amazon-oayments): use production url
2015-06-30 17:59:30 +02:00
dbce6f7676
fix(amazon-payments): use right url in production
2015-06-30 17:59:30 +02:00
271245f1e6
feat(amazon-payments): finalize one time purchases
2015-06-30 17:59:30 +02:00
78cca423f0
feat(amazon-payments): completely refactor client side flow, support subscription widgets WIP
2015-06-30 17:59:30 +02:00
e38f8bf4ef
amazon payments: wip
2015-06-30 17:59:30 +02:00
a377501f64
feat(amazon-payments): wip on donations
2015-06-30 17:59:30 +02:00
6faef6f737
wip amazon payments
2015-06-30 17:59:30 +02:00
b0643e7177
WIP: start working on amazon payments
2015-06-30 17:59:30 +02:00
cca3e8bfdf
chore(i18n): update locales
2015-06-30 17:59:11 +02:00
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
carolstone