…missions-merge3 Conflicts: cms/templates/cms/toolbar/toolbar.html
…es, made login work
Conflicts: cms/admin/dialog/views.py cms/admin/forms.py cms/admin/models.py cms/admin/pageadmin.py cms/admin/permissionadmin.py cms/cache/permissions.py cms/models/fields.py cms/models/managers.py cms/models/moderatormodels.py cms/models/pagemodel.py cms/models/permissionmodels.py cms/models/placeholdermodel.py cms/models/pluginmodel.py cms/signals.py cms/templatetags/cms_admin.py cms/tests/base.py cms/tests/permmod.py cms/utils/admin.py cms/utils/mail.py cms/utils/permissions.py cms/views.py menus/menu_pool.py tests/buildout.cfg
… root), improved docs on cmsplugin subclasses (663)
Removed a debugging statement in managers.py Fixed memoizing issues in cms.views.details
…s not available in the current language. Previous versions of the method did not translate the page, this is carried forward
- Added more inline docs
- Cleanup the print statement
…w have an understanding of the problem's magnitude.
… - was adding plugins to slave_page and then publishing another page
… not published. Previous fix was replicating code from PageQuerySet. New fix uses the respective methods from PageQuerySet.