Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: piquadrat/django-cms
...
head fork: piquadrat/django-cms
Checking mergeability… Don't worry, you can still create the pull request.
Commits on Jun 08, 2012
@alesdotio alesdotio fixed admin static files urls to be compatible with django 1.3 and 1.4 96af876
@FinalAngel FinalAngel additional fix for #1069 397c898
@alesdotio alesdotio oopsie a9d95f4
@FinalAngel FinalAngel fixes issue #1093 6368a25
@FinalAngel FinalAngel Merge branch 'develop' of github.com:divio/django-cms into feature/fr…
…ontend-fixes
229acbd
@FinalAngel FinalAngel added javascript fixes for placeholders and toolbar.js ce73785
@FinalAngel FinalAngel added proper intendations, added semicolons, removed not required var…
…iables, added missing "var" declarations
917962d
@piquadrat ``Node.parent_name_expr`` is gone in Django 1.4, so let's use the new…
… hotness from sekizai 0.6 to detect them
0bea23b
@stefanfoulis stefanfoulis Merge pull request #1258 from neo64bit/admin-static
fixed admin static files urls to be compatible with django 1.3 and 1.4
d68911e
@piquadrat Merge pull request #1263 from piquadrat/feature/parent_name_expr_fix
``Node.parent_name_expr`` is gone in Django 1.4
f56ebbb
@ojii ojii fixed remaining 1.4 FAILURES 91d57b1
@ojii ojii removed silly line c91ebbb
@FinalAngel FinalAngel fixes endless loop within jQuery namespace 78da4e1
@FinalAngel FinalAngel Merge branch 'develop' of github.com:divio/django-cms into develop e620915
@ojii ojii fixed some errors dce091f
@chrisglass chrisglass Merge pull request #1266 from ojii/feature/fix-lots-of-errors
fixed some errors
d286b45
@chrisglass chrisglass Merge pull request #1264 from ojii/feature/fix-some-1.4-stuff
fixed remaining 1.4 FAILURES
deda729
@chrisglass chrisglass Merge pull request #1262 from FinalAngel/feature/frontend-fixes
Feature/frontend fixes
c3317be
@ojii ojii Fixed delete confirmation for translations af45339
@chrisglass chrisglass Merge pull request #1267 from ojii/feature/fix-translation-deletion-c…
…onfirmation-1.4

Fixed delete confirmation for translations
3896ea7
@stefanfoulis stefanfoulis add extra_context variable in page admin f4cbec4
@FinalAngel FinalAngel Merge branch 'develop' of github.com:divio/django-cms into develop 7b882ef
Commits on Jun 09, 2012
@piquadrat added csrf.js to plugin_change_form.html, fixes #1259
@FinalAngel, @neo64bit, please check if this is OK
53fc63d