Commit graph

104 commits

Author SHA1 Message Date
scribblypanda
b978852e11 added description of login name and link to page to edit display name 2015-01-18 15:55:39 -06:00
scribblypanda
18317f3346 fixed emailChange message, displays properly on localhost 2015-01-18 15:55:39 -06:00
scribblypanda
5a4ebda187 plain text to translatable strings 2015-01-18 15:55:39 -06:00
scribblypanda
c4113994e6 plain text to translatable strings 2015-01-18 15:55:38 -06:00
scribblypanda
330a9191a5 added new translatable string emailChange 2015-01-18 15:55:38 -06:00
scribblypanda
7c990ba109 changed Username to Login Name 2015-01-18 15:55:38 -06:00
Matteo Pagliazzi
193b92c16b fix(cds): max hour is 23 not 24 2015-01-06 23:12:03 +01:00
Tyler Renelle
edf66cbb59 feat(discount) google discount & use sub.key instead of sub.months 2014-12-30 20:05:07 -07:00
Matteo Pagliazzi
4a37bec652 fix(pr): indentation and simplify 2014-12-29 21:21:54 +01:00
Matteo Pagliazzi
752161b284 Merge branch 'dateformat' of git://github.com/Verabird/habitrpg into Verabird-dateformat 2014-12-29 21:09:04 +01:00
Verabird
7297429888 Make it possible to choose between MM/dd and dd/MM date format 2014-12-26 15:52:42 -05:00
breiste
e1eaefa943 Fix #4296 (Subscription "Update Card" message is cut off) 2014-12-24 00:14:08 +01:00
Tyler Renelle
30c1ac4b1e fix(plans): lots of bug fixes & cleanup 2014-12-03 16:01:57 -07:00
Tyler Renelle
0a53a5717e refactor(payments): move payments into it's own service, out of rootCtrl 2014-12-03 14:17:08 -07:00
Tyler Renelle
8c5842eb52 feat(plans): cleanup plans' perks page, rename Time Trinket => Mystic Hourglass 2014-12-03 14:17:08 -07:00
Tyler Renelle
7f2b6b5cfb feat(plans): allow block subscriptions from paypal/stripe 2014-12-03 14:17:07 -07:00
Tyler Renelle
5fd805db88 feat(plans): consectuive-month subscription perks (gifting) 2014-12-03 14:17:07 -07:00
Tyler Renelle
e8dbd5ca1a feat(gifts): allow gifting gems from paypal/stripe 2014-12-03 14:17:07 -07:00
Tyler Renelle
57bfee02cf feat(plans): consecutive months & extra months (like a time-card) 2014-12-03 14:17:07 -07:00
benmanley
50b1cba0a6 refactor(tasks) improve UI consistency
* Round corners for UI elements / “8-bit” outlines for RPG elements.
* Tag bar – Make it clearer that “Tags” is a heading, not an option
* Task filters – restyle in line with tag bar + nav menu
2014-11-27 10:32:57 +00:00
Alice Harris
8d87ce6c1b moved new Dailies default setting to bottom of list to keep together the three settings about task edit mode 2014-10-20 05:49:50 +10:00
Blade Barringer
ed15d0b1c7 Added setting for making the due tab default on dailies 2014-10-16 21:04:23 -05:00
Tyler Renelle
592ffd9818 feat(registration): show some basic registration information on Settings
> Site (if facebook, then "Registered with Facebook". If local, then
username & email)
2014-08-25 18:01:57 -06:00
Tyler Renelle
184e145914 Merge remote-tracking branch 'refs/remotes/nmjones/develop' into develop
Conflicts:
	views/options/settings.jade
2014-08-23 16:05:17 -06:00
Tyler Renelle
a1f2375b9d feat(subscription): disable "update card" for paypal subscribers 2014-07-21 14:55:36 -06:00
Tyler Renelle
dda7f86433 Merge branch 'thedavemarshall-update_billing_info' into develop 2014-07-21 14:48:17 -06:00
David Marshall
5cc4c60329 Edit stripe cc subscriptions 2014-07-21 01:08:56 -07:00
Tyler Renelle
acc874c60d Merge pull request #3597 from 3onyc/feature/username-change
Implement "Change username" feature
2014-07-19 16:48:20 -06:00
Matteo Pagliazzi
f2a10f8fc1 feat(i18n): add notices 2014-07-13 18:00:35 +02:00
Nicolás Jones
272b71fc11 Update settings.jade 2014-06-22 13:45:27 -03:00
Nicolás Jones
9f6e6af5c7 Update settings.jade 2014-06-18 00:10:48 -03:00
Nicolás Jones
207975f592 Update settings.jade 2014-06-18 00:02:35 -03:00
3onyc
5025c4bac6 Implement "Change username" feature 2014-06-14 20:54:07 +02:00
Tyler Renelle
0dadc86a61 fix(subscriptions): expose cancelSubscription on $rootScope (don't know
why $scope doesn't work here). Fix UI bug
2014-05-12 12:18:53 -06:00
Tyler Renelle
b0eb12bb5f feat(subscriptions): allow one month after sub start-date before it's terminated. Fixes #3180 2014-05-06 09:18:44 -06:00
deilann
8e83064ebb fix subscribe cancel button not appearing
Fixes #3383

Show unsubscribe button logic was nested within the non-subscriber text.
2014-04-30 13:02:54 -07:00
benmanley
7f984c859c fix(settings.jade): amend inconsistent html
Correct spelling error
Add .container-fluid to subscriptions view
2014-04-27 13:02:28 +01:00
Tyler Renelle
a608419bba feat(coupons): add coupon-code feature 2014-04-16 23:28:37 -06:00
Tyler Renelle
02eccac0a8 refactor(settings): make settings/site tab prettier 2014-04-16 13:31:13 -06:00
Tyler Renelle
5296a584de Merge pull request #3155 from benmanley/notif-restyle
Consolidate notifications into one menu
2014-04-16 11:40:20 -06:00
benmanley
7f3f80aa4a Replace bootstrap classes in submenus 2014-04-15 23:40:21 +01:00
Tyler Renelle
301bebe1bd refactor(subscriptions): move unsubscribe message to the cancelSub button 2014-03-30 18:36:44 -06:00
Tyler Renelle
0f430e102e feat(subscriptions): add paypal recurring cancelation. refactor stripe & paypal code to use auth.authWithUrl. 2014-03-24 20:47:25 -06:00
Tyler Renelle
d1a2fbbbd9 feat(subscriptions): implement partial paypal-recurring. It's having issues with cookies 2014-03-24 20:47:10 -06:00
Matteo Pagliazzi
c41097b6ec fix(i18n): remove duplicate string 2014-02-24 18:35:48 +01:00
Tyler Renelle
02c283b628 chore(Merge): remote-tracking branch 'marcgenesis/develop' into develop
Conflicts:
	views/options/settings.jade
2014-02-20 16:34:28 -08:00
Tyler Renelle
67876d6306 fix(views): indentation issue, fixes #2913 2014-02-20 12:27:59 -08:00
Hsiao, James (CMG-Atlanta)
0690e1db5a added mysteryItem listing under subscriptions 2014-02-20 11:28:01 -05:00
Marc-André Larivière
dc75834ec4 Changed hints style (and small quick fixes) 2014-02-16 10:13:16 -05:00
Matteo Pagliazzi
fa2c64d2d8 chore(i18n): prepare english for transifex: remove ending or starting space & _comment strings 2014-02-11 19:30:55 +01:00