From 87b7f0d204940f5ee6dc83b382ed9aeb97b7c6c9 Mon Sep 17 00:00:00 2001 From: vabene1111 Date: Mon, 14 May 2018 11:31:17 +0200 Subject: [PATCH] emojis and migrations --- .gitignore | 2 - .idea/jsLibraryMappings.xml | 2 +- .idea/misc.xml | 2 +- .idea/recipes.iml | 4 +- cookbook/migrations/0001_initial.py | 80 + cookbook/migrations/0002_category_icon.py | 18 + .../migrations/0003_auto_20180514_1121.py | 23 + cookbook/migrations/__init__.py | 0 cookbook/models.py | 2 + cookbook/static/emojionearea/emojionearea.css | 560 ++++++ cookbook/static/emojionearea/emojionearea.js | 1743 +++++++++++++++++ .../static/emojionearea/emojionearea.min.css | 1 + .../static/emojionearea/emojionearea.min.js | 4 + cookbook/tables.py | 9 +- cookbook/templates/base.html | 3 + cookbook/templates/generic/edit_template.html | 1 + cookbook/templates/generic/new_template.html | 2 + cookbook/views/batch.py | 11 +- cookbook/views/edit.py | 14 +- cookbook/views/new.py | 4 +- 20 files changed, 2461 insertions(+), 24 deletions(-) create mode 100644 cookbook/migrations/0001_initial.py create mode 100644 cookbook/migrations/0002_category_icon.py create mode 100644 cookbook/migrations/0003_auto_20180514_1121.py create mode 100644 cookbook/migrations/__init__.py create mode 100644 cookbook/static/emojionearea/emojionearea.css create mode 100644 cookbook/static/emojionearea/emojionearea.js create mode 100644 cookbook/static/emojionearea/emojionearea.min.css create mode 100644 cookbook/static/emojionearea/emojionearea.min.js diff --git a/.gitignore b/.gitignore index e09e29a4..cd00b1df 100644 --- a/.gitignore +++ b/.gitignore @@ -70,5 +70,3 @@ secret_settings\.py *.sqlite3 \.idea/workspace\.xml - -cookbook/migrations/ diff --git a/.idea/jsLibraryMappings.xml b/.idea/jsLibraryMappings.xml index fdef3e97..6422d0b3 100644 --- a/.idea/jsLibraryMappings.xml +++ b/.idea/jsLibraryMappings.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 88c3c48e..ce57ca01 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/.idea/recipes.iml b/.idea/recipes.iml index 3ce3bafa..673a618d 100644 --- a/.idea/recipes.iml +++ b/.idea/recipes.iml @@ -16,7 +16,7 @@ - + @@ -27,6 +27,8 @@ + +