Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	3446dcc469
						 | 
						
							
							
								
								
								calculator translation
							
							
							
							
							
								
								
							
							
						 | 
						
							2018-05-12 21:48:57 +05:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	
	
	d40977c5da
						 | 
						
							
							
								
								
								Merge pull request #629 from tiwariav/task/4559/calculator_discount
							
							
							
							
							
							
							
								
								
							
							
							Task/4559 enable discount on calculator 
							
						 | 
						
							2018-05-12 21:21:03 +05:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	b09604d30f
						 | 
						
							
							
								
								
								add space befor CHF
							
							
							
							
							
								
								
							
							
						 | 
						
							2018-05-12 03:56:04 +05:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	f39f95e1f7
						 | 
						
							
							
								
								
								remove template filter from translation
							
							
							
							
							
								
								
							
							
						 | 
						
							2018-05-12 03:47:54 +05:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	20f1df8a70
						 | 
						
							
							
								
								
								blocktrans variable fix
							
							
							
							
							
								
								
							
							
						 | 
						
							2018-05-12 03:39:38 +05:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	39f7898259
						 | 
						
							
							
								
								
								edit order detail footer text
							
							
							
							
							
								
								
							
							
						 | 
						
							2018-05-12 03:15:07 +05:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	55889499df
						 | 
						
							
							
								
								
								order detail style fix
							
							
							
							
							
								
								
							
							
						 | 
						
							2018-05-12 02:47:27 +05:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	8044e0c2a0
						 | 
						
							
							
								
								
								calculator discount text modified
							
							
							
							
							
								
								
							
							
						 | 
						
							2018-05-11 17:47:27 +05:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	30deae5a20
						 | 
						
							
							
								
								
								strong color fix
							
							
							
							
							
								
								
							
							
						 | 
						
							2018-05-11 17:25:44 +05:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	a14407182f
						 | 
						
							
							
								
								
								font weight for discount name
							
							
							
							
							
								
								
							
							
						 | 
						
							2018-05-11 17:21:02 +05:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	73e3dce8d4
						 | 
						
							
							
								
								
								order detail page font format
							
							
							
							
							
								
								
							
							
						 | 
						
							2018-05-11 17:18:19 +05:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	f3ffbd96e5
						 | 
						
							
							
								
								
								translation fix
							
							
							
							
							
								
								
							
							
						 | 
						
							2018-05-10 21:26:47 +05:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	b351cb9aa0
						 | 
						
							
							
								
								
								translation fix
							
							
							
							
							
								
								
							
							
						 | 
						
							2018-05-10 21:25:38 +05:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	55cbe3244a
						 | 
						
							
							
								
								
								fix testing error
							
							
							
							
							
								
								
							
							
						 | 
						
							2018-05-07 09:14:31 +05:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	0fdb88b8aa
						 | 
						
							
							
								
								
								invoice discount amount fix
							
							
							
							
							
								
								
							
							
						 | 
						
							2018-05-07 07:50:32 +05:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	3d2ce27954
						 | 
						
							
							
								
								
								fix discount amount
							
							
							
							
							
								
								
							
							
						 | 
						
							2018-05-07 06:29:53 +05:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	eeed9b2e72
						 | 
						
							
							
								
								
								discount name in templates
							
							
							
							
							
								
								
							
							
						 | 
						
							2018-05-07 06:25:50 +05:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	2ff8c25034
						 | 
						
							
							
								
								
								exclude discount from total price
							
							
							
							
							
								
								
							
							
						 | 
						
							2018-05-07 06:11:44 +05:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	144d885fbd
						 | 
						
							
							
								
								
								Merge branch 'master' into task/4559/calculator_discount
							
							
							
							
							
								
								
							
							
						 | 
						
							2018-05-07 05:23:50 +05:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	7a72cc02ab
						 | 
						
							
							
								
								
								translations
							
							
							
							
							
								
								
							
							
						 | 
						
							2018-05-07 05:22:05 +05:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	f8dc2c6bbe
						 | 
						
							
							
								
								
								discount option added to calculator
							
							
							
							
							
								
								
							
							
						 | 
						
							2018-05-07 05:07:58 +05:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	
	
	25ef657c62
						 | 
						
							
							
								
								
								Update cms_plugins.py
							
							
							
							
							
								
								
							
							
						 | 
						
							2018-05-01 18:15:56 +05:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	
	
	4d2d337651
						 | 
						
							
							
								
								
								Release 1.8
							
							
							
							
							
								
								
									
	 1.8
								
							
							
						 | 
						
							2018-05-01 16:44:15 +05:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	
	
	ccf55acbaf
						 | 
						
							
							
								
								
								Update navbar_dropdown.html
							
							
							
							
							
								
								
							
							
						 | 
						
							2018-05-01 04:36:29 +05:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	
	
	6ff03d8f48
						 | 
						
							
							
								
								
								Merge pull request #627 from tiwariav/task/dcl_calculator_on_non_cms_pages
							
							
							
							
							
							
							
								
								
							
							
							Task/4527 dcl calculator on non-cms pages 
							
						 | 
						
							2018-05-01 02:35:22 +05:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	
	
	d6db984156
						 | 
						
							
							
								
								
								Update ungleich.css
							
							
							
							
							
								
								
							
							
						 | 
						
							2018-05-01 00:48:31 +05:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	
	
	35fb872dc1
						 | 
						
							
							
								
								
								Update Changelog
							
							
							
							
							
								
								
									
	 1.7.2
								
							
							
						 | 
						
							2018-05-01 00:00:05 +05:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	
	
	86188b1fb0
						 | 
						
							
							
								
								
								Merge pull request #626 from tiwariav/task/4474/slider_padding
							
							
							
							
							
							
							
								
								
							
							
							Task/4474 cms header slider padding 
							
						 | 
						
							2018-04-30 23:52:23 +05:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	
	
	6bb65d8e8d
						 | 
						
							
							
								
								
								Merge pull request #628 from tiwariav/bugfix/unglieich_cms_template_favicon
							
							
							
							
							
							
							
								
								
							
							
							bugfix/ add favicon extension to ungleich cms template 
							
						 | 
						
							2018-04-30 21:20:41 +05:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	34df86fb90
						 | 
						
							
							
								
								
								add favicon extension to ungleich_template
							
							
							
							
							
								
								
							
							
						 | 
						
							2018-04-28 00:56:11 +05:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	89ed869780
						 | 
						
							
							
								
								
								hosting calculator styles
							
							
							
							
							
								
								
							
							
						 | 
						
							2018-04-25 23:31:27 +05:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	0c4c945ec3
						 | 
						
							
							
								
								
								flake8 fix
							
							
							
							
							
								
								
							
							
						 | 
						
							2018-04-25 17:51:36 +05:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	14548b2f01
						 | 
						
							
							
								
								
								flake8 refacoring
							
							
							
							
							
								
								
							
							
						 | 
						
							2018-04-25 17:26:31 +05:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	91a65e88ec
						 | 
						
							
							
								
								
								hosting vm payment price fix
							
							
							
							
							
								
								
							
							
						 | 
						
							2018-04-25 16:08:05 +05:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	f66d768ecb
						 | 
						
							
							
								
								
								hosting payment page
							
							
							
							
							
								
								
							
							
						 | 
						
							2018-04-25 15:55:58 +05:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	3b3b73a2ce
						 | 
						
							
							
								
								
								alignment calculator plugin
							
							
							
							
							
								
								
							
							
						 | 
						
							2018-04-25 15:08:28 +05:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	3bf064a017
						 | 
						
							
							
								
								
								add calculator placeholder to cms_integration
							
							
							
							
							
								
								
							
							
						 | 
						
							2018-04-25 14:52:25 +05:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	
	
	91f1c1ef06
						 | 
						
							
							
								
								
								Update Changelog
							
							
							
							
							
								
								
							
							
						 | 
						
							2018-04-21 23:05:23 +05:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	
	
	67a6c8f2c2
						 | 
						
							
							
								
								
								Update Changelog
							
							
							
							
							
								
								
									
	 1.7.1
								
							
							
						 | 
						
							2018-04-21 22:59:00 +05:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	
	
	49c0406296
						 | 
						
							
							
								
								
								Merge pull request #625 from pcoder/bugfix/4481/fix_DE_blog_pages_500_error
							
							
							
							
							
							
							
								
								
							
							
							Bugfix/4481/fix de blog pages 500 error 
							
						 | 
						
							2018-04-21 22:54:18 +05:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	
	
	526426c6c0
						 | 
						
							
							
								
								
								Merge pull request #623 from pcoder/task/4370/ungleich_comic
							
							
							
							
							
							
							
								
								
							
							
							Task/4370/ungleich comic 
							
						 | 
						
							2018-04-21 22:47:08 +05:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	1a692bc88f
						 | 
						
							
							
								
								
								merge master
							
							
							
							
							
								
								
							
							
						 | 
						
							2018-04-21 22:39:44 +05:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	3b6c2b9d4e
						 | 
						
							
							
								
								
								fix vm_id default
							
							
							
							
							
								
								
							
							
						 | 
						
							2018-04-21 22:27:43 +05:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	a5bd8347e8
						 | 
						
							
							
								
								
								merged master
							
							
							
							
							
								
								
							
							
						 | 
						
							2018-04-21 21:01:42 +05:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	
	
	45bd853a20
						 | 
						
							
							
								
								
								Update Changelog
							
							
							
							
							
								
								
									
	 1.7
								
							
							
						 | 
						
							2018-04-20 21:09:16 +05:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	
	
	d21e2a8abe
						 | 
						
							
							
								
								
								Merge pull request #618 from tiwariav/task/4297/cms_favicon
							
							
							
							
							
							
							
								
								
							
							
							Task/4297 dcl cms favicon as page attribute 
							
						 | 
						
							2018-04-20 20:59:17 +05:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	
	
	3d0505330c
						 | 
						
							
							
								
								
								Merge pull request #620 from tiwariav/bugfix/blog_top_menu
							
							
							
							
							
							
							
								
								
							
							
							bugfix/ cms blog top menu 
							
						 | 
						
							2018-04-20 20:58:59 +05:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	b660ac5ed4
						 | 
						
							
							
								
								
								merge master
							
							
							
							
							
								
								
							
							
						 | 
						
							2018-04-20 20:37:34 +05:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	564f7a5be8
						 | 
						
							
							
								
								
								merge migrations
							
							
							
							
							
								
								
							
							
						 | 
						
							2018-04-20 20:36:28 +05:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	275ea47e41
						 | 
						
							
							
								
								
								merge master
							
							
							
							
							
								
								
							
							
						 | 
						
							2018-04-20 20:30:45 +05:30 | 
						
						
							
							
							
							
								
							
							
						 |