Tomislav R 
								
							 
						 
						
							
							
								
							
							
	9f2b3a2a31  
						 
						
							
							
								
								
								resolve merge conflicts  
							
							 
							
							
							
							
						 
						
							2016-05-04 17:36:54 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Tomislav R 
								
							 
						 
						
							
							
								
							
							
	3b387d61db  
						 
						
							
							
								
								
								added test  
							
							 
							
							
							
							
						 
						
							2016-05-02 02:00:38 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Tomislav R 
								
							 
						 
						
							
							
								
							
							
	45730e4eb1  
						 
						
							
							
								
								
								update dg payment  
							
							 
							
							
							
							
						 
						
							2016-05-01 14:13:12 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Levi 
								
							 
						 
						
							
							
								
							
							
	3459dc6cbc  
						 
						
							
							
								
								
								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 
								
							 
						 
						
							
							
								
							
							
	fdf8722c8f  
						 
						
							
							
								
								
								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 
								
							 
						 
						
							
							
								
							
							
	fcc1f8fb4b  
						 
						
							
							
								
								
								reverted changes to url structure  
							
							 
							
							
							
							
						 
						
							2016-04-24 23:16:38 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Tomislav R 
								
							 
						 
						
							
							
								
							
							
	5d0b49b6d9  
						 
						
							
							
								
								
								new url structure  
							
							 
							
							
							
							
						 
						
							2016-04-23 20:12:55 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	f7ec020838  
						 
						
							
							
								
								
								: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 
								
							 
						 
						
							
							
								
							
							
	213f295394  
						 
						
							
							
								
								
								digitalglarus booking update  
							
							 
							
							
							
							
						 
						
							2016-04-23 19:00:20 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Levi 
								
							 
						 
						
							
							
								
							
							
	05e73b1d5e  
						 
						
							
							
								
								
								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 
								
							 
						 
						
							
							
								
							
							
	5198333013  
						 
						
							
							
								
								
								fixing url translations  
							
							 
							
							
							
							
						 
						
							2016-04-15 22:25:57 -05:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Levi 
								
							 
						 
						
							
							
								
							
							
	fd66c33299  
						 
						
							
							
								
								
								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 
								
							 
						 
						
							
							
								
							
							
	c33b85626a  
						 
						
							
							
								
								
								Merge branch 'develop' of github.com:ungleich/dynamicweb into develop  
							
							 
							
							
							
							
						 
						
							2016-04-09 03:00:41 -05:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Levi 
								
							 
						 
						
							
							
								
							
							
	0e65c1e717  
						 
						
							
							
								
								
								allowing urls translation into german using .po files  
							
							 
							
							
							
							
						 
						
							2016-04-09 02:53:05 -05:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Tomislav R 
								
							 
						 
						
							
							
								
							
							
	10d3e236ee  
						 
						
							
							
								
								
								home added and assigned right template  
							
							 
							
							
							
							
						 
						
							2016-04-09 08:51:20 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Levi 
								
							 
						 
						
							
							
								
							
							
	bb8c5314bc  
						 
						
							
							
								
								
								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 
								
							 
						 
						
							
							
								
							
							
	979a0bb24d  
						 
						
							
							
								
								
								Merge branch 'develop' into feature/supporter  
							
							 
							
							
							
							
						 
						
							2016-04-03 21:15:05 -05:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Levi 
								
							 
						 
						
							
							
								
							
							
	ceeed874d2  
						 
						
							
							
								
								
								fixed supporter page, change footer info, added support-us page, changed contact email  
							
							 
							
							
							
							
						 
						
							2016-04-03 20:39:57 -05:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Tomislav R 
								
							 
						 
						
							
							
								
							
							
	1d18894b60  
						 
						
							
							
								
								
								updated main pages links  
							
							 
							
							
							
							
						 
						
							2016-04-01 12:37:01 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Tomislav R 
								
							 
						 
						
							
							
								
							
							
	26de99e773  
						 
						
							
							
								
								
								fixed orphaned plugins and add post functionality  
							
							 
							
							
							
							
						 
						
							2016-03-25 19:18:07 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Tomislav R 
								
							 
						 
						
							
							
								
							
							
	6b78bac53b  
						 
						
							
							
								
								
								Blog update  
							
							 
							
							
							
							
						 
						
							2016-03-22 01:21:50 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	0d04a18a0d  
						 
						
							
							
								
								
								server push  
							
							 
							
							
							
							
						 
						
							2016-03-19 21:28:58 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	559fe2f698  
						 
						
							
							
								
								
								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