Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: feincms/feincms
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: balmaster/feincms
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 5 commits
  • 0 files changed
  • 1 contributor

Commits on Mar 10, 2014

  1. Merge branch 'v1.6.3' 

    # By Matthias Kestenholz (5) and others
# Via Matthias Kestenholz
* v1.6.3:
  FeinCMS v1.6.3
  Reuse our own shorten_string method instead of truncate_words (deprecated)
  fix feincms cleanse function calls by converting them to instance methods
  Assure fe_tools is always on top with higher z-index
  Replace session to COOKIE for frontend_editing in tests too
  Replace session for COOKIE for frontend_editing in other places
  FIX frontend_editing error introduced in dd087a9
  var added.
  Administration: If all elements in a region are deleted, the empty message is visible and it is possible adding new content types which are displayed correctly.
  Improve the copy-pasteability of the feincms_languagelinks documentation
  Regenerate locale files
  Update pt translation
    @balmaster
    balmaster committed Mar 10, 2014
    Configuration menu
    Copy the full SHA
    076d1db View commit details
    Browse the repository at this point in the history

  2. Merge branch 'v1.6.4' 

    # By Matthias Kestenholz (9) and others
# Via Matthias Kestenholz
* v1.6.4: (26 commits)
  FeinCMS v1.6.4
  Fix #390: No longer depend on return value of add-row handler.
  Fix #386: Do not crash in feincms_nav if no extensions registered
  Revert commit 3ceb1a3. The attempt at elegance caused a bug where reverse relations didn't always end up cached.
  Update docs/contenttypes.rst
  Better be safe: Escape item titles in the tree editor
  Make datepublisher save aware datetimes
  Add a test related to 3ceb1a3
  VideoContent: Use protocol-relative URLs when embedding
  Last patch re #323 was a sledgehammer to crack a walnut. This is a better solution.
  Fix #373: Video embedding on SSL-secured websites
  Adding a 'force' parameter to ensure_completely_loaded, and a forced call when a content_type is added. See #323
  Blog entries do not have a redirect_to attribute
  Fix #376: Intermittent crashes in RSSContent.cache_content
  fix AttributeError when using cleanse with section content
  Added patch to frontend bug cookies check
  Reset personal data
  Avoid error for unbound local variable in tag
  Fix #366: Wrong number of parameters for get_inline_instances in Django 1.5
  fix typos: i.e. stands for d.h. e.g. for z.B.
  ...
    @balmaster
    balmaster committed Mar 10, 2014
    Configuration menu
    Copy the full SHA
    0fee508 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'v1.7.0' 

    # By Matthias Kestenholz (105) and others
# Via Matthias Kestenholz (47) and Martin J. Laubach (4)
* v1.7.0: (160 commits)
  FeinCMS v1.7.0
  Fix #382: Do not crash if video URL could not be parsed
  Add a TODO
  Move the extensions docs into their own file
  Update the release notes for v1.7
  Remove unused import
  Update jquery.alerts.js to 1.01 (minor bug fix)
  Update german translations.
  Move out PageManager into a BasePageManager. Make sure that ActiveAwareContentManagerMixin does keep its data per-class (and not shared amongst subclasses). Move registration of default Page request processors into own method so we can reuse that for other BasePage subclasses.
  Start to abstractify Page into a BasePage so that it can be safely subclassed.
  only process fieldset if they are not customized
  compiled .mo file for Spanish (es) translation
  Updated Spanish (es) translation .po file
  Updated Spanish (es) translation .po file
  Updated Spanish (es) translation .po file
  ct_tracker: One less database query when invalidating the cache
  VideoContent: Use protocol-relative URLs when embedding
  Fix an inconsistency in get_original_translation: Raise if not exists
  Stop depending on SITE_ID being set
  Tweak inactive page colour
  ...
    @balmaster
    balmaster committed Mar 10, 2014
    Configuration menu
    Copy the full SHA
    aeb27c3 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'v1.7.1' 

    # By Matthias Kestenholz
# Via Matthias Kestenholz
* v1.7.1:
  FeinCMS v1.7.1
  Fix #394: Generation of extension search paths
  Fix sitemap generation when there are no pages yet
  1.7 requires Django 1.4 or better
  Fix TreeEditor.indented_short_title if get_absolute_url crashes
    @balmaster
    balmaster committed Mar 10, 2014
    Configuration menu
    Copy the full SHA
    4fce9b7 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'v1.7.7' 

    # By Matthias Kestenholz (27) and others
# Via Matthias Kestenholz (10) and others
* v1.7.7: (52 commits)
  FeinCMS v1.7.7
  Remove @commit_on_success, this should really not be necessary anymore
  Ensure the PK field is rendered in inline admin forms
  Push/pull translations from transifex
  In the docs, mention that FEINCMS_RICHTEXT_INIT_TEMPLATE needs to be set if using TinyMCE 4.x
  FeinCMS v1.7.6
  Always process the Page.redirect_to field in the admin form
  FeinCMS v1.7.5
  Add a ready-made, TinyMCE 4 compatible richtext template (from `next`)
  Fix #450, fix #452: No more crashes because of tuple/list problems with ModelAdmin extensions
  Optimize translations extension admin with prefetching
  Add prefetch_modeladmin_get_queryset function to extensions.
  Fix #445: Signed/unsigned problem with MySQL 5.5
  fix for issue #466, h2 not shown when dragging
  Update context_processors.py
  Also add a tox.ini section for running the testsuite with Django@master
  (Partial?) Fix ensure_completely_loaded, testsuite passes with Django 1.4, 1.5, 1.6
  Add tox configuration for running the testsuite with the upcoming Django 1.6
  BeautifulSoup is also a dependency of the testsuite
  Make tox actually run tests
  ...
    @balmaster
    balmaster committed Mar 10, 2014
    Configuration menu
    Copy the full SHA
    8de9702 View commit details
    Browse the repository at this point in the history
Loading