diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-11-26 19:50:43 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-11-26 19:50:43 +0100 |
| commit | 43b0c50accfa1017ee323ba121ac53920d1cdbf5 (patch) | |
| tree | 9f554b2e55dfa8a36209363c82ddaa4915c3448f /chimere/fixtures/initial_data.json | |
| parent | f769930eca0a0bbccf991e52c6c6abbba6414390 (diff) | |
| parent | a95b7d7e58b6d8e0847b9a49e3afe0ac7a939a39 (diff) | |
| download | Chimère-43b0c50accfa1017ee323ba121ac53920d1cdbf5.tar.bz2 Chimère-43b0c50accfa1017ee323ba121ac53920d1cdbf5.zip | |
Merge branch 'master' into saclay
Conflicts:
chimere/admin.py
chimere/fixtures/initial_data.json
chimere/forms.py
chimere/locale/fr/LC_MESSAGES/django.po
chimere/static/chimere/css/styles.css
chimere/templates/chimere/blocks/alternate_multimedia.html
chimere/templates/chimere/blocks/categories.html
chimere/widgets.py
Diffstat (limited to 'chimere/fixtures/initial_data.json')
| -rw-r--r-- | chimere/fixtures/initial_data.json | 67 |
1 files changed, 1 insertions, 66 deletions
diff --git a/chimere/fixtures/initial_data.json b/chimere/fixtures/initial_data.json index 20347a3..222c81c 100644 --- a/chimere/fixtures/initial_data.json +++ b/chimere/fixtures/initial_data.json @@ -1,16 +1,5 @@ [ { - "pk": 7, - "model": "chimere.multimediatype", - "fields": { - "available": true, - "media_type": "V", - "iframe": false, - "name": "Matroska (mkv)", - "mime_type": "video/x-matroska" - } - }, - { "pk": 1, "model": "chimere.multimediatype", "fields": { @@ -55,28 +44,6 @@ } }, { - "pk": 4, - "model": "chimere.multimediatype", - "fields": { - "available": true, - "media_type": "V", - "iframe": false, - "name": "MPEG-1 (mpg, mpeg)", - "mime_type": "video/mpeg" - } - }, - { - "pk": 8, - "model": "chimere.multimediatype", - "fields": { - "available": true, - "media_type": "V", - "iframe": false, - "name": "AVI - xvid, mp3 (avi)", - "mime_type": "video/msvideo; codecs='xvid,mp3'" - } - }, - { "pk": 6, "model": "chimere.multimediatype", "fields": { @@ -176,14 +143,6 @@ } }, { - "pk": 1, - "model": "chimere.multimediaextension", - "fields": { - "multimedia_type": 7, - "name": "mkv" - } - }, - { "pk": 3, "model": "chimere.multimediaextension", "fields": { @@ -208,30 +167,6 @@ } }, { - "pk": 6, - "model": "chimere.multimediaextension", - "fields": { - "multimedia_type": 4, - "name": "mpg" - } - }, - { - "pk": 7, - "model": "chimere.multimediaextension", - "fields": { - "multimedia_type": 4, - "name": "mpeg" - } - }, - { - "pk": 8, - "model": "chimere.multimediaextension", - "fields": { - "multimedia_type": 8, - "name": "avi" - } - }, - { "pk": 9, "model": "chimere.multimediaextension", "fields": { @@ -259,7 +194,7 @@ "pk": 1, "model": "chimere.layer", "fields": { - "layer_code": "new OpenLayers.Layer.OSM.Mapnik(\"Default\",\r\n{attribution:\"\", keyid:\"mapnik\", displayOutsideMaxExtent:!0,wrapDateLine:!0,layerCode:\"M\"})", + "layer_code": "new OpenLayers.Layer.OSM.Mapnik(\"Mapnik OSM\",\r\n{attribution:\"\", keyid:\"mapnik\", displayOutsideMaxExtent:!0,wrapDateLine:!0,layerCode:\"M\"})", "name": "OSM - Mapnik" } }, |