Commit graph

30 commits

Author SHA1 Message Date
Matteo Pagliazzi
4f333c4f8a fix(amazon-payments): swap colors between paypal and amazon 2015-08-03 18:41:34 +02: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
Blade Barringer
8a8ce8d80d Moved folders to website directory 2015-02-03 14:10:55 -06:00
Renamed from views/options/settings.jade (Browse further)