Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,516 Commits 64 Branches 1,256 Tags
d45f40ca1fa6e7c9d320ee87bf20c2e48a19ee8a
Commit Graph

84 Commits

Author SHA1 Message Date
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
Tyler Renelle ffb42906e1 feat(event-tracking): start adding some client-side GA event-tracking 2014-02-10 11:33:40 -07:00
Matteo Pagliazzi 1a44c3cf0c refactor(bs3): css 2014-02-09 16:16:43 +01:00
Matteo Pagliazzi 0fe0cb4f2d refactor(bs3): labels style and text, buttons classes 2014-02-08 16:27:34 +01:00
Matteo Pagliazzi 5b9bbb9729 refactor(bs3): settings 2014-02-05 19:54:50 +01:00
Matteo Pagliazzi 07593dc122 refactor(bs3): port quests modals, fix restore modal and various bugs 2014-02-02 16:43:58 +01:00
Matteo Pagliazzi 571954b5cf refactor(bs3): misc fixes, port restore, delete and reset modals 2014-02-02 16:06:30 +01:00
Matteo Pagliazzi cc348b2f11 refactor(bs3): sync with develop & misc 2014-01-31 20:04:40 +01:00
Matteo Pagliazzi 0764aa8c17 refactor(bs3): convert icons to new format 2014-01-31 19:47:48 +01:00
Matteo Pagliazzi 76db2d49c2 18n(merge): merge @Sinza- pr, @lefnire now it is ready 2014-01-30 22:25:42 +01:00
Marcelo Sizer 44d9ea2a15 i18n(interpolation): Add string interpolation 2014-01-30 18:25:25 -02:00
Matteo Pagliazzi 5f0cf6575c fix(settings): remove unnecessary code 2014-01-30 18:44:53 +01:00
Marcelo Sizer cd4cb0a552 i18n(subscriber): replace subscriber hard-coded strings for env.t 2014-01-28 22:30:05 -02:00
Tyler Renelle f7f4a0c166 feat(administrators): start adding features page for admin accounts 2014-01-27 18:24:24 -08:00
Tyler Renelle 2e18f0eb82 feat(premium): backport client-side premium code to public repo, it's 
client-side anyway (@colegleason @paglias)
 2014-01-27 16:34:22 -08:00
Matteo Pagliazzi 5336134c7d refactor(translations) 2014-01-24 22:49:36 +01:00
Matteo Pagliazzi a6c67f1781 fix(translations): merge @luveluen pull request, fix some syntax 2014-01-22 16:09:32 +01:00
Sabe Jones 5ddf09fe13 fix(settings): reintroduce space between captions and help bubbles stripped during localization 2014-01-21 19:52:04 -06:00
Matteo Pagliazzi 52decb7ede fix(translations): @lefnire now everything is ok 2014-01-20 17:51:43 +01:00
Matteo Pagliazzi fba739535b fix(translations): correct some variables 2014-01-20 17:25:14 +01:00
Luveluen 68041f206c Update settings.jade 2014-01-19 22:02:55 +01:00