Compare commits

...

30 Commits

Author SHA1 Message Date
ksanu
4793046962 new readme 2020-04-02 09:53:32 +02:00
ksanu
269cda217d BES-65 Usunięcie mozliwosci logowania ze strony logowania 2020-01-19 23:55:40 +01:00
Th3NiKo
d123241d1c Merge branches, update sql 2020-01-19 19:03:19 +01:00
Th3NiKo
fd3812b24b Merge branch 'BES-6' 2020-01-19 19:01:20 +01:00
Th3NiKo
b43d9650bd Settings update 2020-01-19 18:54:43 +01:00
Dawid Majsnerowski
8dadec66b2 BES-66 | formatting tests 2020-01-19 16:51:29 +01:00
Dawid Majsnerowski
e31dd0d04d BES-66 | Add tests for formatting 2020-01-19 14:41:43 +01:00
Dawid Majsnerowski
c82fcfd552 BES-66 | Add tests for formatting 2020-01-19 14:40:45 +01:00
Th3NiKo
19274c4f3f BES-6 Remove Powered by Tiny, add word count instead 2020-01-19 11:10:45 +01:00
Th3NiKo
7b218b744d BES-6 Add new features, font color, font style, context menu. Fixed showing code sample properly 2020-01-19 11:02:52 +01:00
Th3NiKo
25b74a61d3 BES-6 Fix bug with adding notes and bug connected with showing wrong title 2020-01-18 19:02:58 +01:00
Dawid Majsnerowski
7fb58d3202 BES-66 | Add test for adding notes 2020-01-18 18:39:00 +01:00
Dawid Majsnerowski
38b56d55ec BES-66 | Add test for adding notes 2020-01-18 18:33:14 +01:00
Dawid Majsnerowski
cce93b2549 BES-66 | Add test for adding notes 2020-01-18 18:30:46 +01:00
Dawid Majsnerowski
81d1b731e4 BES-66 | fixing test 2020-01-18 14:08:53 +01:00
Dawid Majsnerowski
96e911283b BES-66 | fixing test 2020-01-18 14:07:04 +01:00
Th3NiKo
1553d6be08 BES-6 Updating note, no protections 2020-01-16 11:16:59 +01:00
Th3NiKo
54c5370b5d BES-6 Delete note 2020-01-15 16:47:34 +01:00
Th3NiKo
e78332631c Merge branch 'master' of https://git.wmi.amu.edu.pl/s452101/BestNotes 2020-01-15 16:15:27 +01:00
Th3NiKo
12db061392 BES-55 Fix error 2020-01-15 16:14:42 +01:00
Th3NiKo
48c4109964 BES-55 Show notes with tinymce plugin 2020-01-11 13:17:12 +01:00
Th3NiKo
be72c875c3 BES-55 Adding notes with tinymce, fix showing too many subjects 2020-01-11 12:45:47 +01:00
Dawid Majsnerowski
76d0e7ab4b Merge branch 'master' of https://git.wmi.amu.edu.pl/s452101/BestNotes 2020-01-01 20:18:40 +01:00
Dawid Majsnerowski
0d39d411f7 Fixing test - added cookies 2020-01-01 20:18:23 +01:00
Th3NiKo
032b4c34c2 Merge branch 'BES-52' 2019-12-22 12:44:20 +01:00
Dawid Majsnerowski
345100f5ca BES-53 | Added tests for User Notes and Topic Page 2019-12-15 21:18:58 +01:00
Th3NiKo
f9965d82e0 Merge branch 'BES-52' of https://git.wmi.amu.edu.pl/s452101/BestNotes into BES-52 2019-12-15 19:35:42 +01:00
Th3NiKo
6f518fe300 BES-52 Merge version 3 2019-12-15 19:34:49 +01:00
Th3NiKo
0e47b590a3 Merge version 3 2019-12-15 19:08:00 +01:00
ksanu
6e010e9bcf BES-45 BES-50 BES-51 Added topics.html template, added method to use template notes.html to generate notes_by_topic_id, modified backend to work with the mentioned addtions. 2019-12-15 17:49:20 +01:00
3163 changed files with 761 additions and 82 deletions

2
.gitignore vendored
View File

@ -1,4 +1,5 @@
/node_modules/
/test/allure-results/
/test/allure-results/*.xml
/test/allure-results/*.png
/test/allure-results/*.log
@ -6,6 +7,7 @@
/test/allure-results/*.mp4
/test/screenshots/*.png
/allure-report/
/_results_/
# Created by https://www.gitignore.io

View File

@ -2,16 +2,7 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="b23c009e-2f8a-48f7-8b29-023f93596932" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/bestnotes/static/note.css" afterDir="false" />
<change afterPath="$PROJECT_DIR$/bestnotes/templates/note.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/bestnotes/templates/test.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/bestnotes/templates/testid.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/bestnotes/admin.py" beforeDir="false" afterPath="$PROJECT_DIR$/bestnotes/admin.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/bestnotes/models.py" beforeDir="false" afterPath="$PROJECT_DIR$/bestnotes/models.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/bestnotes/urls.py" beforeDir="false" afterPath="$PROJECT_DIR$/bestnotes/urls.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/bestnotes/views.py" beforeDir="false" afterPath="$PROJECT_DIR$/bestnotes/views.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/db.sqlite3" beforeDir="false" afterPath="$PROJECT_DIR$/db.sqlite3" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
@ -40,7 +31,7 @@
<component name="PropertiesComponent">
<property name="DefaultHtmlFileTemplate" value="HTML File" />
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../../../TAU/TAU_34/wmt_2017_git_master" />
<property name="settings.editor.selected.configurable" value="preferences.general" />
</component>
<component name="RunDashboard">

View File

@ -44,6 +44,7 @@ INSTALLED_APPS = [
'django.contrib.messages',
'django.contrib.staticfiles',
'widget_tweaks',
'tinymce',
]
MIDDLEWARE = [
@ -125,3 +126,19 @@ USE_TZ = True
# https://docs.djangoproject.com/en/2.2/howto/static-files/
STATIC_URL = '/static/'
TINYMCE_JS_URL = "https://cdn.tiny.cloud/1/r9o35nobg5gdj46hhxw3ohwbjh4yct23kx405ozckt8fj2k2/tinymce/5.1.4-66/tinymce.min.js"
TINYMCE_DEFAULT_CONFIG = {
'height' : 500,
'skin': 'oxide-dark',
'branding': False,
'content_css': 'dark',
'plugins': "image,imagetools,media,codesample,link,code,wordcount",
'menubar': False,
'contextmenu': "cut, copy, link, media ",
'toolbar': "styleselect | undo redo | bold italic underline superscript subscript| fontselect fontsizeselect forecolor backcolor | alignleft aligncenter alignright | link image media codesample code",
'image_caption': True,
'image_advtab': True
}

View File

@ -20,5 +20,6 @@ from bestnotes.views import homepage
urlpatterns = [
path('bestnotes/', include('bestnotes.urls')),
path('', homepage, name='homepage'),
path(r'^tinymce/', include('tinymce.urls')),
path('admin/', admin.site.urls),
]

View File

@ -1,6 +1,7 @@
Testowe Readme do projektu BestNotes
Testowa zmiana
Demo dostępne pod adresem: http://bestnotes.pythonanywhere.com/
Dane do logowanie:
Email: admin
Hasło: admin
# Run Webdriver.IO tests locally
To run WebdriverIO tests locally, just execute:

Some files were not shown because too many files have changed in this diff Show More