...
 
Commits (4)
......@@ -8,6 +8,10 @@ build:
entrypoint: [""]
tags:
- docker
environment:
- CI_REGISTRY=https://mills.ircam.fr/registry/
- CI_REGISTRY_USER=pow
- CI_REGISTRY_PASSWORD=RG9pc29udm9tQ3lkS2V3SHVtRW10T3ZEZWtKaWF2eW8K
script:
- echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
- /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --no-push
......@@ -77,7 +77,7 @@ USE_TZ = False
SESSION_EXPIRE_AT_BROWSER_CLOSE = False
# SESSION_ENGINE = "django.contrib.sessions.backends.cache"
SITE_ID = 2
SITE_ID = 1
# If you set this to False, Django will make some optimizations so as not
# to load the internationalization machinery.
......@@ -178,6 +178,7 @@ INSTALLED_APPS = [
'rdf_io',
'skosxl',
'versatileimagefield',
'captcha',
]
CUSTOM_MODULES = False
......@@ -251,99 +252,6 @@ GRAPPELLI_INSTALLED = True
JQUERY_UI_FILENAME = 'jquery-ui-1.9.2.min.js'
TINYMCE_SETUP_JS = "/js/tinymce_setup.js"
ADMIN_MENU_ORDER = (
(_('Pages'), ('pages.Page', 'organization-pages.Home',
'organization-core.LinkType')),
(_('Media'), ('organization-media.Media',
'organization-media.Playlist',
'organization-media.LiveStreaming',
'organization-media.MediaCategory',
(_('Media Library'), 'fb_browse'),
)),
(_('Events'), ('mezzanine_agenda.Event',
'mezzanine_agenda.Season',
'mezzanine_agenda.EventLocation',
'mezzanine_agenda.EventShop',
'mezzanine_agenda.EventPrice',
'mezzanine_agenda.EventCategory',
'organization-agenda.EventPublicType',
'organization-agenda.EventTrainingLevel',
'generic.Keyword',
)),
(_('Magazine'), ('organization-magazine.Article',
'organization-magazine.Brief',)),
(_('Network'), ('organization-network.Organization',
'organization-network.OrganizationLinked',
'organization-network.OrganizationRole',
'organization-network.OrganizationType',
'organization-network.Department',
'organization-network.Team',
'organization-network.Person',
'organization-network.Activity',
'organization-network.PersonListBlock',
)),
(_('Activity'), ('organization-network.PersonActivity',
'organization-network.ActivityStatusFamily',
'organization-network.ActivityStatus',
'organization-network.ActivityGrade',
'organization-network.ActivityFramework',
'organization-network.ActivityFunction',
'organization-network.ProjectActivity',
'organization-network.TrainingType',
'organization-network.TrainingTopic',
'organization-network.TrainingLevel',
'organization-network.TrainingSpeciality',
)),
(_('Timesheet'), ('organization-network.ActivityWeeklyHourVolume',
'organization-network.PersonActivityTimeSheet'
)),
(_('Projects'), ('organization-projects.Project',
'organization-projects.ProjectCall',
'organization-projects.ProjectContact',
'organization-projects.ProjectProgram',
'organization-projects.ProjectProgramType',
'organization-projects.ProjectTopic',
'organization-projects.ProjectWorkPackage',
'organization-projects.ProjectPublicData',
'organization-projects.ProjectPrivateData',
'organization-projects.ProjectResidency',
'organization-projects.Repository',
'organization-projects.RepositorySystem',
'organization-projects.ProjectDemo',
'organization-projects.Call',
)),
(_('Shop'), ('shop.Product',
'organization-shop.ProductList',
'shop.Order',
'shop.DiscountCode',
'shop.Sale',
)),
(_('Jobs'), ('organization-job.JobOffer','organization-job.Candidacy')),
(_('Users'), ('auth.User', 'auth.Group',)),
(_('Site'), ('sites.Site', 'redirects.Redirect', 'conf.Setting')),
)
DASHBOARD_TAGS = ( ("mezzanine_tags.app_list",), (), ("mezzanine_tags.recent_actions",), )
SEARCH_MODEL_CHOICES = ('organization-pages.CustomPage',
'organization-network.DepartmentPage',
'organization-network.TeamPage',
'organization-network.Person',
'organization-projects.ProjectTopicPage',
'pages.Page',
'organization-media.Playlist',
'mezzanine_agenda.Event',
'organization-projects.Project',
'shop.Product',
'organization-magazine.Article')
PAGES_MODELS = ('organization-pages.CustomPage',
'organization-magazine.Topic',
'organization-network.DepartmentPage',
'organization-network.TeamPage',
'organization-projects.ProjectTopicPage',
'shop.Product')
SEARCH_PARENTS_MODELS = ('organization-network.Person',)
PAGES_PUBLISHED_INCLUDE_LOGIN_REQUIRED = True
......@@ -430,6 +338,15 @@ HAYSTACK_CONNECTIONS = {
}
HAYSTACK_SIGNAL_PROCESSOR = 'haystack.signals.RealtimeSignalProcessor'
###########
# CAPTCHA #
###########
CAPTCHA_FONT_SIZE = 30
CAPTCHA_LENGTH = 6
##################
# LOCAL SETTINGS #
##################
......@@ -477,6 +394,3 @@ try:
move(INSTALLED_APPS, "ulysses.system", len(INSTALLED_APPS))
except ValueError:
pass
MESSAGE_STORAGE = 'django.contrib.messages.storage.session.SessionStorage'
Subproject commit 0c8e77b3adac5b9e19295601b8560fdce465e6c8
Subproject commit 23d6b2529b74177cc8b4e31b2bca179ebdcaad65
Subproject commit 59db9ea5b2c31e27e60bdbaf9680608b0d11f572
Subproject commit 8aafbe079146f21ed855f0644e83d1b8448c75b0
Subproject commit d8bb193b6f6166bc6e52ca4c7c478f3b462ef7f4
Subproject commit dfb2a4fbe4794648d11fd75240a6a0fa08c13a81