Skip to content
This repository has been archived by the owner on Oct 17, 2019. It is now read-only.

updating fork from master #1

Merged
merged 101 commits into from Feb 10, 2014
Merged

updating fork from master #1

merged 101 commits into from Feb 10, 2014

Conversation

daegun
Copy link

@daegun daegun commented Feb 10, 2014

No description provided.

ojii and others added 30 commits October 26, 2012 12:21
As we all know, adding, removing or changing apphook pages requires a
server restart. Until now, the maintainer/content-editors of a site
had to do and detect this manually.

I propose we add a signal ``cms.signals.urls_need_reloading`` which
fires when the CMS detects the server needs a restart.

This signal is just sent by the django CMS. The core itself does nothing
when this signal is sent. However it allows developers to write custom
listeners to that signal that take an appropriate action in their
envirnment.

For some common use cases, there might even be generic implementations
(outside djagno-cms core) which solve this issue (eg killing os.getppid
in single-server gunicorn systems).
This is to address the issue of not being able to edit models emitted by CMSPlugins. Because the event was being propagated, the double-click essentially triggers editing of both the model and of the plugin. The resulting mayhem made it impossible to do either. This fix seems to allow the editing of the model, without preventing edits to the plugin (by double-clicking on something other than the model).

Signed-off-by: Martin Koistinen <mkoistinen@gmail.com>
Apparently a bug was introduced in django_load.py. This code is not in sync with the source repo at: https://github.com/ojii/django-load where this issue has been fixed.

Ojii asked me (via IRC) to document this via this issue, and in my effort to clear out some of my old issues, I thought I'd simply post this fix. However, I suspect there's a deeper issue of why doesn't django-cms simply reference the source repo, instead of copy the code into the project?

Signed-off-by: Martin Koistinen <mkoistinen@gmail.com>
reimplementing jonprindivilles jstree fix #2270
Conflicts:
	cms/stacks/templatetags/stack_tags.py
remove the stacks package for real
* Instead of breaking placeholder_tags, makes it warn.
* Documented the deprecation of placeholdr_tags
* Added a check to the `cms check` command to check for deprecations
* Added a test for the deprecation check
digi604 and others added 28 commits February 7, 2014 13:27
copy all for placeholders working again
Conflicts:
	cms/templates/cms/toolbar/dragbar.html
only delete plugins of current language
The CMS modal was not displaying correctly in Firefox or Chrome. $(window).height() posed a problem when the height of the content in the CMS modal was greater than the screen height. Replacing $(window).height() with screen.height fixed the problem. This problem could also present itself when the content width is greater than screen width - thus $(window).width() was changed to screen.width.
…ages

Before this fix user receives:
AttributeError: 'NoneType' object has no attribute 'get_title'

When attempting to "Publish Changes" on a non-CMS page with static placeholders.

Signed-off-by: Martin Koistinen <mkoistinen@gmail.com>
Fix for Publish Changes on non-cms pages containing static_placeholders
Removed remaining plugins directory
Previously get_module() would try swallow the ImportError, but there are
two causes for the ImportError - the module file doesn't exists, or
importing the module file causes an ImportError.  We want to swallow the
first but not the second.

This commit uses the imp module - imp.find_module() looks for the module
and will cause an ImportError if the module does not exist.  But it will
not actually run the file code.  So the try/except block is put around
imp.find_module().  If there was no ImportError at that point, we then
to load_module() outside the try/except block, and if that fails we die
here immediately.
Had the arguments inverted, and didn't previously cope with modules deep
 in the heirarchy.
…f django-cms

Using the previously recommended version of 2.0.5 results in `ImportError: No module named utils` since cms.plugins.utils has been removed.

Upgrading djangocms-text-ckeditor to 2.1.1 resolves this.

Signed-off-by: Martin Koistinen <mkoistinen@gmail.com>
Inc. min. version of djangocms-text-ckeditor for recent builds of django-cms
don't swallow ImportError due to importing app that exists
daegun added a commit that referenced this pull request Feb 10, 2014
updating fork from master
@daegun daegun merged commit c20a6e8 into Livefyre:develop Feb 10, 2014
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
10 participants