M.Ravi d537fcb118 Manual merge of ungleich/master into opennebula-integration		2017-04-24 03:01:05 +05:30
..
locale/de/LC_MESSAGES	Manual merge of ungleich/master into opennebula-integration	2017-04-24 03:01:05 +05:30
management	#hotfix removed import pdb	2016-10-14 01:06:09 -05:00
migrations	Finished #2759 #2748 #2747	2016-12-04 19:44:26 -05:00
static	Manual merge of ungleich/master into opennebula-integration	2017-04-24 03:01:05 +05:30
templates	Manual merge of ungleich/master into opennebula-integration	2017-04-24 03:01:05 +05:30
__init__.py
admin.py	Finished #2759 #2748 #2747	2016-12-04 19:44:26 -05:00
cms_plugins.py
forms.py	Manual merge of ungleich/master into opennebula-integration	2017-04-24 03:01:05 +05:30
mixins.py	#2770	2016-12-08 18:29:28 -05:00
models.py	Manual merge of ungleich/master into opennebula-integration	2017-04-24 03:01:05 +05:30
test_views.py	Added url in booking&price menu bar button. Fixed bug when user booked for 1 days and two free days were being given. Created UserBillingAddress. Created UserBillingAddress Form.Created UserBillingAddress after first user payment. Added Previous Billing data to booking payment view if there is one. Moved booking button. Fixed error on free days in booking invoice. Added modal to cancel subscription page. Now a member can booking without entering his billing address or credit card info. Fixed error on free days.Current user billing address is showed on billing and booking order details. Edit billing address form added.Added user_billing_address.html. Added user billing address get views. Filled user billing address view with current user billing address.Now an user can edit his billing address. Added is_free flag in Select Booking Dates in order to now if a booking is free. Changed Booking Order Model in order to allow free payments. Added free payment template. Added free payment into Booking Payment View. Fixed issue #2586: new digitalglarus navbar font change.Fixed issue #2608 : style fix new DG.Fixed #2617: fix input fields and btn responsiveness on DG payment page. Fixed #2620: responsive issue in DG order summary.Fixed #2623: Order history style fix for deativate button and message below.Fixed #2625: DG membership activation page fix. Fixed #2616: fix navbar responsivness for new DG. Fixed #2619: credit card input field responsiveness fix	2016-10-13 23:33:48 -05:00
urls.py	Manual merge of ungleich/master into opennebula-integration	2017-04-24 03:01:05 +05:30
views.py	Manual merge of ungleich/master into opennebula-integration	2017-04-24 03:01:05 +05:30