]> git.parisson.com Git - mezzo.git/commit
merge
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 7 Jul 2016 17:02:03 +0000 (19:02 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 7 Jul 2016 17:02:03 +0000 (19:02 +0200)
commit150cb7f151b3b756257b3b6d7371b42a43c4921f
tree40ed841e31ac4a00a21d0a9febe2ea677b698e1d
parent7e651ab9e6dcc2869f5d2e9af28b498f1f5b5a8c
merge
109 files changed:
.gitignore
app/local_settings.py
app/organization/__init__.py
app/organization/core/__init__.py [new file with mode: 0644]
app/organization/core/admin.py [new file with mode: 0644]
app/organization/core/apps.py [new file with mode: 0644]
app/organization/core/management/__init__.py [new file with mode: 0644]
app/organization/core/management/commands/__init__.py [new file with mode: 0644]
app/organization/core/management/commands/create-admin-user.py [new file with mode: 0644]
app/organization/core/management/commands/festival-sync-eve-events.py [new file with mode: 0644]
app/organization/core/management/commands/wait-for-db.py [new file with mode: 0644]
app/organization/core/migrations/0001_initial.py [new file with mode: 0644]
app/organization/core/migrations/0002_auto_20160707_1614.py [new file with mode: 0644]
app/organization/core/migrations/__init__.py [new file with mode: 0644]
app/organization/core/models.py [new file with mode: 0644]
app/organization/core/related.py [new file with mode: 0644]
app/organization/core/templatetags/organization_tags.py [new file with mode: 0644]
app/organization/core/tests.py [new file with mode: 0644]
app/organization/core/translation.py [new file with mode: 0644]
app/organization/core/urls.py [new file with mode: 0644]
app/organization/core/views.py [new file with mode: 0644]
app/organization/featured/__init__.py [new file with mode: 0644]
app/organization/featured/admin.py [new file with mode: 0644]
app/organization/featured/apps.py [new file with mode: 0644]
app/organization/featured/migrations/0001_initial.py [new file with mode: 0644]
app/organization/featured/migrations/0002_auto_20160707_1614.py [new file with mode: 0644]
app/organization/featured/migrations/__init__.py [new file with mode: 0644]
app/organization/featured/models.py [new file with mode: 0644]
app/organization/featured/templatetags/featured_tags.py [new file with mode: 0644]
app/organization/featured/tests.py [new file with mode: 0644]
app/organization/featured/urls.py [new file with mode: 0644]
app/organization/featured/views.py [new file with mode: 0644]
app/organization/festival/__init__.py [new file with mode: 0644]
app/organization/festival/admin.py [new file with mode: 0644]
app/organization/festival/apps.py [new file with mode: 0644]
app/organization/festival/migrations/0001_initial.py [new file with mode: 0644]
app/organization/festival/migrations/__init__.py [new file with mode: 0644]
app/organization/festival/models.py [new file with mode: 0644]
app/organization/festival/routers.py [new file with mode: 0644]
app/organization/festival/templatetags/festival_tags.py [new file with mode: 0644]
app/organization/festival/tests.py [new file with mode: 0644]
app/organization/festival/translation.py [new file with mode: 0644]
app/organization/festival/urls.py [new file with mode: 0644]
app/organization/festival/views.py [new file with mode: 0644]
app/organization/magazine/__init__.py [new file with mode: 0644]
app/organization/magazine/admin.py [new file with mode: 0644]
app/organization/magazine/apps.py [new file with mode: 0644]
app/organization/magazine/migrations/0001_initial.py [new file with mode: 0644]
app/organization/magazine/migrations/0002_article.py [new file with mode: 0644]
app/organization/magazine/migrations/__init__.py [new file with mode: 0644]
app/organization/magazine/models.py [new file with mode: 0644]
app/organization/magazine/tests.py [new file with mode: 0644]
app/organization/magazine/translation.py [new file with mode: 0644]
app/organization/magazine/urls.py [new file with mode: 0644]
app/organization/magazine/views.py [new file with mode: 0644]
app/organization/media/__init__.py [new file with mode: 0644]
app/organization/media/admin.py [new file with mode: 0644]
app/organization/media/apps.py [new file with mode: 0644]
app/organization/media/migrations/0001_initial.py [new file with mode: 0644]
app/organization/media/migrations/__init__.py [new file with mode: 0644]
app/organization/media/models.py [new file with mode: 0644]
app/organization/media/tests.py [new file with mode: 0644]
app/organization/media/translation.py [new file with mode: 0644]
app/organization/media/urls.py [new file with mode: 0644]
app/organization/media/views.py [new file with mode: 0644]
app/organization/project/__init__.py [new file with mode: 0644]
app/organization/project/admin.py [new file with mode: 0644]
app/organization/project/apps.py [new file with mode: 0644]
app/organization/project/migrations/0001_initial.py [new file with mode: 0644]
app/organization/project/migrations/0002_auto_20160707_1053.py [new file with mode: 0644]
app/organization/project/migrations/__init__.py [new file with mode: 0644]
app/organization/project/models.py [new file with mode: 0644]
app/organization/project/tests.py [new file with mode: 0644]
app/organization/project/urls.py [new file with mode: 0644]
app/organization/project/views.py [new file with mode: 0644]
app/organization/team/__init__.py [new file with mode: 0644]
app/organization/team/admin.py [new file with mode: 0644]
app/organization/team/apps.py [new file with mode: 0644]
app/organization/team/migrations/0001_initial.py [new file with mode: 0644]
app/organization/team/migrations/0002_auto_20160707_1614.py [new file with mode: 0644]
app/organization/team/migrations/__init__.py [new file with mode: 0644]
app/organization/team/models.py [new file with mode: 0644]
app/organization/team/tests.py [new file with mode: 0644]
app/organization/team/urls.py [new file with mode: 0644]
app/organization/team/views.py [new file with mode: 0644]
app/organization/urls.py [new file with mode: 0644]
app/settings.py
app/templates/agenda/event_booking.html
app/templates/agenda/event_detail.html
app/templates/agenda/event_iframe.html
app/templates/agenda/includes/event_metainfo.html
app/templates/agenda/includes/event_metainfo_slider.html
app/templates/base.html
app/templates/blog/blog_post_detail.html
app/templates/includes/slider.html
app/templates/index.html
app/templates/pages/basicpage.html [new file with mode: 0644]
app/templates/pages/page.html
app/templates/styles.html
app/templates/templates/festival/artist_detail.html
app/templates/templates/festival/video_list.html
app/urls.py
doc/__init__.py [new file with mode: 0644]
requirements-dev.txt
requirements.txt
scripts/backup_db.sh
scripts/makemigrations.sh [new file with mode: 0755]
scripts/migrate.sh [new file with mode: 0755]
scripts/restore_db.sh