diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-04-11 18:56:05 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-04-11 18:56:05 +0200 |
| commit | dfd6fd2551a9cc54e6b69d4f5d4d4aa328b9cc7a (patch) | |
| tree | 916cf36d9cd6d58e0c10e8711ee0c3f96c7bb221 /Makefile.example | |
| parent | 987f84ca3aec153a6a9179e2b51083d7afaa9337 (diff) | |
| parent | e3bdd4b6d2a32c010138e8f4581234d18cf51519 (diff) | |
| download | Ishtar-dfd6fd2551a9cc54e6b69d4f5d4d4aa328b9cc7a.tar.bz2 Ishtar-dfd6fd2551a9cc54e6b69d4f5d4d4aa328b9cc7a.zip | |
Merge branch 'master' into v0.9
Diffstat (limited to 'Makefile.example')
| -rw-r--r-- | Makefile.example | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Makefile.example b/Makefile.example index ac8e54cc5..abbaf9202 100644 --- a/Makefile.example +++ b/Makefile.example @@ -8,8 +8,6 @@ project=example_project # list used apps apps="ishtar_common" "archaeological_operations" "archaeological_context_records" "archaeological_files" "archaeological_finds" "archaeological_warehouse" "archaeological_files_pdl" default_data='fr' -url='ishtar.example.com' -project_name='Test' help: # Actions available: @@ -217,6 +215,8 @@ fixtures_context_records: archaeological_context_records.unit \ archaeological_context_records.datingtype \ archaeological_context_records.relationtype \ + archaeological_context_records.excavationtechnictype \ + archaeological_context_records.documentationtype \ > '../archaeological_context_records/fixtures/initial_data-'$(default_data)'.json' fixtures_finds: @@ -229,12 +229,15 @@ fixtures_finds: archaeological_finds.preservationtype \ archaeological_finds.objecttype \ archaeological_finds.integritytype \ + archaeological_finds.batchtype \ + archaeological_finds.treatmentfiletype \ > '../archaeological_finds/fixtures/initial_data-'$(default_data)'.json' fixtures_warehouse: cd $(project); $(PYTHON) ./manage.py dumpdata --indent 4 \ archaeological_warehouse.containertype \ archaeological_warehouse.warehousetype \ + archaeological_warehouse.warehousedivision \ > '../archaeological_warehouse/fixtures/initial_data-'$(default_data)'.json' fixtures_files: @@ -244,7 +247,7 @@ fixtures_files: archaeological_files.permittype \ > '../archaeological_files/fixtures/initial_data-'$(default_data)'.json' -translations_push: translations_pull makemessages +translations_push: makemessages zanata-cli push translations_pull: |