Commit f7b3fc08 authored by Florent Chehab's avatar Florent Chehab
Browse files

Merge branch 'app_renamed' into 'master'

App renamed from rex to backend to be clearer

See merge request chehabfl/outgoing_rex!12
parents 55e35f6d 99f8d783
from django.db import models from django.db import models
from rex.models.module import BasicModule from backend.models.module import BasicModule
from rex.models.university import University from backend.models.university import University
from rest_framework import viewsets, permissions from rest_framework import viewsets, permissions
from rex.models.module import BasicModuleSerializer from backend.models.module import BasicModuleSerializer
#################### ####################
# Insurance # Insurance
......
from django.db import models from django.db import models
from rex.models.university import University from backend.models.university import University
from rex.models.module import DriRestrictedModule, DriRestrictedModuleSerializer from backend.models.module import DriRestrictedModule, DriRestrictedModuleSerializer
from rest_framework import viewsets, permissions from rest_framework import viewsets, permissions
......
from django.db import models from django.db import models
from rex.models.module import BasicModule, BasicModuleSerializer from backend.models.module import BasicModule, BasicModuleSerializer
from rex.models.university import University from backend.models.university import University
from rex.models.module import Currency from backend.models.module import Currency
from django.core.validators import MinValueValidator from django.core.validators import MinValueValidator
from rest_framework import viewsets, permissions from rest_framework import viewsets, permissions
......
from django.db import models from django.db import models
from rex.models.university import University from backend.models.university import University
from rex.models.module import VersionnedModuleSerializer from backend.models.module import VersionnedModuleSerializer
from rex.models.module import Photo from backend.models.module import Photo
from rest_framework import viewsets, permissions from rest_framework import viewsets, permissions
......
from django.db import models from django.db import models
from rex.models.university import University from backend.models.university import University
from rex.models.module import Scholarship, BasicModuleSerializer from backend.models.module import Scholarship, BasicModuleSerializer
from rest_framework import viewsets, permissions from rest_framework import viewsets, permissions
......
from django.db import models from django.db import models
from rex.models.module import BasicModule, BasicModuleSerializer from backend.models.module import BasicModule, BasicModuleSerializer
from rex.models.university import University from backend.models.university import University
from rest_framework import serializers, viewsets, permissions from rest_framework import serializers, viewsets, permissions
......
from django.db import models from django.db import models
from rest_framework import viewsets, permissions, serializers from rest_framework import viewsets, permissions, serializers
from rex.models.otherCore.specialty import Specialty from backend.models.otherCore.specialty import Specialty
from rex.models.otherCore.semester import Semester from backend.models.otherCore.semester import Semester
from rex.models.university import University from backend.models.university import University
from django.contrib.auth.models import User from django.contrib.auth.models import User
from django.contrib.postgres.fields import JSONField from django.contrib.postgres.fields import JSONField
......
...@@ -2,8 +2,8 @@ from django.db import models ...@@ -2,8 +2,8 @@ from django.db import models
from rest_framework import viewsets, permissions from rest_framework import viewsets, permissions
from django.core.validators import MaxValueValidator from django.core.validators import MaxValueValidator
from rex.models.user import UserRestrictedModule, UserRestrictedModuleSerializer from backend.models.user import UserRestrictedModule, UserRestrictedModuleSerializer
from rex.models.user import PreviousDeparture from backend.models.user import PreviousDeparture
from django.contrib.postgres.fields import JSONField from django.contrib.postgres.fields import JSONField
......
...@@ -2,11 +2,11 @@ from django.db import models ...@@ -2,11 +2,11 @@ from django.db import models
from rest_framework import viewsets, permissions from rest_framework import viewsets, permissions
from django.core.validators import MaxValueValidator from django.core.validators import MaxValueValidator
from rex.models.university import University from backend.models.university import University
from rex.models.user import UserRestrictedModule, UserRestrictedModuleSerializer from backend.models.user import UserRestrictedModule, UserRestrictedModuleSerializer
from rex.models.otherCore import Specialty from backend.models.otherCore import Specialty
from rex.models.user import RecommendationList from backend.models.user import RecommendationList
class Recommendation(UserRestrictedModule): class Recommendation(UserRestrictedModule):
......
from django.db import models from django.db import models
from rest_framework import viewsets, permissions from rest_framework import viewsets, permissions
from rex.models.user import UserRestrictedModule, UserRestrictedModuleSerializer from backend.models.user import UserRestrictedModule, UserRestrictedModuleSerializer
class RecommendationList(UserRestrictedModule): class RecommendationList(UserRestrictedModule):
......
from django.db import models from django.db import models
from rest_framework import viewsets, permissions from rest_framework import viewsets, permissions
from rex.models.tools import UsefullLinksField from backend.models.tools import UsefullLinksField
from django.contrib.postgres.fields import JSONField from django.contrib.postgres.fields import JSONField
from rex.models.user import UserRestrictedModule, UserRestrictedModuleSerializer from backend.models.user import UserRestrictedModule, UserRestrictedModuleSerializer
class UserData(UserRestrictedModule): class UserData(UserRestrictedModule):
......
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