Commit e3864c77edd300b5b2f5d062e2a590fd483ca421
Exists in
master
Merge branch 'master' of https://git.ucsd.edu/110swag/flashy-backend
Conflicts: flashy/flashcards/models.py
Warning! This is a large diff.
To preserve performance the diff is not shown. Please, download the diff as plain diff or email patch instead.
Showing 37 changed files Inline Diff
- .gitignore
- README.md
- class_info.html.clean
- dump.json
- flashcards/admin.py
- flashcards/management/__init__.py
- flashcards/management/commands/__init__.py
- flashcards/management/commands/importsections.py
- flashcards/migrations/0001_initial.py
- flashcards/migrations/0002_auto_20150429_0248.py
- flashcards/migrations/0003_auto_20150429_0344.py
- flashcards/migrations/0004_auto_20150429_0827.py
- flashcards/migrations/0005_auto_20150430_0557.py
- flashcards/migrations/0006_auto_20150430_0643.py
- flashcards/migrations/0007_auto_20150430_0657.py
- flashcards/models.py
- flashcards/serializers.py
- flashcards/tests.py
- flashcards/views.py
- flashy/flashcards/admin.py
- flashy/flashcards/models.py
- flashy/flashcards/tests.py
- flashy/flashcards/views.py
- flashy/flashy/settings.py
- flashy/flashy/urls.py
- flashy/flashy/wsgi.py
- flashy/manage.py
- flashy/settings.py
- flashy/urls.py
- flashy/wsgi.py
- manage.py
- nginxconf/flashy.cards
- requirements.txt
- schedule_scraper/__init__.py
- schedule_scraper/scraper.py
- setup.sh
- templates/rest_framework/api.html