Merge branch 'hotfix/placeholderblog' into develop
This commit is contained in:
		
				commit
				
					
						f206861942
					
				
			
		
					 2 changed files with 12 additions and 1 deletions
				
			
		
							
								
								
									
										2
									
								
								Makefile
									
										
									
									
									
								
							
							
						
						
									
										2
									
								
								Makefile
									
										
									
									
									
								
							|  | @ -2,7 +2,7 @@ PY?=python3 | |||
| 
 | ||||
| BASEDIR=$(CURDIR) | ||||
| 
 | ||||
| SSH_HOST=dynamicweb-staging.ungleich.ch | ||||
| SSH_HOST=dynamicweb.ungleich.ch | ||||
| SSH_PORT=22 | ||||
| SSH_USER=app | ||||
| SSH_TARGET_DIR=/home/$(SSH_USER)/app | ||||
|  |  | |||
|  | @ -392,6 +392,17 @@ BLOG_POSTS_LIST_TRUNCWORDS_COUNT = 100 | |||
| BLOG_MULTISITE = True | ||||
| BLOG_AUTHOR_DEFAULT = True | ||||
| 
 | ||||
| CKEDITOR_SETTINGS = { | ||||
|     'language': '{{ language }}', | ||||
|     'toolbar_CMS': [ | ||||
|         ['Undo', 'Redo'], | ||||
|         ['cmsplugins', '-', 'ShowBlocks'], | ||||
|         ['Format', 'Styles'], | ||||
|     ], | ||||
|     'skin': 'moono', | ||||
| } | ||||
| 
 | ||||
| 
 | ||||
| try: | ||||
|     from .local.local_settings import * | ||||
| except ImportError as e: | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue