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: brightinteractive/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.
  • 11 commits
  • 5 files changed
  • 2 contributors

Commits on Oct 6, 2011

  1. Added requirements.txt for example

    Francis Devereux committed Oct 6, 2011
    Configuration menu
    Copy the full SHA
    b57e103 View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2012

  1. Merge github.com:feincms/feincms

    Francis Devereux committed Apr 20, 2012
    Configuration menu
    Copy the full SHA
    0554337 View commit details
    Browse the repository at this point in the history
  2. Update example/requirements.txt to latest versions

    Francis Devereux committed Apr 20, 2012
    Configuration menu
    Copy the full SHA
    62d6f19 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    b603a72 View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2012

  1. Merge remote-tracking branch 'upstream/master'

    Francis Devereux committed Jun 29, 2012
    Configuration menu
    Copy the full SHA
    96b2c17 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2012

  1. Merge remote-tracking branch 'upstream/master'

    Francis Devereux committed Jul 31, 2012
    Configuration menu
    Copy the full SHA
    def6edb View commit details
    Browse the repository at this point in the history
  2. Fix #261: 255 chars in URL paths should be enough for everyone (tm)

    ... MySQL sometimes cannot create indexes on longer fields
    matthiask authored and Francis Devereux committed Jul 31, 2012
    Configuration menu
    Copy the full SHA
    f66757f View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2012

  1. Merge git://github.com/feincms/feincms

    Francis Devereux committed Sep 11, 2012
    Configuration menu
    Copy the full SHA
    11a46f1 View commit details
    Browse the repository at this point in the history
  2. Convert cleanse into a method, to fix error when latest git feincms-c…

    …leanse is used:
    
    Error
    Traceback (most recent call last):
      File "/Users/francis/env/goway/lib/python2.6/site-packages/django/utils/unittest/case.py", line 333, in run
        testMethod()
      File "/Users/francis/Code/Bright/python/goway/apps/goway/tests/service/trip_finder.py", line 182, in test_intro_and_hero_image_text_escaping
        add_introduction_to_section_page(section_page, introduction)
      File "/Users/francis/Code/Bright/python/goway/apps/goway/tests/service/utils.py", line 98, in add_introduction_to_section_page
        content.save()
      File "/Users/francis/env/goway/lib/python2.6/site-packages/feincms/content/richtext/models.py", line 98, in save
        self.text = self.cleanse(self.text)
      File "/Users/francis/Code/Bright/python/feincms-cleanse/feincms_cleanse/__init__.py", line 64, in cleanse_html
        allow_tags=allowed_tags.keys() + ['style'],
    AttributeError: 'str' object has no attribute 'keys'
    
    The error is caused by the parameters (self, html) being passed to the cleanse function. cleanse_html (from feincms-cleanse 3f771e19) has (html, allowed_tags=cleanse_html_allowed) as its first 2 parameters, so passing (self, html) to it causes html to be a RichTextContent instance and allowed_tags to be the html string during cleanse_html execution, which is obvioysly not what it expects! It ends up raising an AttributeError when it tries to find the keys of allowed_tags, which doesn't work because allowed_tags is erroneously an HTML string.
    Francis Devereux committed Sep 11, 2012
    Configuration menu
    Copy the full SHA
    a0314cc View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2012

  1. Revert "Convert cleanse into a method, to fix error when latest git f…

    …eincms-cleanse is used:"
    
    This reverts commit a0314cc.
    
    Upstream now contains a different fix for the same issue (f311513).
    Francis Devereux committed Sep 19, 2012
    Configuration menu
    Copy the full SHA
    7b5dd38 View commit details
    Browse the repository at this point in the history
  2. Merge git://github.com/feincms/feincms

    Francis Devereux committed Sep 19, 2012
    Configuration menu
    Copy the full SHA
    3ca0269 View commit details
    Browse the repository at this point in the history
Loading