Commit 7c509208 authored by Florent Chehab's avatar Florent Chehab
Browse files

Merge branch 'new_file_orga' into 'master'

New repo organization

Closes #38

See merge request !42
parents 818af843 f794902c
Pipeline #34760 failed with stages
in 2 minutes and 40 seconds
from backend.models.country import Country
from backend_app.models.country import Country
import os
import pandas as pd
from .loadGeneric import LoadGeneric
......
from backend.models.currency import Currency
from backend_app.models.currency import Currency
import os
import csv
from .loadGeneric import LoadGeneric
......
from backend.models.tag import Tag
from backend_app.models.tag import Tag
import os
import json
......
from backend.models.country import Country
from backend.models.city import City
from backend.models.university import University
from backend.models.campus import Campus
from backend_app.models.country import Country
from backend_app.models.city import City
from backend_app.models.university import University
from backend_app.models.campus import Campus
import os
import pandas as pd
......
from .loadGeneric import LoadGeneric
from backend.models.university import University
from backend.models.university import UniversityDri
from backend.models.university import UniversityInfo
from backend.models.university import UniversitySemestersDates
from backend.models.country import CountryScholarship
from backend.models.country import Country
from backend.models.university import UniversityTaggedItem
from backend_app.models.university import University
from backend_app.models.university import UniversityDri
from backend_app.models.university import UniversityInfo
from backend_app.models.university import UniversitySemestersDates
from backend_app.models.country import CountryScholarship
from backend_app.models.country import Country
from backend_app.models.university import UniversityTaggedItem
from backend.models.currency import Currency
from backend.models.tag import Tag
from backend_app.models.currency import Currency
from backend_app.models.tag import Tag
from datetime import datetime
......
# Generated by Django 2.0.3 on 2018-09-16 13:55
import backend.models.university.university
import backend_app.models.university.university
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('backend', '0001_initial'),
('backend_app', '0001_initial'),
]
operations = [
......@@ -144,7 +144,7 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='university',
name='logo',
field=models.URLField(blank=True, default='', validators=[backend.models.university.university.validate_extension_django]),
field=models.URLField(blank=True, default='', validators=[backend_app.models.university.university.validate_extension_django]),
),
migrations.AlterField(
model_name='university',
......
......@@ -6,7 +6,7 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('backend', '0002_auto_20180916_1555'),
('backend_app', '0002_auto_20180916_1555'),
]
operations = [
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment