Levi 
								
							 
						 
						
							
							
								
							
							
	eaf1f1de86  
						 
						
							
							
								
								
								Created current user billing address model in membership payment  
							
							
							
							
						 
						
							2016-10-13 23:50:13 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Levi 
								
							 
						 
						
							
							
								
							
							
	082f39e9dc  
						 
						
							
							
								
								
								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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Levi 
								
							 
						 
						
							
							
								
							
							
	447ddc7c2e  
						 
						
							
							
								
								
								finishing digitalglarus booking  
							
							
							
							
						 
						
							2016-09-29 00:04:40 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Levi 
								
							 
						 
						
							
							
								
							
							
	80095ed1aa  
						 
						
							
							
								
								
								#hotfix Fixed select date picker  
							
							
							
							
						 
						
							2016-09-19 19:20:57 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Levi 
								
							 
						 
						
							
							
								
							
							
	974fdd3419  
						 
						
							
							
								
								
								#hotfix removed pdb  
							
							
							
							
						 
						
							2016-09-14 00:45:33 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Levi 
								
							 
						 
						
							
							
								
							
							
	73cc787ca1  
						 
						
							
							
								
								
								Reduced pixels needed to navbar transition color, Added membership deactivation form, Added membership deactivation view, Added membership status, Added membership charged.html, Added membership charged.txt, Extended class to send membership charge email, After membership, charge for first time an email is sent to the user, Fixed bug on redirecting, user to membership payment after signup, Fixed redirecting after buying a membership  
							
							
							
							
						 
						
							2016-09-14 00:24:20 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Levi 
								
							 
						 
						
							
							
								
							
							
	d917c8a606  
						 
						
							
							
								
								
								Fixed cc brand bug, Added button to print/save pdf to  booking order detail view.Added booking order list.Added booking order  list views. Added customised user navbar. Added “my bookings” link to navbar. Added membership active date range. Fixed function to calculate if a membership is active or not.  Added membership order detail view. Added order membership view. Create order membership detail html.Added validation to not allow booking on already booked dates.  
							
							
							
							
						 
						
							2016-09-08 23:24:52 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Levi 
								
							 
						 
						
							
							
								
							
							
	63dd0f3ea0  
						 
						
							
							
								
								
								fixed redirect url  
							
							
							
							
						 
						
							2016-09-05 20:06:20 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Levi 
								
							 
						 
						
							
							
								
							
							
	e3d1761d45  
						 
						
							
							
								
								
								Now booking is only for users with memberships. Added method to know if a membership is active or not. Added new formula for booking pricing. handling border cases when an user want to book. Added booking order detail view. Added booking order detail html.  
							
							
							
							
						 
						
							2016-09-05 19:45:45 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Levi 
								
							 
						 
						
							
							
								
							
							
	2eb2c90b1f  
						 
						
							
							
								
								
								Added membership pricing view. Added membership pricing html. Added membership pricing url. Started booking view. Started integrating booking.js. Added calendar date range js lib. Fixing date picker. Added function to calculate remaining free days. Updated function to calculate booking price. Added BookingDatesForm. Added backend validation for booking dates. fixed booking form. adding pricing to booking payment view. Added free days to booking payment view. Started booking payment stripe flow. Redefined dispatch method to booking view. Now login is required for payment selecting dates and booking. Added date range to booking payment. Fixed booking select dates  view. Added form validations to booking form. Created a order after  a confirm a booking. Added free_days to booking model in order to facilitate free_days Availability for the next booking. Creating a Stripe charge. Creating Booking model instance. Refactor booking payment views. Associated an order to a stripe charge. Associated booking order instance with a booking instance.  
							
							
							
							
						 
						
							2016-08-30 21:32:45 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Levi 
								
							 
						 
						
							
							
								
							
							
	1152e41b6e  
						 
						
							
							
								
								
								Fixed membership payment view issues, Membership creation after a stripe charge, Membership order creation after stripe charge, Added membership activated view, Added membership activated html, Fixing membership cost function, Added function to format membership date ranges, Added membership calculated dates for first month into membership_payment html and membership_activated html  
							
							
							
							
						 
						
							2016-08-22 02:52:29 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Levi 
								
							 
						 
						
							
							
								
							
							
	f56f294205  
						 
						
							
							
								
								
								Fixed blling form goes out of background image, Fixed billing address page "amount" field seems broken, Changed authentication page fonts  
							
							... 
							
							
							
							
							Added new DG login.html, Fixed DG login contact footer, Added new DG login form, Added  DG login, Added DG signup, Added DG reset password, Added DG confirm reset password, Added DG membership payment view
 Please enter the commit message for your changes. Lines starting 
							
						 
						
							2016-08-20 00:57:46 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Levi 
								
							 
						 
						
							
							
								
							
							
	1470caee89  
						 
						
							
							
								
								
								added old dg index  
							
							
							
							
						 
						
							2016-08-16 00:14:57 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Levi 
								
							 
						 
						
							
							
								
							
							
	a27e7f9828  
						 
						
							
							
								
								
								added new index.html and history.html to digitalglarus  
							
							
							
							
						 
						
							2016-08-09 00:54:25 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Levi 
								
							 
						 
						
							
							
								
							
							
	5fce858923  
						 
						
							
							
								
								
								Changed donations.html table style, Added pagination to  donations list view. Hiding donate now button if the user is logged in and already has a donation.Handled the case when an user has not donations yet in donations.html view. Fixed bug on donation signup  
							
							
							
							
						 
						
							2016-08-03 00:50:33 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Levi 
								
							 
						 
						
							
							
								
							
							
	21cd0c21a9  
						 
						
							
							
								
								
								fixed digitalglarus post detail view on DE  
							
							
							
							
						 
						
							2016-07-01 00:40:39 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Levi 
								
							 
						 
						
							
							
								
							
							
	2b50f9fdd9  
						 
						
							
							
								
								
								As an admin I want to be able to create a custom use. As an user I want to see listed only posts in the current selected language.  As an user I want to be able to switch languages between EN-DE  
							
							
							
							
						 
						
							2016-06-23 21:32:51 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Efstratios Goudelis 
								
							 
						 
						
							
							
								
							
							
	adcde9d5c7  
						 
						
							
							
								
								
								Fixed issue with publish flag not be respected when getting blog posts for the site blog. Also for the digitalglarus blog now.  
							
							... 
							
							
							
							
							Related issue: https://redmine.ungleich.ch/issues/2284  
							
						 
						
							2016-05-16 15:56:05 +03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Tomislav R 
								
							 
						 
						
							
							
								
							
							
	ae0c404951  
						 
						
							
							
								
								
								digitalglarus booking update  
							
							
							
							
						 
						
							2016-04-23 19:00:20 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Levi 
								
							 
						 
						
							
							
								
							
							
	d2238106e8  
						 
						
							
							
								
								
								Handled success message from contact form in ungleich, Contact section in ungleich now supports translation, About section in ungleich now supports translation, Footer section in ungleich now supports translation, Portfolio section in ungleich now supports translation, Services section in ungleich now supports translation, Software section in ungleich now supports translation, Fixed digitalglarus about page  
							
							
							
							
						 
						
							2016-04-15 20:18:29 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Levi 
								
							 
						 
						
							
							
								
							
							
	c09fc89197  
						 
						
							
							
								
								
								Divided ungleich landing sections into templates. Moved static files and all files  path were adapted, Ungleich form conected to landing, Reconfigured django urls  
							
							
							
							
						 
						
							2016-04-13 00:31:19 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Levi 
								
							 
						 
						
							
							
								
							
							
	c5e5640e8d  
						 
						
							
							
								
								
								Added translation support for ungleich contact page,  
							
							
							
							
						 
						
							2016-04-12 00:50:15 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Levi 
								
							 
						 
						
							
							
								
							
							
	7dd4f7e70a  
						 
						
							
							
								
								
								Moved contact form model in order to be reusable by ungleich app, Created unit test for digitalglarus contact page, Created ungleich contact page, Created unit test for ungleich contact page, Created unit test for forms .  
							
							
							
							
						 
						
							2016-04-10 16:12:43 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Levi 
								
							 
						 
						
							
							
								
							
							
	45aaec38cf  
						 
						
							
							
								
								
								Merge branch 'develop' of github.com:ungleich/dynamicweb into develop  
							
							
							
							
						 
						
							2016-04-09 03:00:41 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Tomislav R 
								
							 
						 
						
							
							
								
							
							
	36b99b93ef  
						 
						
							
							
								
								
								home added and assigned right template  
							
							
							
							
						 
						
							2016-04-09 08:51:20 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Levi 
								
							 
						 
						
							
							
								
							
							
	9f68d2ad11  
						 
						
							
							
								
								
								cleaning code  
							
							
							
							
						 
						
							2016-04-07 00:30:18 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Levi 
								
							 
						 
						
							
							
								
							
							
	f667aae38e  
						 
						
							
							
								
								
								Adapt copyright copy to use current year, Add bank account info, Set the correct text on supporters page, HTML Form adapted to Django template, Create forms.py to have all forms, Create Contact Django Form View, Create a HTML template to contact email, Send contact email to info@digitalglarus.ch  
							
							
							
							
						 
						
							2016-04-07 00:26:50 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Levi 
								
							 
						 
						
							
							
								
							
							
	10fac88181  
						 
						
							
							
								
								
								template moved  
							
							
							
							
						 
						
							2016-04-03 21:28:04 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Levi 
								
							 
						 
						
							
							
								
							
							
	0e380f6911  
						 
						
							
							
								
								
								Merge branch 'develop' into feature/supporter  
							
							
							
							
						 
						
							2016-04-03 21:15:05 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Levi 
								
							 
						 
						
							
							
								
							
							
	8de47013ad  
						 
						
							
							
								
								
								fixed supporter page, change footer info, added support-us page, changed contact email  
							
							
							
							
						 
						
							2016-04-03 20:39:57 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	858b3ccafa  
						 
						
							
							
								
								
								blog dg fix  
							
							
							
							
						 
						
							2016-04-04 03:32:22 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Tomislav R 
								
							 
						 
						
							
							
								
							
							
	24badb1a9c  
						 
						
							
							
								
								
								updated ungleich  
							
							
							
							
						 
						
							2016-04-03 11:46:25 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Tomislav R 
								
							 
						 
						
							
							
								
							
							
	5fd4275046  
						 
						
							
							
								
								
								updated main pages links  
							
							
							
							
						 
						
							2016-04-01 12:37:01 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Tomislav R 
								
							 
						 
						
							
							
								
							
							
	ddb4de2954  
						 
						
							
							
								
								
								fixed orphaned plugins and add post functionality  
							
							
							
							
						 
						
							2016-03-25 19:18:07 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Tomislav R 
								
							 
						 
						
							
							
								
							
							
	ca033be061  
						 
						
							
							
								
								
								Blog update  
							
							
							
							
						 
						
							2016-03-22 01:21:50 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	1cdf1060a3  
						 
						
							
							
								
								
								adding supporters view  
							
							... 
							
							
							
							
							Signed-off-by: rscnt <rascnt@gmail.com> 
							
						 
						
							2016-02-03 07:27:29 -06:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	e0bb10b2f5  
						 
						
							
							
								
								
								digitalglarus: blog detail small "ugly" fix  
							
							... 
							
							
							
							
							Signed-off-by: rscnt <rascnt@gmail.com> 
							
						 
						
							2015-11-05 01:02:41 -06:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	3035364d39  
						 
						
							
							
								
								
								digitalglarus: index should display home.  
							
							
							
							
						 
						
							2015-10-01 12:49:56 -06:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	f3c14fab11  
						 
						
							
							
								
								
								digitalglarus: templates blog fixed image  
							
							
							
							
						 
						
							2015-09-26 13:42:46 -06:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	2cc4ea226d  
						 
						
							
							
								
								
								digitalglarus: fixed blog views typo  
							
							... 
							
							
							
							
							Signed-off-by: rscnt <rascnt@gmail.com> 
							
						 
						
							2015-09-26 13:31:36 -06:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	d97dd31fc9  
						 
						
							
							
								
								
								views: digitalglarus, added digitalglarus tag on post lookup  
							
							... 
							
							
							
							
							Signed-off-by: rscnt <rascnt@gmail.com> 
							
						 
						
							2015-09-26 13:03:10 -06:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	432689999a  
						 
						
							
							
								
								
								Merge branch 'blog' of github.com:yakky/dynamicweb into feature/digital-glarus-blog  
							
							
							
							
						 
						
							2015-09-25 22:03:27 -06:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	2c4f48a0cb  
						 
						
							
							
								
								
								Changed index page  
							
							... 
							
							
							
							
							The index page is no set to the crowdfounding page.
The old index page is now called home.
The crowdfounding page is now in the menu on the first place,
and the home page second. 
							
						 
						
							2015-09-20 16:37:54 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	e022a422d2  
						 
						
							
							
								
								
								adding digital glarus landing page and fixed price image  
							
							... 
							
							
							
							
							Signed-off-by: rscnt <rascnt@gmail.com> 
							
						 
						
							2015-09-16 01:11:39 -06:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Iacopo Spalletti 
								
							 
						 
						
							
							
								
							
							
	06ade77fce  
						 
						
							
							
								
								
								PoC integration  
							
							
							
							
						 
						
							2015-09-08 06:38:53 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Nico Schottelius 
								
							 
						 
						
							
							
								
							
							
	cd234c4dda  
						 
						
							
							
								
								
								digital_glarus -> digitalglarus  
							
							... 
							
							
							
							
							Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org> 
							
						 
						
							2015-06-10 23:34:33 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Nico Schottelius 
								
							 
						 
						
							
							
								
							
							
	da0ece6d63  
						 
						
							
							
								
								
								digital_glarus -> digitalglarus  
							
							... 
							
							
							
							
							Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org> 
							
						 
						
							2015-06-10 23:34:33 +02:00