Skip to content
Jump to bottom

Molgen #1

Merged
merged 149 commits into from Jun 13, 2018
Merged

Molgen #1

merged 149 commits into from Jun 13, 2018

Commits on Jul 5, 2017

  1. init commit

    @mvogl
    mvogl committed Jul 5, 2017
    Copy the full SHA
    6ff16c6 View commit details
    Browse the repository at this point in the history

  2. Adding models

    @mvogl
    mvogl committed Jul 5, 2017
    Copy the full SHA
    9af4734 View commit details
    Browse the repository at this point in the history

  3. add tests

    @mvogl
    mvogl committed Jul 5, 2017
    Copy the full SHA
    4ac8214 View commit details
    Browse the repository at this point in the history

  4. pipeline prt1

    @mvogl
    mvogl committed Jul 5, 2017
    Copy the full SHA
    539e319 View commit details
    Browse the repository at this point in the history

  5. Add .gitlab-ci.yml

    @mvogl
    mvogl committed Jul 5, 2017
    Copy the full SHA
    1c058ed View commit details
    Browse the repository at this point in the history

  6. db settings

    @mvogl
    mvogl committed Jul 5, 2017
    Copy the full SHA
    9eb4ac2 View commit details
    Browse the repository at this point in the history

  7. db set 2

    @mvogl
    mvogl committed Jul 5, 2017
    Copy the full SHA
    0463b41 View commit details
    Browse the repository at this point in the history

  8. Update .gitlab-ci.yml

    @mvogl
    mvogl committed Jul 5, 2017
    Copy the full SHA
    b76828e View commit details
    Browse the repository at this point in the history

  9. Update .gitlab-ci.yml

    @mvogl
    mvogl committed Jul 5, 2017
    Copy the full SHA
    295c368 View commit details
    Browse the repository at this point in the history

  10. Update .gitlab-ci.yml

    @mvogl
    mvogl committed Jul 5, 2017
    Copy the full SHA
    b368f33 View commit details
    Browse the repository at this point in the history

  11. Update .gitlab-ci.yml

    @mvogl
    mvogl committed Jul 5, 2017
    Copy the full SHA
    60315c2 View commit details
    Browse the repository at this point in the history

  12. Update .gitlab-ci.yml

    @mvogl
    mvogl committed Jul 5, 2017
    Copy the full SHA
    242d1e3 View commit details
    Browse the repository at this point in the history

  13. Update .gitlab-ci.yml

    @mvogl
    mvogl committed Jul 5, 2017
    Copy the full SHA
    f69419d View commit details
    Browse the repository at this point in the history

  14. Update .gitlab-ci.yml

    @mvogl
    mvogl committed Jul 5, 2017
    Copy the full SHA
    cfd9233 View commit details
    Browse the repository at this point in the history

  15. Update .gitlab-ci.yml

    @mvogl
    mvogl committed Jul 5, 2017
    Copy the full SHA
    4c27cbe View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2017

  1. deploy via compose

    @mvogl
    mvogl committed Jul 6, 2017
    Copy the full SHA
    45052b6 View commit details
    Browse the repository at this point in the history

  2. edit db setings

    @mvogl
    mvogl committed Jul 6, 2017
    Copy the full SHA
    008dd51 View commit details
    Browse the repository at this point in the history

  3. edit db setings 2

    @mvogl
    mvogl committed Jul 6, 2017
    Copy the full SHA
    591849a View commit details
    Browse the repository at this point in the history

  4. admin settings -- still no pwd from ENV

    @mvogl
    mvogl committed Jul 6, 2017
    Copy the full SHA
    5dc0d0c View commit details
    Browse the repository at this point in the history

  5. Update .gitlab-ci.yml

    @mvogl
    mvogl committed Jul 6, 2017
    Copy the full SHA
    80840d6 View commit details
    Browse the repository at this point in the history

  6. fix waiting time for postgres

    @mvogl
    mvogl committed Jul 6, 2017
    Copy the full SHA
    2470813 View commit details
    Browse the repository at this point in the history

  7. load static files

    @mvogl
    mvogl committed Jul 6, 2017
    Copy the full SHA
    7883e70 View commit details
    Browse the repository at this point in the history

  8. vol for static files

    @mvogl
    mvogl committed Jul 6, 2017
    Copy the full SHA
    fea84be View commit details
    Browse the repository at this point in the history

  9. auto nginx

    @mvogl
    mvogl committed Jul 6, 2017
    Copy the full SHA
    8494e79 View commit details
    Browse the repository at this point in the history

  10. auto nginx host

    @mvogl
    mvogl committed Jul 6, 2017
    Copy the full SHA
    9fbc459 View commit details
    Browse the repository at this point in the history

  11. chg pipeline

    @mvogl
    mvogl committed Jul 6, 2017
    Copy the full SHA
    7546c86 View commit details
    Browse the repository at this point in the history

  12. bad req bug

    @mvogl
    mvogl committed Jul 6, 2017
    Copy the full SHA
    00ec119 View commit details
    Browse the repository at this point in the history

  13. Update .gitlab-ci.yml

    @mvogl
    mvogl committed Jul 6, 2017
    Copy the full SHA
    8b5ea9d View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2017

  1. new branch, env for deploy

    @mvogl
    mvogl committed Jul 7, 2017
    Copy the full SHA
    cdf7518 View commit details
    Browse the repository at this point in the history

  2. Update .gitlab-ci.yml

    @mvogl
    mvogl committed Jul 7, 2017
    Copy the full SHA
    3533d74 View commit details
    Browse the repository at this point in the history

  3. fix model order

    @mvogl
    mvogl committed Jul 7, 2017
    Copy the full SHA
    0225f97 View commit details
    Browse the repository at this point in the history

  4. Update .gitlab-ci.yml

    @mvogl
    mvogl committed Jul 7, 2017
    Copy the full SHA
    ed0ff99 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into 'dev' 

    merge latest changes to dev

See merge request !1
    @mvogl
    mvogl committed Jul 7, 2017
    Copy the full SHA
    d254549 View commit details
    Browse the repository at this point in the history

  6. model defaults featured/published

    @mvogl
    mvogl committed Jul 7, 2017
    Copy the full SHA
    88e0792 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'dev' of https://gitlab.gwdg.de/malte.vogl/eoa-django-test… 

    … into dev

merged from mae
    @mvogl
    mvogl committed Jul 7, 2017
    Copy the full SHA
    43f4f5d View commit details
    Browse the repository at this point in the history

  8. model defaults 2

    @mvogl
    mvogl committed Jul 7, 2017
    Copy the full SHA
    321131b View commit details
    Browse the repository at this point in the history

  9. Merge branch 'dev' into 'master' 

    Testing manual deploy with new models

See merge request !2
    @mvogl
    mvogl committed Jul 7, 2017
    Copy the full SHA
    76ee06c View commit details
    Browse the repository at this point in the history

  10. extend model author

    @mvogl
    mvogl committed Jul 7, 2017
    Copy the full SHA
    76e0e27 View commit details
    Browse the repository at this point in the history

  11. models: imagefield dep.

    @mvogl
    mvogl committed Jul 7, 2017
    Copy the full SHA
    77bab98 View commit details
    Browse the repository at this point in the history

  12. deps for imagefield 2

    @mvogl
    mvogl committed Jul 7, 2017
    Copy the full SHA
    9d76f3f View commit details
    Browse the repository at this point in the history

  13. model fix

    @mvogl
    mvogl committed Jul 7, 2017
    Copy the full SHA
    cdfad4b View commit details
    Browse the repository at this point in the history

  14. models added

    @mvogl
    mvogl committed Jul 7, 2017
    Copy the full SHA
    44bf074 View commit details
    Browse the repository at this point in the history

  15. more models

    @mvogl
    mvogl committed Jul 7, 2017
    Copy the full SHA
    3f9b9b2 View commit details
    Browse the repository at this point in the history

  16. more model

    @mvogl
    mvogl committed Jul 7, 2017
    Copy the full SHA
    5a7f54f View commit details
    Browse the repository at this point in the history

  17. more model 2

    @mvogl
    mvogl committed Jul 7, 2017
    Copy the full SHA
    f02731f View commit details
    Browse the repository at this point in the history

  18. more model 3

    @mvogl
    mvogl committed Jul 7, 2017
    Copy the full SHA
    3a74abf View commit details
    Browse the repository at this point in the history

  19. fix defautl

    @mvogl
    mvogl committed Jul 7, 2017
    Copy the full SHA
    2f67ffa View commit details
    Browse the repository at this point in the history

  20. fix null=True

    @mvogl
    mvogl committed Jul 7, 2017
    Copy the full SHA
    1e38481 View commit details
    Browse the repository at this point in the history

  21. order of classes

    @mvogl
    mvogl committed Jul 7, 2017
    Copy the full SHA
    588f647 View commit details
    Browse the repository at this point in the history

  22. typo odels

    @mvogl
    mvogl committed Jul 7, 2017
    Copy the full SHA
    42f9aae View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2017

  1. Klaus testing a third user

    Klaus Thoden committed Jul 11, 2017
    Copy the full SHA
    9e1062b View commit details
    Browse the repository at this point in the history

  2. addings models

    @mvogl
    mvogl committed Jul 11, 2017
    Copy the full SHA
    9693999 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'dev' of https://gitlab.gwdg.de/EditionOpenAccess/eoa-dj… 

    …ango-test into dev
    @mvogl
    mvogl committed Jul 11, 2017
    Copy the full SHA
    bd420da View commit details
    Browse the repository at this point in the history

  4. Merge branch 'dev' into 'master' 

    Dev

See merge request !3
    @mvogl
    mvogl committed Jul 11, 2017
    Copy the full SHA
    6da27b4 View commit details
    Browse the repository at this point in the history

  5. Add models to admin interface, dbg model definitions

    @mvogl
    mvogl committed Jul 11, 2017
    Copy the full SHA
    9bb652b View commit details
    Browse the repository at this point in the history

  6. Merge branch 'dev' into 'master' 

    Add models to admin interface, dbg model definitions

See merge request !4
    @mvogl
    mvogl committed Jul 11, 2017
    Copy the full SHA
    ab1d657 View commit details
    Browse the repository at this point in the history

  7. add docker-compose down and sleep to update files properly

    @mvogl
    mvogl committed Jul 11, 2017
    Copy the full SHA
    9bc08ec View commit details
    Browse the repository at this point in the history

  8. Merge branch 'dev' into 'master' 

    add docker-compose down and sleep to update files properly

See merge request !5
    @mvogl
    mvogl committed Jul 11, 2017
    Copy the full SHA
    402fdc9 View commit details
    Browse the repository at this point in the history

  9. removing volume from docker-compose, lots of migration errors

    @mvogl
    mvogl committed Jul 11, 2017
    Copy the full SHA
    4cf7011 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'dev' into 'master' 

    removing volume from docker-compose, lots of migration errors

See merge request !6
    @mvogl
    mvogl committed Jul 11, 2017
    Copy the full SHA
    b5f9f32 View commit details
    Browse the repository at this point in the history

  11. Remove volume from postgres, leads to migration errors

    @mvogl
    mvogl committed Jul 11, 2017
    Copy the full SHA
    15a5fca View commit details
    Browse the repository at this point in the history

  12. Update start_deploy.sh

    @mvogl
    mvogl committed Jul 11, 2017
    Copy the full SHA
    f1d5518 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2017

  1. Add assertRaises test

    @mvogl
    mvogl committed Jul 12, 2017
    Copy the full SHA
    f4e7fbd View commit details
    Browse the repository at this point in the history

  2. chg folder strct

    @mvogl
    mvogl committed Jul 12, 2017
    Copy the full SHA
    cd97a7c View commit details
    Browse the repository at this point in the history

  3. fix emailfield **def not working

    @mvogl
    mvogl committed Jul 12, 2017
    Copy the full SHA
    92fdebd View commit details
    Browse the repository at this point in the history

  4. Merge branch 'dev'

    @mvogl
    mvogl committed Jul 12, 2017
    Copy the full SHA
    ea60c26 View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2017

  1. Add publications app, starting templates

    @mvogl
    mvogl committed Jul 21, 2017
    Copy the full SHA
    99788fa View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2017

  1. Adding views,urls,importer

    @mvogl
    mvogl committed Jul 25, 2017
    Copy the full SHA
    3aa3537 View commit details
    Browse the repository at this point in the history

  2. requier lxml

    @mvogl
    mvogl committed Jul 25, 2017
    Copy the full SHA
    543b3e0 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'dev' into 'master' 

    Merge new views

See merge request !8
    @mvogl
    mvogl committed Jul 25, 2017
    Copy the full SHA
    4c18381 View commit details
    Browse the repository at this point in the history

  4. Ignore migration folders

    @mvogl
    mvogl committed Jul 25, 2017
    Copy the full SHA
    3e6931c View commit details
    Browse the repository at this point in the history

  5. Delete migrations from git

    @mvogl
    mvogl committed Jul 25, 2017
    Copy the full SHA
    558964e View commit details
    Browse the repository at this point in the history

  6. Merge branch 'dev' into 'master' 

    Start without existing migrations, to keep db clean

See merge request !9
    @mvogl
    mvogl committed Jul 25, 2017
    Copy the full SHA
    e0b2b93 View commit details
    Browse the repository at this point in the history

  7. chg order of middleware

    @mvogl
    mvogl committed Jul 25, 2017
    Copy the full SHA
    f41afb4 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'dev' into 'master' 

    chg order of middleware

See merge request !10
    @mvogl
    mvogl committed Jul 25, 2017
    Copy the full SHA
    2b792ab View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2017

  1. tei importer testing

    @mvogl
    mvogl committed Jul 26, 2017
    Copy the full SHA
    6ec68ca View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev' into 'master' 

    tei importer testing

See merge request !11
    @mvogl
    mvogl committed Jul 26, 2017
    Copy the full SHA
    725f02a View commit details
    Browse the repository at this point in the history

  3. first view

    @mvogl
    mvogl committed Jul 26, 2017
    Copy the full SHA
    1223c39 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'dev' into 'master' 

    first view

See merge request !12
    @mvogl
    mvogl committed Jul 26, 2017
    Copy the full SHA
    0f43992 View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2017

  1. adding working view

    @mvogl
    mvogl committed Jul 27, 2017
    Copy the full SHA
    26938f7 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev' into 'master' 

    adding working view

See merge request !13
    @mvogl
    mvogl committed Jul 27, 2017
    Copy the full SHA
    dd78845 View commit details
    Browse the repository at this point in the history

  3. reseting migrations

    @mvogl
    mvogl committed Jul 27, 2017
    Copy the full SHA
    3e6d69b View commit details
    Browse the repository at this point in the history

  4. Merge branch 'dev' into 'master' 

    reseting migrations

See merge request !14
    @mvogl
    mvogl committed Jul 27, 2017
    Copy the full SHA
    1cbf1bc View commit details
    Browse the repository at this point in the history

  5. increase waiting time, for db to be ready

    @mvogl
    mvogl committed Jul 27, 2017
    Copy the full SHA
    de06908 View commit details
    Browse the repository at this point in the history

  6. add waiting for postgres

    @mvogl
    mvogl committed Jul 27, 2017
    Copy the full SHA
    37dd13b View commit details
    Browse the repository at this point in the history

  7. rm waiting time

    @mvogl
    mvogl committed Jul 27, 2017
    Copy the full SHA
    f1a205f View commit details
    Browse the repository at this point in the history

  8. Merge branch 'master' into 'dev' 

    # Conflicts:
#   scripts/start_deploy.sh
    @mvogl
    mvogl committed Jul 27, 2017
    Copy the full SHA
    f39b1df View commit details
    Browse the repository at this point in the history

  9. Merge branch 'dev' into 'master' 

    Dev

See merge request !16
    @mvogl
    mvogl committed Jul 27, 2017
    Copy the full SHA
    7eee86a View commit details
    Browse the repository at this point in the history

  10. add psql client

    @mvogl
    mvogl committed Jul 27, 2017
    Copy the full SHA
    b3fd29b View commit details
    Browse the repository at this point in the history

  11. Merge branch 'dev' of https://gitlab.gwdg.de/EditionOpenAccess/eoa-dj… 

    …ango-test into dev
    @mvogl
    mvogl committed Jul 27, 2017
    Copy the full SHA
    411f1fc View commit details
    Browse the repository at this point in the history

  12. Merge branch 'dev' into 'master' 

    Dev

See merge request !17
    @mvogl
    mvogl committed Jul 27, 2017
    Copy the full SHA
    0a77577 View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2017

  1. add abstract xmlElement model

    @mvogl
    mvogl committed Jul 28, 2017
    Copy the full SHA
    1d62fe7 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2017

  1. Mixed content model tests

    @mvogl
    mvogl committed Jul 31, 2017
    Copy the full SHA
    f289774 View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2017

  1. include hstore extension

    @mvogl
    mvogl committed Aug 1, 2017
    Copy the full SHA
    59b320a View commit details
    Browse the repository at this point in the history

  2. fix typos

    @mvogl
    mvogl committed Aug 1, 2017
    Copy the full SHA
    af6df49 View commit details
    Browse the repository at this point in the history

  3. add hstore for tests

    @mvogl
    mvogl committed Aug 1, 2017
    Copy the full SHA
    f69ff8d View commit details
    Browse the repository at this point in the history

  4. chg psql path

    @mvogl
    mvogl committed Aug 1, 2017
    Copy the full SHA
    6edada4 View commit details
    Browse the repository at this point in the history

  5. chg psql path

    @mvogl
    mvogl committed Aug 1, 2017
    Copy the full SHA
    b4190a2 View commit details
    Browse the repository at this point in the history

  6. chg psql path

    @mvogl
    mvogl committed Aug 1, 2017
    Copy the full SHA
    5302418 View commit details
    Browse the repository at this point in the history

  7. chg psql path

    @mvogl
    mvogl committed Aug 1, 2017
    Copy the full SHA
    a0aacc1 View commit details
    Browse the repository at this point in the history

  8. chg psql path

    @mvogl
    mvogl committed Aug 1, 2017
    Copy the full SHA
    9423416 View commit details
    Browse the repository at this point in the history

  9. chg psql path

    @mvogl
    mvogl committed Aug 1, 2017
    Copy the full SHA
    1b3c2fc View commit details
    Browse the repository at this point in the history

  10. Merge branch 'dev' into 'master' 

    hstore on deploy

See merge request !18
    @mvogl
    mvogl committed Aug 1, 2017
    Copy the full SHA
    d14eb41 View commit details
    Browse the repository at this point in the history

  11. add docker postgres with hstore

    @mvogl
    mvogl committed Aug 1, 2017
    Copy the full SHA
    cbb9e5f View commit details
    Browse the repository at this point in the history

  12. Merge branch 'dev' into 'master' 

    add docker postgres with hstore

See merge request !19
    @mvogl
    mvogl committed Aug 1, 2017
    Copy the full SHA
    64a9009 View commit details
    Browse the repository at this point in the history

  13. chg usage

    @mvogl
    mvogl committed Aug 1, 2017
    Copy the full SHA
    6a02e55 View commit details
    Browse the repository at this point in the history

  14. Merge branch 'dev' into 'master' 

    chg usage

See merge request !20
    @mvogl
    mvogl committed Aug 1, 2017
    Copy the full SHA
    c29fc8d View commit details
    Browse the repository at this point in the history

  15. refactor to use bs4 and full xml structure

    @mvogl
    mvogl committed Aug 1, 2017
    Copy the full SHA
    b73c663 View commit details
    Browse the repository at this point in the history

  16. Merge branch 'dev' into 'master' 

    refactor to use bs4 and full xml structure

See merge request !21
    @mvogl
    mvogl committed Aug 1, 2017
    Copy the full SHA
    0df3727 View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2017

  1. working models and view

    @mvogl
    mvogl committed Aug 2, 2017
    Copy the full SHA
    0c38f95 View commit details
    Browse the repository at this point in the history

  2. working models and view, typo

    @mvogl
    mvogl committed Aug 2, 2017
    Copy the full SHA
    fbeecb8 View commit details
    Browse the repository at this point in the history

  3. working models and view, arg extentsion

    @mvogl
    mvogl committed Aug 2, 2017
    Copy the full SHA
    7225564 View commit details
    Browse the repository at this point in the history

  4. working models and view, arg extentsion, typo

    @mvogl
    mvogl committed Aug 2, 2017
    Copy the full SHA
    20a0d9c View commit details
    Browse the repository at this point in the history

  5. hstore again

    @mvogl
    mvogl committed Aug 2, 2017
    Copy the full SHA
    f30a8c9 View commit details
    Browse the repository at this point in the history

  6. revert

    @mvogl
    mvogl committed Aug 2, 2017
    Copy the full SHA
    ac8e434 View commit details
    Browse the repository at this point in the history

  7. pubPlace

    @mvogl
    mvogl committed Aug 2, 2017
    Copy the full SHA
    a6eaf13 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'dev' into 'master' 

    new view and importer

See merge request !22
    @mvogl
    mvogl committed Aug 2, 2017
    Copy the full SHA
    cb1c7ab View commit details
    Browse the repository at this point in the history

  9. noinput yes

    @mvogl
    mvogl committed Aug 2, 2017
    Copy the full SHA
    590d407 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'dev' into 'master' 

    noinput yes

See merge request !23
    @mvogl
    mvogl committed Aug 2, 2017
    Copy the full SHA
    bd62ac7 View commit details
    Browse the repository at this point in the history

  11. fix editors and authors

    @mvogl
    mvogl committed Aug 2, 2017
    Copy the full SHA
    392d3d0 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'dev' into 'master' 

    fix editors and authors

See merge request !24
    @mvogl
    mvogl committed Aug 2, 2017
    Copy the full SHA
    3062efe View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2017

  1. Update .gitlab-ci.yml

    @mvogl
    mvogl committed Dec 15, 2017
    Copy the full SHA
    22633c3 View commit details
    Browse the repository at this point in the history

  2. Update loaddjango.sh

    @mvogl
    mvogl committed Dec 15, 2017
    Copy the full SHA
    04acf05 View commit details
    Browse the repository at this point in the history

  3. Update loaddjango.sh

    @mvogl
    mvogl committed Dec 15, 2017
    Copy the full SHA
    b677274 View commit details
    Browse the repository at this point in the history

  4. echo pwd for debugging

    @mvogl
    mvogl committed Dec 15, 2017
    Copy the full SHA
    bf25293 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'dev' into 'master' 

    echo pwd for debugging

See merge request EditionOpenAccess/eoa-django-test!25
    @mvogl
    mvogl committed Dec 15, 2017
    Copy the full SHA
    90b5bba View commit details
    Browse the repository at this point in the history

  6. read env var as str

    @mvogl
    mvogl committed Dec 15, 2017
    Copy the full SHA
    b64ac28 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'dev' into 'master' 

    read env var as str

See merge request EditionOpenAccess/eoa-django-test!26
    @mvogl
    mvogl committed Dec 15, 2017
    Copy the full SHA
    f91f07a View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2017

  1. rem pwd echo

    @mvogl
    mvogl committed Dec 20, 2017
    Copy the full SHA
    a70e2be View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev' into 'master' 

    rem pwd echo

See merge request EditionOpenAccess/eoa-django-test!27
    @mvogl
    mvogl committed Dec 20, 2017
    Copy the full SHA
    335ae99 View commit details
    Browse the repository at this point in the history

Commits on Jan 3, 2018

  1. use letsencrypt

    @mvogl
    mvogl committed Jan 3, 2018
    Copy the full SHA
    f6cce37 View commit details
    Browse the repository at this point in the history

  2. add cert dir

    @mvogl
    mvogl committed Jan 3, 2018
    Copy the full SHA
    cc5daeb View commit details
    Browse the repository at this point in the history

  3. Merge branch 'dev' into 'master' 

    Dev

See merge request EditionOpenAccess/eoa-django-test!28
    @mvogl
    mvogl committed Jan 3, 2018
    Copy the full SHA
    95f70f0 View commit details
    Browse the repository at this point in the history

  4. force head to origin/master

    @mvogl
    mvogl committed Jan 3, 2018
    Copy the full SHA
    35746d9 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'dev' into 'master' 

    force head to origin/master

See merge request EditionOpenAccess/eoa-django-test!29
    @mvogl
    mvogl committed Jan 3, 2018
    Copy the full SHA
    4aeb85a View commit details
    Browse the repository at this point in the history

  6. fix typo

    @mvogl
    mvogl committed Jan 3, 2018
    Copy the full SHA
    fd3c3d6 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'dev' into 'master' 

    fix typo

See merge request EditionOpenAccess/eoa-django-test!30
    @mvogl
    mvogl committed Jan 3, 2018
    Copy the full SHA
    bbba2a9 View commit details
    Browse the repository at this point in the history

  8. no html2 in django

    @mvogl
    mvogl committed Jan 3, 2018
    Copy the full SHA
    993f207 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'dev' into 'master' 

    no html2 in django

See merge request EditionOpenAccess/eoa-django-test!31
    @mvogl
    mvogl committed Jan 3, 2018
    Copy the full SHA
    6d0b939 View commit details
    Browse the repository at this point in the history

  10. redirect from http, edit env address

    @mvogl
    mvogl committed Jan 3, 2018
    Copy the full SHA
    1f93c50 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'dev' into 'master' 

    redirect from http, edit env address

See merge request EditionOpenAccess/eoa-django-test!32
    @mvogl
    mvogl committed Jan 3, 2018
    Copy the full SHA
    cc6a289 View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2018

  1. Add new file

    @mvogl
    mvogl committed Jan 15, 2018
    Copy the full SHA
    0b8e076 View commit details
    Browse the repository at this point in the history

  2. text

    mvogl committed Jan 15, 2018
    Copy the full SHA
    604a761 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'dev' into 'master' 

    text

See merge request EditionOpenAccess/eoa-django-test!33
    @mvogl
    mvogl committed Jan 15, 2018
    Copy the full SHA
    b30e9a3 View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2018

  1. test mirror

    @mvogl
    mvogl committed Jan 19, 2018
    Copy the full SHA
    bf56ba5 View commit details
    Browse the repository at this point in the history

  2. one more try

    @mvogl
    mvogl committed Jan 19, 2018
    Copy the full SHA
    9b91c56 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2018

  1. Merge branch 'dev' of gitlab.gwdg.de:EditionOpenAccess/eoa-django-tes… 

    …t into dev
    @mvogl
    mvogl committed Jun 13, 2018
    Copy the full SHA
    87ead69 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.molgen.mpg.de/EditionOpenAcce… 

    …ss/django-tei-importer into molgen
    @mvogl
    mvogl committed Jun 13, 2018
    Copy the full SHA
    77504c4 View commit details
    Browse the repository at this point in the history

  3. init mirror

    @mvogl
    mvogl committed Jun 13, 2018
    Copy the full SHA
    45ca16b View commit details
    Browse the repository at this point in the history