Merge branch 'apdev' into 'master'
Showing
- django/meleager/admin/__init__.py 50 additions, 0 deletionsdjango/meleager/admin/__init__.py
- django/meleager/admin/alignment.py 4 additions, 0 deletionsdjango/meleager/admin/alignment.py
- django/meleager/admin/language.py 7 additions, 0 deletionsdjango/meleager/admin/language.py
- django/meleager/admin/passage.py 18 additions, 0 deletionsdjango/meleager/admin/passage.py
- django/meleager/api_urls.py 2 additions, 0 deletionsdjango/meleager/api_urls.py
- django/meleager/fixtures/languages.json 1 addition, 1 deletiondjango/meleager/fixtures/languages.json
- django/meleager/management/commands/ap_api_manager/importer.py 3 additions, 1 deletion...o/meleager/management/commands/ap_api_manager/importer.py
- django/meleager/management/commands/ap_api_manager/managers/authors.py 2 additions, 0 deletions...er/management/commands/ap_api_manager/managers/authors.py
- django/meleager/management/commands/ap_api_manager/managers/keywords.py 20 additions, 1 deletion...r/management/commands/ap_api_manager/managers/keywords.py
- django/meleager/management/commands/ap_api_manager/managers/passages.py 3 additions, 1 deletion...r/management/commands/ap_api_manager/managers/passages.py
- django/meleager/management/commands/ap_api_manager/managers/scholies.py 2 additions, 2 deletions...r/management/commands/ap_api_manager/managers/scholies.py
- django/meleager/management/commands/ap_api_manager/managers/users.py 3 additions, 0 deletions...ager/management/commands/ap_api_manager/managers/users.py
- django/meleager/migrations/0003_auto_20201216_0308.py 27 additions, 0 deletionsdjango/meleager/migrations/0003_auto_20201216_0308.py
- django/meleager/migrations/0004_auto_20201216_2034.py 19 additions, 0 deletionsdjango/meleager/migrations/0004_auto_20201216_2034.py
- django/meleager/models/keyword.py 1 addition, 0 deletionsdjango/meleager/models/keyword.py
- django/meleager/models/language.py 9 additions, 0 deletionsdjango/meleager/models/language.py
- django/meleager/models/passage.py 20 additions, 0 deletionsdjango/meleager/models/passage.py
- django/meleager/serializers/author.py 6 additions, 1 deletiondjango/meleager/serializers/author.py
- django/meleager/serializers/city.py 2 additions, 1 deletiondjango/meleager/serializers/city.py
- django/meleager/serializers/description.py 2 additions, 0 deletionsdjango/meleager/serializers/description.py
Loading
Please register or sign in to comment