Commit graph

24 commits

Author SHA1 Message Date
Rushabh Mehta
e71fb55702 Merge branch 'develop' into fix-urlencode 2017-08-11 13:01:24 +05:30
Aditya Hase
e324406c8a Import six.moves.urllib.parse.urlencode instead of urllib.urlencode 2017-08-11 00:38:26 +05:30
Aditya Hase
769338f136 Replaced all instances of basestring with six.string_types 2017-08-11 00:10:11 +05:30
Aditya Hase
375dfd601d Replaced urlparse imports with six.moves.urllib.parse (#3847) 2017-08-03 11:43:28 +05:30
Rushabh Mehta
d45cf60c6c [fix] expiry message 2017-04-13 14:52:29 +05:30
Saurabh
86ebaf22aa [fix] dissable additiona users by creation date 2016-12-21 12:34:28 +05:30
Rushabh Mehta
ecfb630246 [minor] print format in web form 2016-10-12 14:12:41 +05:30
Rushabh Mehta
f91977f7da [feature] allow multiple sessions per user 2016-08-10 17:31:29 +05:30
Valmik Jangla
6fbc5a9506 added country in url for upgrade url 2016-07-25 17:17:38 +05:30
Rushabh Mehta
1d7c8db398 [fix] frappe/erpnext#5790 2016-07-21 17:42:55 +05:30
Anand Doshi
b3546f1ebc [fix] show 'click here' in expiry message if upgrade_url is available 2016-07-14 17:43:52 +05:30
Anand Doshi
5ebfe2e771 [fix] show clickable link in expiry message 2016-07-14 16:27:33 +05:30
Valmik Jangla
427743e8a9 Email to renew after expiry 2016-07-14 15:53:55 +05:30
Anand Doshi
820a1e01a6 [fix] added set-limits, changed clear-limit to clear-limits 2016-07-04 00:32:32 +05:30
Anand Doshi
dab12e3342 [fix] limits and site info 2016-06-26 14:43:23 +05:30
Anand Doshi
a7ace6ae38 [fix] limits and site_info 2016-06-25 21:56:27 +05:30
Anand Doshi
571de33901 [fix] test cases for limits change 2016-06-25 19:08:36 +05:30
Anand Doshi
537cd8a5eb [fix] update_limits 2016-06-25 18:16:14 +05:30
Anand Doshi
3854bcad04 [fix] limits variables and how usage is stored within limits + additional fixes 2016-06-25 17:41:19 +05:30
Valmik Jangla
59a39c208d Fixed issues in Usage Info page 2016-06-24 14:38:40 +05:30
Rushabh Mehta
461adc7c37 [fix] more rename from bulk to email queue 2016-06-22 13:19:58 +05:30
Rushabh Mehta
da95b484db [fix] merge fixes and test 2016-06-22 13:10:23 +05:30
Valmik Jangla
0687eb145d Added misc Frappe Subscription features 2016-06-22 12:37:33 +05:30
shreyas
9511e14353 Move Frappe subscription features to Frappe App as Limits 2016-06-10 16:34:53 +05:30