Commit Graph

51 Commits

Author SHA1 Message Date
Alys e04066e45f Merge pull request #6228 from AminArria/timezone-information
Timezone information
2015-11-24 21:21:10 +10:00
Oliver Eyton-Williams e811693752 Subscriber benefits changed to be dynamic. Fixed arithmetic of gemGoldCap. 2015-11-16 15:11:11 +01:00
Amin Arria b87592c8a7 Changed p blocks to single line 2015-11-15 23:00:44 -04:30
Amin Arria 807726305f Added timezone form 2015-11-12 19:27:25 -04:30
Sabe Jones f4ea6c1d5d feat(sharing): Opt Out WIP
First draft of support for opting out of future modal display on specific events, and adds the second barebones target page for sharing.
2015-10-28 16:36:47 -04:00
Blade Barringer 9ad1dbd8ce Adjust mystic hourglass string to take in interpolation 2015-10-19 08:10:37 -05:00
Blade Barringer 1a2510e4da Adjsut string to take in interpolation 2015-10-19 08:03:27 -05:00
ksami 65dc274e49 Make text in options/settings translatable 2015-10-16 20:48:12 +08:00
Blade Barringer 346440d32c Disable cds button if cds == user's preference 2015-09-06 10:14:44 -05:00
Blade Barringer ee50fec2c1 Tweak wording of custom day start warning 2015-09-06 10:11:28 -05:00
Blade Barringer f1224bc6be Use select instead of an input for cds 2015-09-06 09:36:29 -05:00
Blade Barringer 085a785e4d Convert input to select box 2015-09-06 09:22:40 -05:00
Blade Barringer 9ce6144fa4 Adjustments to custom day start 2015-09-05 15:32:49 -05:00
Blade Barringer 310bb3dfd9 Format settings page 2015-09-05 09:39:30 -05:00
Blade Barringer 9bcaea6fa2 Merge branch 'develop' into carolstone-chron-run-early-issue-4488 2015-09-05 09:32:24 -05:00
Alys e0b57fa2c5 remove Show Classes Tour button from Settings page, and associated code 2015-09-05 17:29:27 +10:00
Blade Barringer ee0bcb5309 Correct class name 2015-08-30 17:52:16 -05:00
Blade Barringer 4af1a4d6ac Rename image rendering class 2015-08-28 21:48:42 -05:00
Blade Barringer df3c498fcc Add rasterize class 2015-08-28 21:41:53 -05:00
carolstone 9fe96b7f94 Renamed variables for clarity.
Moved calculation to actually change lastcron into its own function.

Changed validation errormessage to run: if ( dayStart != Math.floor(dayStart) || dayStart < 0 || dayStart > 24 ) {error message}.

Created new calculation for daystart because daystart could never be
future to the current timestamp. This "fix" has broken the whole endeavor,
though, because cron runs immedately when newlastcron > now and now >
oldlastcron.
2015-08-05 22:47:45 -04:00
Matteo Pagliazzi 4f333c4f8a fix(amazon-payments): swap colors between paypal and amazon 2015-08-03 18:41:34 +02:00
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
Matteo Pagliazzi e0bfd60eb1 amazon payments: switch to green button 2015-07-15 20:07:17 +02:00
Matteo Pagliazzi 8f9fa7942a fix(settings): use correct value for inactivity emails 2015-07-15 00:13:17 +02:00
Matteo Pagliazzi 65f4aac23c feat(amazon-payments): working subscriptions, put donations and gifts on hold 2015-06-30 17:59:30 +02:00
Matteo Pagliazzi 271245f1e6 feat(amazon-payments): finalize one time purchases 2015-06-30 17:59:30 +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
Blade Barringer 08c7ca1833 Refactor email notifications 2015-06-25 20:49:38 -05:00
TheHollidayInn 81a05230e7 Uncheck all email notication options when we click unsubscribe all 2015-06-24 21:38:02 -05:00
Blade Barringer 7a1c5835d0 Final adjustments to PR #5114
* Added test for header ctrl
* Made openModal function more readable
* Only show setting to disable invite friends if party is exactly 1 member big
* Use party.memberCount instead of party.members.length because it's more expressive
2015-06-04 08:48:05 -05:00
TheHollidayInn 5513061d80 Added invite to friends in header, added setting to hide the invite friends, and localized the invite friends string 2015-06-01 21:07:09 -05:00
Blade Barringer 71c65c7a73 change coupon route in angular router to promo 2015-05-08 21:24:57 -05:00
Blade Barringer 1bfc82c636 Merge branch 'develop' into NotGonnaGitUs-develop 2015-05-08 21:02:09 -05:00
NotGonnaGitUs 09a713dbde Changed menu title to "promo codes" instead of "coupons". 2015-05-08 19:36:14 +05:30
NotGonnaGitUs ef0b96e5e4 Changed promo code text. 2015-05-08 10:33:26 +05:30
Matteo Pagliazzi d2198c7572 remove invite friends from settings page 2015-05-05 19:52:06 +02:00
NotGonnaGitUs a45390321e Patched translation fixes and added a few phrases to locales. 2015-05-03 23:41:42 +05:30
hairlessbear 2f33fe6e38 Changed button title to match menu titles 2015-04-26 19:53:35 -04:00
Matteo Pagliazzi 37f7db3c4e feat(emails): add support for weekly recap emails 2015-04-22 16:30:53 +02:00
Kathryn Norris 2fc01ee776 Simplified custom day start info in settings. (#5006) 2015-04-14 16:47:37 -07:00
Kathryn Norris 6a461be0a4 Replaced toggleCustomDayStartInfo function with angular magic. (#5006) 2015-04-14 14:49:45 -07:00
Kathryn Norris ddb7643ff7 Updated the custom day start information in settings. (#5006) 2015-04-13 17:13:22 -07:00
Tyler Renelle 84a77695ea feat(ads): remove ads completely 2015-03-19 11:39:17 -06:00
Matteo Pagliazzi 9e540e86af add email with optional message when kicking user from group 2015-03-18 19:12:53 +01:00
Alice Harris c47606c5b2 remove Show Tour button from Settings->Site; (unrelated to that) delete an outdated comment 2015-03-17 07:49:37 +10:00
Matteo Pagliazzi 397a293ca8 change text for recapture emails settings 2015-02-20 18:15:47 +01:00
Bill Parrott 7042c97d5d removing export functionality to move to its own branch 2015-02-17 14:23:55 -06:00
Bill Parrott b1b478bc74 add task export functionality 2015-02-16 21:21:49 -06:00
Blade Barringer 75c9b5a978 Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert
Conflicts:
	src/controllers/groups.js
	src/controllers/payments/index.js
	src/controllers/user.js
	src/models/user.js
2015-02-09 22:21:27 -06:00
Blade Barringer cc767efa20 Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert
Conflicts:
	src/controllers/auth.js
	src/controllers/challenges.js
	src/controllers/groups.js
	src/controllers/members.js
	src/controllers/payments/index.js
	src/controllers/user.js
	src/middleware.js
	src/models/user.js
2015-02-03 21:13:55 -06:00