Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	a5972c1b4a
						 | 
						
							
							
								
								
								do not commit the secret-key
							
							
							
							
							
							
							
								
								
							
							
							Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org> 
							
						 | 
						
							2015-09-08 01:21:28 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	c1e1e4f998
						 | 
						
							
							
								
								
								read secret key from file
							
							
							
							
							
							
							
								
								
							
							
							Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org> 
							
						 | 
						
							2015-09-03 20:05:08 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	874fdf85a2
						 | 
						
							
							
								
								
								read secret key from file
							
							
							
							
							
							
							
								
								
							
							
							Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org> 
							
						 | 
						
							2015-09-03 20:05:08 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	51373f3c22
						 | 
						
							
							
								
								
								read secret key from file
							
							
							
							
							
							
							
								
								
							
							
							Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org> 
							
						 | 
						
							2015-09-03 20:04:12 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	16008512b2
						 | 
						
							
							
								
								
								Merge branch 'feature/notifybymail' into develop
							
							
							
							
							
								
								
							
							
						 | 
						
							2015-09-03 19:56:39 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	a69ac73f5d
						 | 
						
							
							
								
								
								Add cards
							
							
							
							
							
							
							
								
								
							
							
							Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org> 
							
						 | 
						
							2015-09-03 19:56:31 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	42b0acd45e
						 | 
						
							
							
								
								
								merge railshosting into hosting
							
							
							
							
							
							
							
								
								
							
							
							Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org> 
							
						 | 
						
							2015-08-27 18:33:10 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	b72dd9c3ca
						 | 
						
							
							
								
								
								Merge remote-tracking branch 'origin/feature/djangohosting' into feature/notifybymail
							
							
							
							
							
								
								
							
							
						 | 
						
							2015-08-27 18:31:59 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									상희 김
								
							 
						 | 
						
							
							
								
							
							
	b087ad4f15
						 | 
						
							
							
								
								
								Add missing images/css
							
							
							
							
							
								
								
							
							
						 | 
						
							2015-08-27 18:28:45 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									상희 김
								
							 
						 | 
						
							
							
								
							
							
	cb09599804
						 | 
						
							
							
								
								
								Do NOT ignore static in subfolders
							
							
							
							
							
								
								
							
							
						 | 
						
							2015-08-27 18:28:25 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	59ef61dfe8
						 | 
						
							
							
								
								
								merge from sanghee
							
							
							
							
							
							
							
								
								
							
							
							Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org> 
							
						 | 
						
							2015-08-27 18:21:15 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	2bf346495e
						 | 
						
							
							
								
								
								begin refactor to /hosting/
							
							
							
							
							
							
							
								
								
							
							
							Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org> 
							
						 | 
						
							2015-08-27 18:20:08 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									상희 김
								
							 
						 | 
						
							
							
								
							
							
	2e6cd7d8ef
						 | 
						
							
							
								
								
								house for sale image
							
							
							
							
							
								
								
							
							
						 | 
						
							2015-08-16 14:31:09 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	8b4e9f451e
						 | 
						
							
							
								
								
								do not list vanity domains anymore - nginx should filter them
							
							
							
							
							
							
							
								
								
							
							
							Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org> 
							
						 | 
						
							2015-08-14 23:35:28 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	e8455e4e46
						 | 
						
							
							
								
								
								do not list vanity domains anymore - nginx should filter them
							
							
							
							
							
							
							
								
								
							
							
							Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org> 
							
						 | 
						
							2015-08-14 23:35:28 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	e933b065ca
						 | 
						
							
							
								
								
								remove obsolete css
							
							
							
							
							
							
							
								
								
							
							
							Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org> 
							
						 | 
						
							2015-08-09 22:25:07 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	3b49fbfe1e
						 | 
						
							
							
								
								
								Merge remote-tracking branch 'origin/feature/djangohosting' into feature/notifybymail
							
							
							
							
							
							
							
								
								
							
							
							Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org> 
							
						 | 
						
							2015-08-09 22:24:23 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	51a398927f
						 | 
						
							
							
								
								
								Merge branch 'master' into feature/notifybymail
							
							
							
							
							
								
								
							
							
						 | 
						
							2015-08-09 22:15:29 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									상희 김
								
							 
						 | 
						
							
							
								
							
							
	589f0f60a7
						 | 
						
							
							
								
								
								nodejs created
							
							
							
							
							
								
								
							
							
						 | 
						
							2015-08-09 22:13:38 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	09e36288ae
						 | 
						
							
							
								
								
								Remove the . in Digital Glarus
							
							
							
							
							
							
							
								
								
							
							
							Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org> 
							
						 | 
						
							2015-08-09 21:42:23 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	e635f856b3
						 | 
						
							
							
								
								
								Remove the . in Digital Glarus
							
							
							
							
							
							
							
								
								
							
							
							Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org> 
							
						 | 
						
							2015-08-09 21:42:23 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	862ca6e9c5
						 | 
						
							
							
								
								
								hotfix: meetup
							
							
							
							
							
							
							
								
								
							
							
							Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org> 
							
						 | 
						
							2015-08-09 21:40:35 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	99bc3bca10
						 | 
						
							
							
								
								
								hotfix: meetup
							
							
							
							
							
							
							
								
								
							
							
							Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org> 
							
						 | 
						
							2015-08-09 21:40:35 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	b6ac472f28
						 | 
						
							
							
								
								
								Merge branch 'feature/djangohosting'
							
							
							
							
							
								
								
									
	 old-2.0
								
							
							
						 | 
						
							2015-08-09 18:01:50 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	cfb8d2bd17
						 | 
						
							
							
								
								
								Merge branch 'feature/djangohosting'
							
							
							
							
							
								
								
							
							
						 | 
						
							2015-08-09 18:01:50 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									상희 김
								
							 
						 | 
						
							
							
								
							
							
	25f950c58e
						 | 
						
							
							
								
								
								Merge branch 'feature/djangohosting' of git.ungleich.ch:dynamicweb into feature/djangohosting
							
							
							
							
							
								
								
							
							
						 | 
						
							2015-08-09 17:53:49 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									상희 김
								
							 
						 | 
						
							
							
								
							
							
	7514628187
						 | 
						
							
							
								
								
								django hosting card image
							
							
							
							
							
								
								
							
							
						 | 
						
							2015-08-09 17:53:45 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	3869fab391
						 | 
						
							
							
								
								
								Quickfix: add vanity domains to allowed_hosts
							
							
							
							
							
							
							
								
								
							
							
							Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org> 
							
						 | 
						
							2015-08-01 01:05:19 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	a665472c32
						 | 
						
							
							
								
								
								Quickfix: add vanity domains to allowed_hosts
							
							
							
							
							
							
							
								
								
							
							
							Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org> 
							
						 | 
						
							2015-08-01 01:05:19 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	54387c05d8
						 | 
						
							
							
								
								
								Begin to refactor / cleanup hostings
							
							
							
							
							
							
							
								
								
							
							
							Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org> 
							
						 | 
						
							2015-07-30 19:07:29 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	8dd328fcc7
						 | 
						
							
							
								
								
								Merge branch 'feature/djangohosting' into develop
							
							
							
							
							
								
								
							
							
						 | 
						
							2015-07-30 01:14:39 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	c72fef6714
						 | 
						
							
							
								
								
								Use rails page for rails
							
							
							
							
							
							
							
								
								
							
							
							Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org> 
							
						 | 
						
							2015-07-30 01:09:23 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	c228b371d3
						 | 
						
							
							
								
								
								Use rails page for rails
							
							
							
							
							
							
							
								
								
							
							
							Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org> 
							
						 | 
						
							2015-07-30 01:09:23 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									상희 김
								
							 
						 | 
						
							
							
								
							
							
	76a84e43c8
						 | 
						
							
							
								
								
								base template created
							
							
							
							
							
								
								
							
							
						 | 
						
							2015-07-30 00:11:17 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									상희 김
								
							 
						 | 
						
							
							
								
							
							
	95e354bf0d
						 | 
						
							
							
								
								
								base template created
							
							
							
							
							
								
								
							
							
						 | 
						
							2015-07-30 00:11:17 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	5666821682
						 | 
						
							
							
								
								
								add route for djangohosting
							
							
							
							
							
							
							
								
								
							
							
							Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org> 
							
						 | 
						
							2015-07-28 21:22:06 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	b2c120fd9e
						 | 
						
							
							
								
								
								add route for djangohosting
							
							
							
							
							
							
							
								
								
							
							
							Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org> 
							
						 | 
						
							2015-07-28 21:22:06 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									상희 김
								
							 
						 | 
						
							
							
								
							
							
	f311cbc059
						 | 
						
							
							
								
								
								django.html added
							
							
							
							
							
								
								
							
							
						 | 
						
							2015-07-28 21:01:59 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									상희 김
								
							 
						 | 
						
							
							
								
							
							
	395c2851ed
						 | 
						
							
							
								
								
								django.html added
							
							
							
							
							
								
								
							
							
						 | 
						
							2015-07-28 21:01:59 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	7016c05942
						 | 
						
							
							
								
								
								digital.glarus -> Digital Glarus
							
							
							
							
							
							
							
								
								
							
							
							Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org> 
							
						 | 
						
							2015-07-20 22:58:49 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	ed9cee2fea
						 | 
						
							
							
								
								
								digital.glarus -> Digital Glarus
							
							
							
							
							
							
							
								
								
							
							
							Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org> 
							
						 | 
						
							2015-07-20 22:58:49 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	004524b7c5
						 | 
						
							
							
								
								
								Merge branch 'release/1.4.3'
							
							
							
							
							
								
								
							
							
						 | 
						
							2015-06-16 02:16:53 -06:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	7b8c5eb555
						 | 
						
							
							
								
								
								Merge branch 'release/1.4.3'
							
							
							
							
							
								
								
							
							
						 | 
						
							2015-06-16 02:16:53 -06:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	753c6c2af0
						 | 
						
							
							
								
								
								templates: block meta
							
							
							
							
							
							
							
								
								
							
							
							Signed-off-by: rscnt <rascnt@gmail.com> 
							
						 | 
						
							2015-06-16 02:16:16 -06:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	40958404c6
						 | 
						
							
							
								
								
								templates: block meta
							
							
							
							
							
							
							
								
								
							
							
							Signed-off-by: rscnt <rascnt@gmail.com> 
							
						 | 
						
							2015-06-16 02:16:16 -06:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	d6631bcf25
						 | 
						
							
							
								
								
								Merge branch 'release/1.4.2'
							
							
							
							
							
								
								
							
							
						 | 
						
							2015-06-16 01:48:41 -06:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	e1d4317679
						 | 
						
							
							
								
								
								Merge branch 'release/1.4.2'
							
							
							
							
							
								
								
							
							
						 | 
						
							2015-06-16 01:48:41 -06:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	4ce7ba0198
						 | 
						
							
							
								
								
								Merge branch 'feature/include-django-meta' into develop
							
							
							
							
							
								
								
							
							
						 | 
						
							2015-06-16 01:48:12 -06:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	e1c3f073a7
						 | 
						
							
							
								
								
								Merge branch 'feature/include-django-meta' into develop
							
							
							
							
							
								
								
							
							
						 | 
						
							2015-06-16 01:48:12 -06:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	ca7efc1f71
						 | 
						
							
							
								
								
								requirements: added djangocms-page-meta
							
							
							
							
							
							
							
								
								
							
							
							Signed-off-by: rscnt <rascnt@gmail.com> 
							
						 | 
						
							2015-06-16 01:40:41 -06:00 | 
						
						
							
							
							
							
								
							
							
						 |