Merge branch 'dev_JSC_20200906_ontologyBasedStuff' into staging
No related branches found
No related tags found
Showing
- colleges/admin.py 5 additions, 2 deletionscolleges/admin.py
- colleges/migrations/0015_auto_20200906_0714.py 35 additions, 0 deletionscolleges/migrations/0015_auto_20200906_0714.py
- colleges/migrations/0016_populate_colleges.py 29 additions, 0 deletionscolleges/migrations/0016_populate_colleges.py
- colleges/migrations/0017_fellowship_college.py 19 additions, 0 deletionscolleges/migrations/0017_fellowship_college.py
- colleges/migrations/0018_fellowship_set_college.py 25 additions, 0 deletionscolleges/migrations/0018_fellowship_set_college.py
- colleges/migrations/0019_auto_20200906_1436.py 19 additions, 0 deletionscolleges/migrations/0019_auto_20200906_1436.py
- colleges/models/__init__.py 9 additions, 0 deletionscolleges/models/__init__.py
- colleges/models/college.py 64 additions, 0 deletionscolleges/models/college.py
- colleges/models/fellowship.py 72 additions, 0 deletionscolleges/models/fellowship.py
- colleges/models/potential_fellowship.py 5 additions, 55 deletionscolleges/models/potential_fellowship.py
- finances/constants.py 2 additions, 0 deletionsfinances/constants.py
- finances/migrations/0016_auto_20200901_0631.py 18 additions, 0 deletionsfinances/migrations/0016_auto_20200901_0631.py
- journals/context_processors.py 3 additions, 0 deletionsjournals/context_processors.py
- journals/migrations/0090_publication_cf_author_affiliation_indices_list.py 19 additions, 0 deletions...ns/0090_publication_cf_author_affiliation_indices_list.py
- journals/migrations/0091_auto_20200821_1427.py 19 additions, 0 deletionsjournals/migrations/0091_auto_20200821_1427.py
- journals/migrations/0092_auto_20200906_0903.py 26 additions, 0 deletionsjournals/migrations/0092_auto_20200906_0903.py
- journals/migrations/0093_journal_college.py 29 additions, 0 deletionsjournals/migrations/0093_journal_college.py
- journals/migrations/0094_auto_20200906_1355.py 19 additions, 0 deletionsjournals/migrations/0094_auto_20200906_1355.py
- journals/models/journal.py 24 additions, 1 deletionjournals/models/journal.py
- journals/models/publication.py 42 additions, 1 deletionjournals/models/publication.py
Loading
Please register or sign in to comment