Merge branch 'redcap/generic_test_instance' into 'master'
Redcap/generic test instance See merge request !462
No related branches found
No related tags found
Showing
- .dockerignore 3 additions, 0 deletions.dockerignore
- .gitignore 2 additions, 0 deletions.gitignore
- .gitlab-ci.yml 28 additions, 2 deletions.gitlab-ci.yml
- .pylintrc 4 additions, 0 deletions.pylintrc
- CHANGELOG 8 additions, 0 deletionsCHANGELOG
- Dockerfile 1 addition, 1 deletionDockerfile
- local_settings_ci.py 19 additions, 16 deletionslocal_settings_ci.py
- local_settings_ci_mariadb.py 35 additions, 0 deletionslocal_settings_ci_mariadb.py
- requirements-dev.txt 2 additions, 3 deletionsrequirements-dev.txt
- requirements.txt 17 additions, 50 deletionsrequirements.txt
- smash/smash/settings.py 11 additions, 0 deletionssmash/smash/settings.py
- smash/web/__init__.py 16 additions, 0 deletionssmash/web/__init__.py
- smash/web/api_views/serialization_utils.py 34 additions, 17 deletionssmash/web/api_views/serialization_utils.py
- smash/web/auth.py 6 additions, 7 deletionssmash/web/auth.py
- smash/web/importer/etl_common.py 41 additions, 21 deletionssmash/web/importer/etl_common.py
- smash/web/management/commands/holidays.py 45 additions, 14 deletionssmash/web/management/commands/holidays.py
- smash/web/migrations/0001_initial.py 2 additions, 2 deletionssmash/web/migrations/0001_initial.py
- smash/web/migrations/0001_version-1-0-0.py 18 additions, 14 deletionssmash/web/migrations/0001_version-1-0-0.py
- smash/web/migrations/0014_auto_20170220_0812.py 1 addition, 1 deletionsmash/web/migrations/0014_auto_20170220_0812.py
- smash/web/migrations/0017_auto_20170301_1600.py 22 additions, 22 deletionssmash/web/migrations/0017_auto_20170301_1600.py
Loading
Please register or sign in to comment