From: Guillaume Pellerin Date: Tue, 3 Jan 2017 11:02:00 +0000 (+0100) Subject: undo staging install X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=cacc28939e020c05248d675064299d703a78a4a6;p=mezzo.git undo staging install --- diff --git a/app/bin/app.sh b/app/bin/app.sh index 1605c3e7..8884f787 100755 --- a/app/bin/app.sh +++ b/app/bin/app.sh @@ -23,9 +23,9 @@ gid='www-data' # pip install -U https://forge.ircam.fr/p/django-eve/source/download/dev/ # pip install https://forge.ircam.fr/p/django-prestashop/source/download/master/ --src /srv/lib # pip install -U https://github.com/stephenmcd/grappelli-safe/archive/dynamic_stacked.zip -pip install django-querysetsequence==0.6.1 django==1.9.11 -#pip install django-autocomplete-light django-querysetsequence -#/usr/bin/yes | pip uninstall django-orderable +# pip install django-querysetsequence==0.6.1 django==1.9.11 +# pip install django-autocomplete-light django-querysetsequence +# /usr/bin/yes | pip uninstall django-orderable chown -R $uid:$gid $media @@ -37,6 +37,7 @@ python $manage wait-for-db # python $manage migrate --noinput # python $manage bower_install -- --allow-root python $manage create-admin-user + # @todo searching every fixtures file in each folder python $manage loaddata $app/organization/job/fixtures/organization-job.json python $manage loaddata $app/organization/projects/fixtures/organization-projects-repositorysystems.json diff --git a/lib/mezzanine-agenda b/lib/mezzanine-agenda index 6d24f3c2..2b2de20c 160000 --- a/lib/mezzanine-agenda +++ b/lib/mezzanine-agenda @@ -1 +1 @@ -Subproject commit 6d24f3c2675b27051c53556f3ec1f4fe8e0471d3 +Subproject commit 2b2de20c2ecbe6b7a5a56eb30c8ccb942eba434c diff --git a/var b/var index a4284e57..235e624c 160000 --- a/var +++ b/var @@ -1 +1 @@ -Subproject commit a4284e579c4db28bc5c709f7b9372c41730de6c0 +Subproject commit 235e624c75ae8da81e6166e596be214ba96d41d7