Tomislav R 
								
							 
						 
						
							
							
								
							
							
	52ea4eec49  
						 
						
							
							
								
								
								resolve merge conflicts  
							
							 
							
							
							
							
						 
						
							2016-05-04 17:36:54 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Tomislav R 
								
							 
						 
						
							
							
								
							
							
	b19e33b8da  
						 
						
							
							
								
								
								added test  
							
							 
							
							
							
							
						 
						
							2016-05-02 02:00:38 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Tomislav R 
								
							 
						 
						
							
							
								
							
							
	65e3cdeb94  
						 
						
							
							
								
								
								update dg payment  
							
							 
							
							
							
							
						 
						
							2016-05-01 14:13:12 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Levi 
								
							 
						 
						
							
							
								
							
							
	de48f1ce69  
						 
						
							
							
								
								
								Fixes digitalglarus urls, Added translated text to ungleich landing page, Create user’s order template, Created view  to  list all user’s orders, Adding some style to pricing template  
							
							 
							
							
							
							
						 
						
							2016-04-29 01:53:24 -05:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Levi 
								
							 
						 
						
							
							
								
							
							
	bf334a38d4  
						 
						
							
							
								
								
								Added Hosting Order model, Created Billing Address Model , Method to create a customer using Stripe API , Created Customer Stripe profile to store for further charges , Method in order to charge an amount to a customer  
							
							 
							
							
							
							
						 
						
							2016-04-26 01:16:03 -05:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Tomislav R 
								
							 
						 
						
							
							
								
							
							
	2dff11d446  
						 
						
							
							
								
								
								reverted changes to url structure  
							
							 
							
							
							
							
						 
						
							2016-04-24 23:16:38 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Tomislav R 
								
							 
						 
						
							
							
								
							
							
	b72a2795f0  
						 
						
							
							
								
								
								new url structure  
							
							 
							
							
							
							
						 
						
							2016-04-23 20:12:55 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	c653917358  
						 
						
							
							
								
								
								:Merge branch 'updating_calendar' of  https://github.com/tmslav/dynamicweb  into tmslav-updating_calendar  
							
							 
							
							... 
							
							
							
							
							Conflicts:
	dynamicweb/urls.py 
							
						 
						
							2016-04-23 19:08:23 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Tomislav R 
								
							 
						 
						
							
							
								
							
							
	ae0c404951  
						 
						
							
							
								
								
								digitalglarus booking update  
							
							 
							
							
							
							
						 
						
							2016-04-23 19:00:20 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Levi 
								
							 
						 
						
							
							
								
							
							
	7c891fe9c4  
						 
						
							
							
								
								
								Fixed ungleich urls, created model for storing VM types, created command to load VM prices and data to database  
							
							 
							
							
							
							
						 
						
							2016-04-17 19:52:19 -05:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Levi 
								
							 
						 
						
							
							
								
							
							
	043d5f28c3  
						 
						
							
							
								
								
								fixing url translations  
							
							 
							
							
							
							
						 
						
							2016-04-15 22:25:57 -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 
								
							 
						 
						
							
							
								
							
							
	45aaec38cf  
						 
						
							
							
								
								
								Merge branch 'develop' of github.com:ungleich/dynamicweb into develop  
							
							 
							
							
							
							
						 
						
							2016-04-09 03:00:41 -05:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Levi 
								
							 
						 
						
							
							
								
							
							
	d90a95a3d4  
						 
						
							
							
								
								
								allowing urls translation into german using .po files  
							
							 
							
							
							
							
						 
						
							2016-04-09 02:53:05 -05:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Tomislav R 
								
							 
						 
						
							
							
								
							
							
	36b99b93ef  
						 
						
							
							
								
								
								home added and assigned right template  
							
							 
							
							
							
							
						 
						
							2016-04-09 08:51:20 +02: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 
								
							 
						 
						
							
							
								
							
							
	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  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									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  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	039399b95b  
						 
						
							
							
								
								
								server push  
							
							 
							
							
							
							
						 
						
							2016-03-19 21:28:58 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	1cdf1060a3  
						 
						
							
							
								
								
								adding supporters view  
							
							 
							
							... 
							
							
							
							
							Signed-off-by: rscnt <rascnt@gmail.com> 
							
						 
						
							2016-02-03 07:27:29 -06:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	a4c3c341a3  
						 
						
							
							
								
								
								digitalglarus: changes on urls  
							
							 
							
							
							
							
						 
						
							2015-10-04 16:48:33 -06:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	1b17e2aac1  
						 
						
							
							
								
								
								digitalglarus: fix urls for blog.  
							
							 
							
							... 
							
							
							
							
							Signed-off-by: rscnt <rascnt@gmail.com> 
							
						 
						
							2015-10-04 15:38:53 -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