Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
189 commits
Select commit Hold shift + click to select a range
e6fc91e
add fields (choose email template type/name) into the 'MassCommunicat…
tmszi Oct 14, 2019
de7244c
set load html template form field widget for the 'template'/'template…
tmszi Oct 14, 2019
3d3e58f
add 'ContentTools', 'inline.Styler' (css inline style), 'webui-popove…
tmszi Oct 14, 2019
9e34b9e
change 'MassCommunication' media js module name
tmszi Oct 14, 2019
5fa0456
add js modules handle 'ContentTools' editor initialization
tmszi Oct 14, 2019
51155d2
add js modules handle load html template form field widget initializa…
tmszi Oct 14, 2019
f0b1569
add load html template form field widget css file
tmszi Oct 14, 2019
68c779b
add automat newsletter templates with media files
tmszi Oct 14, 2019
4a07036
add 'get_email_template' view function return rendered email html tem…
tmszi Oct 14, 2019
cf0b126
add 'django-rest-swagger', 'django-filter', 'PyYAML', 'mkdocs', 'djan…
tmszi Oct 14, 2019
e692b7c
fix 'html_template_editor' app module name/import order
tmszi Oct 14, 2019
5fae3d3
fix js syntaxt
tmszi Oct 14, 2019
1718ba6
add 'html_template_editor' rest app settings
tmszi Oct 14, 2019
cdbd889
set js reverse url path config
tmszi Oct 14, 2019
3380bbf
add 'html_template_editor' app urls
tmszi Oct 14, 2019
348fdd4
load reverse url js module in the 'MassCommunication' template
tmszi Oct 14, 2019
e94e167
add js reverse url path app urls
tmszi Oct 14, 2019
fefe318
set 'aklub' app urls namespace
tmszi Oct 14, 2019
4578695
fix variable name
tmszi Oct 14, 2019
c149ff4
fix 'html_template_editor' app name in the reverse ulr js function
tmszi Oct 14, 2019
56930a2
add 'html_template_editor' app files
tmszi Oct 14, 2019
0a954f1
fix 'Images' model 'edited_crop' field 'max_length' parameter
tmszi Oct 14, 2019
106641c
remove debug info
tmszi Oct 14, 2019
9a9d225
rename js module file
tmszi Oct 14, 2019
501a7a0
rename js module in the 'MassCommunication' media class
tmszi Oct 14, 2019
08b1046
fix endcomment tag name
tmszi Oct 14, 2019
6306cb9
enable initialize wysiwyg editor for more than one form field via 'js…
tmszi Oct 14, 2019
d9fed37
set 'MassCommunication' 'template' model field 'blank' argument as True
tmszi Oct 14, 2019
b97f3f5
add 'clean' method (handle save form field html template value) in th…
tmszi Oct 14, 2019
d46f697
fix jquery edit template dialog title name
tmszi Oct 14, 2019
7908110
add 'cssutils' python module for the parse css
tmszi Oct 14, 2019
d91ae20
rename automat newsletter email template background svg images
tmszi Oct 14, 2019
f60d6d0
change automat html email newsletter template background image format…
tmszi Oct 14, 2019
900bfc8
change automat html email newsletter template background image css wi…
tmszi Oct 14, 2019
5f1e5ae
add 'cairosvg' py module, for the vector -> raster image conversion
tmszi Oct 14, 2019
a54f491
fix image name
tmszi Oct 14, 2019
9061c2a
add automat newsletter email template modified (image width = 518px) …
tmszi Oct 14, 2019
99559cb
fix automat newsletter email template video size element
tmszi Oct 14, 2019
3aceae4
modify automat newsletter email template css file
tmszi Oct 14, 2019
2ae5d9b
add aklub app management 'convert_newsletter_image' command for conve…
tmszi Oct 14, 2019
6063104
remove 'blank' value from 'template_name' form field choices list
tmszi Oct 14, 2019
a88b88b
override 'MassCommunicationAdmin' 'add_view' model method (set load h…
tmszi Oct 14, 2019
fa342b5
fix app name in the reverse function
tmszi Oct 14, 2019
a3bbfd3
fix flake8 errors
tmszi Oct 14, 2019
d5f88c0
add automat newsletter background images original size, extracted fro…
tmszi Oct 14, 2019
a531842
add 'csrf_token' js module
tmszi Oct 14, 2019
92e88d7
update 'Pipfile'/'Pipfile.lock'
tmszi Oct 15, 2019
1897c62
fix flake8 errors
tmszi Oct 15, 2019
e53690f
test 'html_template_editor' app
tmszi Oct 15, 2019
1a56f08
set 'popoverBackdrop' opt value during form field widget 'HtmlTemplat…
tmszi Oct 15, 2019
5bc0237
remake/replace js edit template modal dialog (jQuery ui dialog) with …
tmszi Oct 18, 2019
ec32a45
remove js debug info
tmszi Oct 18, 2019
d48e773
add create 'new_empty_template' (email template) option in the 'templ…
tmszi Oct 24, 2019
1174f22
destroy 'set template name' jQuery ui dialog after click on the close…
tmszi Oct 24, 2019
1e184b2
fix flake8 error
tmszi Oct 24, 2019
d73c0a6
add merged migration file
tmszi Oct 24, 2019
c550463
set html template form field widget options in the init function
tmszi Oct 24, 2019
fe0141e
remake automat newsletter email templates (apply table layout design …
tmszi Oct 28, 2019
7f0e3de
wrap editable email template text html element/img into the table lay…
tmszi Oct 28, 2019
5c64293
remove unused code
tmszi Oct 28, 2019
84837da
enable fade animation effect opt for the 'Edit template' popover dialog
tmszi Oct 29, 2019
3969881
rewrite html template form field widget from js to the coffee script
tmszi Nov 16, 2019
ca40304
add builded html template form field widget js minified file
tmszi Nov 16, 2019
bac5457
remove old unused 'form_field_widget_init.js', 'form_field_html_templ…
tmszi Nov 16, 2019
74acea3
add 'colorPicker' js lib
tmszi Nov 17, 2019
7139241
replace 'ContentTools' lib js file, add 'colorPicker' lib js file
tmszi Nov 17, 2019
4e90bea
fix syntax after the rebase merge conflict
tmszi Nov 17, 2019
e1ccb92
add custom 'Button' 'ContentTools' tool
tmszi Nov 17, 2019
cfa5f15
add 'build_contenttools' custom command (build custom js 'ContentTool…
tmszi Nov 17, 2019
61277b0
install 'sass' css preprocessor, needed for the build custom 'Content…
tmszi Nov 17, 2019
52a519a
add install 'sass' css preprocessor package, needed for the 'build_co…
tmszi Nov 17, 2019
fc59928
add merge migration file
tmszi Nov 17, 2019
9d08482
comment unused code
tmszi Nov 17, 2019
53699a9
remove unused 'cssutils' python package
tmszi Nov 17, 2019
16e88e3
fix flake8 error
tmszi Nov 17, 2019
43b698b
fix travis 'build_contenttools' cmd npm flag argument
tmszi Nov 17, 2019
ccebc45
fix ignore import rule and url statement inside static files comments
tmszi Nov 19, 2019
0649e31
update django
tmszi Nov 20, 2019
a160cb5
add merged migration file
tmszi Nov 20, 2019
3443952
add pull request reference
tmszi Nov 20, 2019
b5a28e3
fix check template name options exist
tmszi Nov 22, 2019
f5dd043
fix method name
tmszi Nov 22, 2019
060a210
fix vimeo video thumbnail size
tmszi Nov 23, 2019
4be2fd4
wait for an ajax request is done
tmszi Nov 23, 2019
364ca18
add 'FormatSelectorMixin' mixin class
tmszi Nov 24, 2019
c65e8a0
add video thumbnail title
tmszi Nov 25, 2019
4fc7d49
fix wait for an ajax request is done
tmszi Nov 25, 2019
274a657
add merged migration file
tmszi Jan 14, 2020
8a39ae8
fix Django bug ticket https://code.djangoproject.com/ticket/21080
tmszi Jan 15, 2020
90789f1
add official Django 2.2.x release
tmszi Jan 15, 2020
f215f27
set official Django 2.2.x release into the Travis config file
tmszi Jan 15, 2020
9d444a1
fix flake8 errors
tmszi Jan 15, 2020
52690bd
add merged migration file
tmszi Jan 15, 2020
bd88e14
fix installed Django package version
tmszi Jan 15, 2020
1981c95
start edit email html template via button
tmszi Jan 16, 2020
4a9b834
add build custom ContentTools js lib sandbox command
tmszi Jan 16, 2020
b35a389
add ContentTools js lib sandbox custom sass style file
tmszi Jan 16, 2020
fafcb67
fix wrong chromium browser email html template article element margin…
tmszi Jan 16, 2020
aba6304
fix variable name
tmszi Jan 17, 2020
a9b734a
fix open edit modal html template dialog via click on the edit buttton
tmszi Jan 17, 2020
ab56de5
disable/enable edit template button according selected template name
tmszi Jan 17, 2020
79bcefe
fix js syntax (trailing whitespace)
tmszi Jan 21, 2020
8cdb076
rename automat_newsletter.css -> base_template.css, and define styles
tmszi Jan 22, 2020
8ed1102
refactor AutoMat email templates
tmszi Jan 22, 2020
80f28b7
change AutoMat email template background image width from 518px to 600px
tmszi Jan 22, 2020
843978b
fix syntax
tmszi Jan 22, 2020
495551e
set email html template content padding (left, right) value 35px
tmszi Jan 22, 2020
fa028ef
add edit email html template align justify text tool
tmszi Jan 22, 2020
9cca3ed
refactor build_contenttools management command
tmszi Jan 23, 2020
83487a2
fix AutoMat email template table container width to 600px same as the…
tmszi Jan 23, 2020
c963c0a
fix flake8 errors
tmszi Jan 23, 2020
5b224fe
add edit email html template set background image ContentTools tool
tmszi Feb 3, 2020
2dab116
remove print statement
tmszi Feb 3, 2020
fdf3e18
add merged migration file
tmszi Feb 3, 2020
1d66124
fix load jquery.inlineStyler js lib
tmszi Feb 3, 2020
04258a0
add add vertical space ContentTools tool
tmszi Feb 5, 2020
f1c2a27
fix js libs order (required by the html email template)
tmszi Feb 5, 2020
639a9e6
fix syntax
tmszi Feb 10, 2020
8578357
fix: build_contenttolls command __copy_sass_styles method
tmszi Feb 11, 2020
f0531bd
feat: add default AutoMat fonts
tmszi Feb 11, 2020
e92d84d
feat: add django-phonenumber-field, phonenumbers py package
tmszi Feb 14, 2020
835a9da
fix: html email template background image width/heigth
tmszi Feb 18, 2020
99d6497
feat: add html email template footer
tmszi Feb 18, 2020
8dc3abd
fix: remove table cell border
tmszi Feb 18, 2020
4c2da82
fix: update load html email template blacklist filter
tmszi Feb 18, 2020
79a63d5
fix: set correct background image container height according
tmszi Feb 18, 2020
34e4a6a
feat: add increase/decrease font size ContentTools tool
tmszi Feb 27, 2020
623eeb7
feat: add font size ContentTools tool
tmszi Mar 1, 2020
484b2e8
fix: font size/increare/decrease font size ContentTools tools
tmszi Mar 1, 2020
6f4576c
feat: add line spacing ContentTools tool
tmszi Mar 1, 2020
6aba4bb
fix: change add vertical space ContentTools tool icon to the 'page-br…
tmszi Mar 1, 2020
e784533
style: all custom ContentTools tools
tmszi Mar 2, 2020
2af3120
fix: add button ContentTools tool
tmszi Mar 2, 2020
7e73ec0
fix: save/load dynamic created css class definition into the db
tmszi Mar 6, 2020
15bf353
fix: refactor build ContentTools sandbox css file
tmszi Mar 6, 2020
6ddd292
style: build_contenttools command
tmszi Mar 6, 2020
ba68cf1
fix: set ContentTools template width to the 600px
tmszi Mar 6, 2020
911ec95
feat: minify ContentTools sandbox css file
tmszi Mar 6, 2020
685e60e
style: fix flake8 error
tmszi Mar 9, 2020
52fdffa
fix: icon_name model field choices lazy loading
tmszi Mar 9, 2020
14a69cd
style: fix indent
tmszi Mar 11, 2020
c05ccd8
style: template_widget
tmszi Mar 11, 2020
acbb5f5
chore: add merged migration files
tmszi Apr 6, 2020
e2204b8
fix: lazy loading icon_name model field choices
tmszi Apr 14, 2020
a2b0876
feat: add TemplateHeader model
tmszi Apr 14, 2020
c44d749
feat: add TemplateHeaderAdminInline admin model class
tmszi Apr 14, 2020
46cac0f
feat: add TemplateHeader object into the template context
tmszi Apr 14, 2020
9447d3d
feat: add email template header.html file
tmszi Apr 14, 2020
1fb1bd4
feat: include header.html file in the all email templates
tmszi Apr 14, 2020
52bff6f
chore: add merged migration files
tmszi Apr 21, 2020
8eb94e0
feat: validate template header logo image format
tmszi Apr 21, 2020
ee3f287
feat: add TemplateFooter model name, user field
tmszi Apr 25, 2020
4fb0f2a
feat: add TemplateFooterAdminForm admin model form class
tmszi Apr 25, 2020
a974170
feat: set TemplateFooter model fields short description
tmszi Apr 25, 2020
4241257
fix: remove use django wysiwyg TinyMCE editor from template form fiel…
tmszi Apr 29, 2020
6af044e
feat: load ContentTools translation file
tmszi Apr 29, 2020
d118502
fix: remove unused import
tmszi Apr 29, 2020
3f0c59b
feat: add custom ContentTools tools cs language translation file
tmszi May 4, 2020
1eccad8
feat: append custom localization files in the 'build_contenttools' co…
tmszi May 4, 2020
d207217
fix: ContentTools custom decrease font size tool translation text
tmszi May 4, 2020
d64fa4e
fix: update ContentTools cs language translation file
tmszi May 4, 2020
26e02dd
fix: flake8 errors after rebase
tmszi May 11, 2020
a39734a
chore: add merged migration file
tmszi May 11, 2020
6d060f1
fix: add missing model field verbose name arg into the all fields/models
tmszi May 11, 2020
1b0f715
fix: logo image file size validator message
tmszi May 11, 2020
9895486
feat: add 'html_template_editor' app cs language localization file
tmszi May 11, 2020
53aaae4
feat: add masscommunication model html template widget cs language js…
tmszi May 13, 2020
b6988c2
chore: add merged migration file
tmszi May 14, 2020
b369911
fix: manual setting of 'tablib' py module hashes (wrong hashes settin…
tmszi Jul 13, 2020
bb67de4
style: fix flake8 error
tmszi Jul 17, 2020
70aee81
fix: travis config file
tmszi Jul 17, 2020
865f16b
style: fix quoutes
tmszi Jul 17, 2020
a688751
fix: replace social media choices model field lazy loading with norma…
tmszi Jul 17, 2020
8528f62
fix: return model str value
tmszi Jul 17, 2020
637fc5c
fix: deployment error (compile messages)
tmszi Jul 17, 2020
4e9eabb
fix: remove obsolete init wysiwyg setup
tmszi Jul 18, 2020
14e9cf1
fix: set 'X_FRAME_OPTIONS' to make email templates work on Heroku
tmszi Jul 18, 2020
ab317d9
fix: update 'Pipfile.lock'
tmszi Jul 18, 2020
da6f1c2
fix: Heroku collectstatic phase
timthelion Jul 16, 2020
c9af59c
fix: add install 'sass' css preprocessor (build_contenttools cmd depe…
tmszi Jul 18, 2020
c7164e9
fix: better way how to set template (loaded from file or db) backgrou…
tmszi Oct 11, 2020
2dc42db
fix: load email templates files from directory
tmszi Oct 11, 2020
6945e31
fix: remove duplicated URL path
tmszi Oct 11, 2020
aaf463f
fix: add condition to set/read page id value
tmszi Oct 11, 2020
09cb37b
fix: add condition in the footer template for checking footer model m…
tmszi Oct 11, 2020
01f89a4
chore: update 'template_widget' coffescript lib gruntfile npm 'packag…
tmszi Oct 11, 2020
e87c706
chore: add merged migration file
tmszi Oct 11, 2020
d5271f1
style: line width 80 characters
tmszi Oct 11, 2020
eba74b1
style: fix flake8 error
tmszi Oct 29, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,13 @@ install:
- pip install pipenv
- pipenv install --dev --ignore-pipfile --python=python$TRAVIS_PYTHON_VERSION
- pipenv run python --version
- pipenv run pip install flake8-strict # not installable with pipenv, move ther when repaired
- pipenv run pip install flake8-strict # not installable with pipenv, move ther when repaired
- pipenv run pip install -q $DJANGO_VERSION
before_script:
- npm install -g bower
- npm install -g bower sass
- pipenv run flake8
- pipenv run python manage.py bower install
- pipenv run python manage.py build_contenttools --npm $(which npm)
- pipenv run python manage.py collectstatic -v0 --noinput
- cd apps/aklub/
- DJANGO_SETTINGS_MODULE="" pipenv run django-admin compilemessages
Expand All @@ -42,6 +43,6 @@ after_script:
addons:
postgresql: "9.6"
matrix:
allow_failures:
- env: DJANGO_VERSION='https://github.com/django/django/archive/master.tar.gz'
- env: DJANGO_VERSION="Django>=3.0,<3.1"
allow_failures:
- env: DJANGO_VERSION='https://github.com/django/django/archive/master.tar.gz'
- env: DJANGO_VERSION="Django>=3.0,<3.1"
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ WORKDIR "/home/aplikace"

run pip3 install pipenv

RUN npm install -g less bower
RUN npm install -g less bower sass
RUN pip3 install pipenv==2018.11.14
RUN useradd test
RUN chsh test -s /bin/bash
Expand Down
12 changes: 9 additions & 3 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ django-stdimage = "*"
reportlab = "*"
django-extensions = "*"
"psycopg2" = "*"
django-wysiwyg = "*"
django-wysiwyg = {editable = true,git = "https://github.com/tmszi/django-wysiwyg.git",ref = "enable_editor_for_more_fields"}
django-tinymce = "*"
django-admin-tools = "*"
feedparser = "*"
Expand Down Expand Up @@ -48,7 +48,6 @@ django-sesame = "==1.4"
django-ses = "*"
drf-yasg = "*"
vokativ = "*"
Django = ">=2,<3"
"PyPDF2" = "*"
django-post_office = {ref = "jsonfield2",git = "https://github.com/Mogost/django-post_office",editable = true} # for django-jsonfield2 transition
raven = "*"
Expand Down Expand Up @@ -92,7 +91,14 @@ faker = "*"
# TODO: fix computedfields error in version 0.1.0 (syntax changed in models)
django-computedfields = "==0.0.23"
django-oauth-toolkit = "*"

django-rest-swagger = "*"
django-filter = "*"
django-js-urls = "*"
mkdocs = "*"
cairosvg = "*"
django = "<3,>=2"
django-phonenumber-field = "*"
phonenumbers = "*"

[dev-packages]
coverage = "*"
Expand Down
Loading