Skip to content

Commit

Permalink
Merge pull request #3 from dperetti/release/0.2
Browse files Browse the repository at this point in the history
Release/0.2
  • Loading branch information
dperetti committed Sep 6, 2017
2 parents 6cafada + 0942621 commit 1a1c21a
Show file tree
Hide file tree
Showing 8 changed files with 76 additions and 36,899 deletions.
24 changes: 23 additions & 1 deletion Documentation.codestory/data.codestory
Original file line number Diff line number Diff line change
Expand Up @@ -934,6 +934,24 @@
"settings": {},
"title": "What is Wagtailmedium ?"
},
{
"items": [
{
"content": [
{
"text": "docker-compose run --rm webpack /node_modules/.bin/webpack --config /src/webpack.config.js --optimize-minimize",
"type": "command"
}
],
"ref": "b4bca1b0-9266-11e7-867c-7f6e91203e0a",
"settings": {},
"type": "shell"
}
],
"ref": "a5818da0-9266-11e7-8b2d-23764f7fce9f",
"settings": {},
"title": "Building for production"
},
{
"items": [
{
Expand Down Expand Up @@ -1415,6 +1433,10 @@
"ref": "c30ce700-bad2-11e6-b645-b93d7aab43b9",
"type": "note"
},
{
"ref": "a5818da0-9266-11e7-8b2d-23764f7fce9f",
"type": "note"
},
{
"ref": "2b79c340-c98d-11e5-82ac-c145e5c0a4b3",
"type": "note"
Expand All @@ -1425,7 +1447,7 @@
}
],
"selectedNotes": [
"2b79c340-c98d-11e5-82ac-c145e5c0a4b3"
"a5818da0-9266-11e7-8b2d-23764f7fce9f"
]
}
}
6 changes: 6 additions & 0 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@ Wagtailmedium is a Medium Editor integration for the Wagtail CMS.
**Note**: A more detailed `documentation <https://raw.githubusercontent.com/dperetti/Django-wagtailmedium/master/Documentation%20screenshot.png>`_ is available in `.codestory <http://codestoryapp.com>`_ format, along with a sample project to fiddle with.


Features
--------
- Compatible with Wagtail internal links, plus the ability to add url fragments.
- Configurable from the Django settings.
- Ability to create custom buttons (ex: text marker).

Features
--------
- Compatible with Wagtail internal links, plus the ability to add url fragments.
Expand Down
10 changes: 5 additions & 5 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
#Clcnt#
FROM debian:8
RUN apt-get update &&\
apt-get install -y python python-pip libjpeg-dev zlib1g-dev libpython-dev &&\
apt-get clean
FROM python:3.6

# Get and install pip latest
RUN curl --silent --show-error --retry 5 https://bootstrap.pypa.io/get-pip.py | python3.6

# for debugging
RUN pip install ipdb

# this will also trigger the install of Django
RUN pip install wagtail==1.7
RUN pip install wagtail==1.12.1

# create a wagtail starter site
# RUN mkdir -p /data/wagtail && cd /data/wagtail && wagtail start mysite
Expand Down
2 changes: 1 addition & 1 deletion docker/launch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ set -e
# no database yet ? let's run the migrations and fixtures #vkJmM#
if [ ! -f /db/db.sqlite3 ]; then
python manage.py migrate
python manage.py shell -c "execfile('fixture.py')"
python manage.py shell -c "exec(open('fixture.py').read())"
fi
exec "$@"
3 changes: 2 additions & 1 deletion project/wagtailmedium/rich_text.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from __future__ import absolute_import, unicode_literals

import json
import six

from django.forms import widgets
from wagtail.utils.widgets import WidgetWithScript
Expand Down Expand Up @@ -35,7 +36,7 @@ def build_medium_js_config(options):
"""
extensions = []
custom_buttons = options.get('custom_buttons')
for name, config in custom_buttons.iteritems():
for name, config in six.iteritems(custom_buttons):
config.update(dict(name=name))
extensions.append("""
%s: new (MediumEditor.MediumButtonFactory(%s))()
Expand Down
Loading

0 comments on commit 1a1c21a

Please sign in to comment.