-
Notifications
You must be signed in to change notification settings - Fork 239
Comparing changes
Open a pull request
base repository: feincms/feincms
base: main
head repository: brightinteractive/feincms
compare: master
- 11 commits
- 5 files changed
- 2 contributors
Commits on Oct 6, 2011
-
Added requirements.txt for example
Francis Devereux committedOct 6, 2011 Configuration menu - View commit details
-
Copy full SHA for b57e103 - Browse repository at this point
Copy the full SHA b57e103View commit details
Commits on Apr 20, 2012
-
Merge github.com:feincms/feincms
Francis Devereux committedApr 20, 2012 Configuration menu - View commit details
-
Copy full SHA for 0554337 - Browse repository at this point
Copy the full SHA 0554337View commit details -
Update example/requirements.txt to latest versions
Francis Devereux committedApr 20, 2012 Configuration menu - View commit details
-
Copy full SHA for 62d6f19 - Browse repository at this point
Copy the full SHA 62d6f19View commit details -
Add quickstart-virtualenv.sh and change the instructions to point to it
Francis Devereux committedApr 20, 2012 Configuration menu - View commit details
-
Copy full SHA for b603a72 - Browse repository at this point
Copy the full SHA b603a72View commit details
Commits on Jun 29, 2012
-
Merge remote-tracking branch 'upstream/master'
Francis Devereux committedJun 29, 2012 Configuration menu - View commit details
-
Copy full SHA for 96b2c17 - Browse repository at this point
Copy the full SHA 96b2c17View commit details
Commits on Jul 31, 2012
-
Merge remote-tracking branch 'upstream/master'
Francis Devereux committedJul 31, 2012 Configuration menu - View commit details
-
Copy full SHA for def6edb - Browse repository at this point
Copy the full SHA def6edbView commit details -
Fix #261: 255 chars in URL paths should be enough for everyone (tm)
... MySQL sometimes cannot create indexes on longer fields
Configuration menu - View commit details
-
Copy full SHA for f66757f - Browse repository at this point
Copy the full SHA f66757fView commit details
Commits on Sep 11, 2012
-
Merge git://github.com/feincms/feincms
Francis Devereux committedSep 11, 2012 Configuration menu - View commit details
-
Copy full SHA for 11a46f1 - Browse repository at this point
Copy the full SHA 11a46f1View commit details -
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 committedSep 11, 2012 Configuration menu - View commit details
-
Copy full SHA for a0314cc - Browse repository at this point
Copy the full SHA a0314ccView commit details
Commits on Sep 19, 2012
-
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 committedSep 19, 2012 Configuration menu - View commit details
-
Copy full SHA for 7b5dd38 - Browse repository at this point
Copy the full SHA 7b5dd38View commit details -
Merge git://github.com/feincms/feincms
Francis Devereux committedSep 19, 2012 Configuration menu - View commit details
-
Copy full SHA for 3ca0269 - Browse repository at this point
Copy the full SHA 3ca0269View commit details
This comparison is taking too long to generate.
Unfortunately it looks like we can’t render this comparison for you right now. It might be too big, or there might be something weird with your repository.
You can try running this command locally to see the comparison on your machine:
git diff main...master