Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor bugfixes for 3.5 #6177

Merged
merged 6 commits into from Dec 14, 2017
Merged

Conversation

vxsx
Copy link
Contributor

@vxsx vxsx commented Dec 11, 2017

  1. made "view on site" links close the sideframe (and removed bunch on unused code)
  2. fixed a bug where welcome page (and wizard) wouldn't respect toolbar language but instead would use the page language

@@ -1,4 +1,4 @@
<!doctype html>{% load i18n staticfiles cms_tags cms_static sekizai_tags %}
<!doctype html>{% load i18n l10n staticfiles cms_tags cms_static sekizai_tags %}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we don't need the l10n

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

right, fixed

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.08%) to 79.028% when pulling c184738 on vxsx:bugfix/3.5.x/minor-bugfixes into 47c7140 on divio:develop.

@vxsx vxsx force-pushed the bugfix/3.5.x/minor-bugfixes branch from c184738 to 1ce9c4b Compare December 12, 2017 08:30
@coveralls
Copy link

Coverage Status

Coverage decreased (-0.08%) to 79.028% when pulling 1ce9c4b on vxsx:bugfix/3.5.x/minor-bugfixes into 47c7140 on divio:develop.

@vxsx vxsx force-pushed the bugfix/3.5.x/minor-bugfixes branch from 1ce9c4b to 59ac648 Compare December 12, 2017 13:32
@coveralls
Copy link

Coverage Status

Coverage decreased (-0.08%) to 79.028% when pulling 59ac648 on vxsx:bugfix/3.5.x/minor-bugfixes into a970819 on divio:develop.

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.06%) to 79.048% when pulling f62da5f on vxsx:bugfix/3.5.x/minor-bugfixes into a970819 on divio:develop.

@vxsx vxsx force-pushed the bugfix/3.5.x/minor-bugfixes branch from f62da5f to 1daf082 Compare December 13, 2017 11:19
@coveralls
Copy link

Coverage Status

Coverage decreased (-0.06%) to 79.048% when pulling 1daf082 on vxsx:bugfix/3.5.x/minor-bugfixes into a970819 on divio:develop.

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.06%) to 79.048% when pulling 2c77bc1 on vxsx:bugfix/3.5.x/minor-bugfixes into a970819 on divio:develop.

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.04%) to 79.068% when pulling cb8fd3c on vxsx:bugfix/3.5.x/minor-bugfixes into a970819 on divio:develop.

@vxsx vxsx force-pushed the bugfix/3.5.x/minor-bugfixes branch from cb8fd3c to 6edd618 Compare December 13, 2017 17:49
@coveralls
Copy link

Coverage Status

Coverage decreased (-0.04%) to 79.068% when pulling 6edd618 on vxsx:bugfix/3.5.x/minor-bugfixes into 1980431 on divio:develop.

@vxsx vxsx force-pushed the bugfix/3.5.x/minor-bugfixes branch from 6edd618 to 4aaaf51 Compare December 13, 2017 20:16
@coveralls
Copy link

coveralls commented Dec 13, 2017

Coverage Status

Coverage decreased (-0.04%) to 79.068% when pulling 4aaaf51 on vxsx:bugfix/3.5.x/minor-bugfixes into ba16eb9 on divio:develop.

@vxsx vxsx merged commit f18f993 into django-cms:develop Dec 14, 2017
@vxsx vxsx deleted the bugfix/3.5.x/minor-bugfixes branch December 14, 2017 07:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants