Compare commits

...

No commits in common. "master" and "BES-56" have entirely different histories.

2639 changed files with 125 additions and 511 deletions

2
.gitignore vendored
View File

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

View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>

View File

@ -1,9 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="b23c009e-2f8a-48f7-8b29-023f93596932" name="Default Changelist" comment=""> <list default="true" id="b23c009e-2f8a-48f7-8b29-023f93596932" name="Default Changelist" comment="" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -31,8 +29,8 @@
<component name="PropertiesComponent"> <component name="PropertiesComponent">
<property name="DefaultHtmlFileTemplate" value="HTML File" /> <property name="DefaultHtmlFileTemplate" value="HTML File" />
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" /> <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../../../TAU/TAU_34/wmt_2017_git_master" /> <property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="settings.editor.selected.configurable" value="preferences.general" /> <property name="settings.editor.selected.configurable" value="project.propVCSSupport.Mappings" />
</component> </component>
<component name="RunDashboard"> <component name="RunDashboard">
<option name="ruleStates"> <option name="ruleStates">
@ -93,4 +91,9 @@
</map> </map>
</option> </option>
</component> </component>
<component name="VcsManagerConfiguration">
<ignored-roots>
<path value="$PROJECT_DIR$" />
</ignored-roots>
</component>
</project> </project>

View File

@ -128,17 +128,16 @@ USE_TZ = True
STATIC_URL = '/static/' STATIC_URL = '/static/'
TINYMCE_JS_URL = "https://cdn.tiny.cloud/1/r9o35nobg5gdj46hhxw3ohwbjh4yct23kx405ozckt8fj2k2/tinymce/5.1.4-66/tinymce.min.js" TINYMCE_JS_URL = "https://cdn.tiny.cloud/1/no-api-key/tinymce/5.1.4-66/tinymce.min.js"
TINYMCE_DEFAULT_CONFIG = { TINYMCE_DEFAULT_CONFIG = {
'height' : 500, 'height' : 500,
'skin': 'oxide-dark', 'plugins': "image,imagetools,media,codesample,link,code",
'branding': False, 'cleanup_on_startup': True,
'content_css': 'dark',
'plugins': "image,imagetools,media,codesample,link,code,wordcount",
'menubar': False, 'menubar': False,
'contextmenu': "cut, copy, link, media ", 'toolbar': "styleselect |undo redo | bold italic | alignleft aligncenter alignright | link image media codesample code",
'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_caption': True,
'image_advtab': True 'image_advtab': True,
'custom_undo_redo_levels': 10,
'file_browser_callback' : "myFileBrowser"
} }

View File

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

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