Permalink
Commits on Aug 4, 2011
  1. Fixed cms.utils.cms_static_url

    Jonas Obrist committed Aug 4, 2011
  2. Added cms.utils.cms_static_url, thanks go to @jezdez for this code

    Replaced all os.path.join powered URL constructing with cms.utils.cms_static_url
    Jonas Obrist committed Aug 4, 2011
  3. @chrisglass

    Merge pull request #922 from ojii/stephrdev-feature/staticfiles

    Transition to staticfiles
    chrisglass committed Aug 4, 2011
  4. Merge branch 'develop' into stephrdev-feature/staticfiles

    Conflicts:
    	cms/admin/pageadmin.py
    	cms/admin/placeholderadmin.py
    	cms/forms/widgets.py
    	cms/media/cms/js/libs/jquery.bind.js
    	cms/media/cms/js/libs/jquery.cookie.js
    	cms/media/cms/js/libs/jquery.form.js
    	cms/media/cms/js/libs/jquery.functional.js
    	cms/media/cms/js/libs/jquery.livequery.js
    	cms/media/cms/js/libs/jquery.query.js
    	cms/media/cms/js/libs/jquery.tweet.js
    	cms/media/cms/js/libs/jquery.ui.checkbox.js
    	cms/media/cms/js/libs/jquery.ui.core.js
    	cms/media/cms/js/libs/jquery.ui.dialog.js
    	cms/media/cms/js/libs/jquery.ui.effects.core.js
    	cms/media/cms/js/libs/jquery.ui.effects.highlight.js
    	cms/media/cms/js/libs/jquery.ui.sortable.js
    	cms/media/cms/js/plugins/jquery.cookie.js
    	cms/media/cms/js/plugins/jquery.tweet.js
    	cms/plugins/text/widgets/wymeditor_widget.py
    	cms/plugins/twitter/templates/cms/plugins/twitter_recent_entries.html
    	cms/static/cms/js/plugins/jquery.cookie.js
    	cms/static/cms/js/plugins/jquery.tweet.js
    	cms/static/cms/js/plugins/jquery.ui.core.js
    	cms/static/cms/js/plugins/jquery.ui.draggable.js
    	cms/static/cms/js/plugins/jquery.ui.droppable.js
    	cms/static/cms/jstree/_lib/jquery.cookie.js
    	cms/templates/admin/cms/page/change_list.html
    	cms/templates/admin/cms/page/plugin_change_form.html
    	cms/templates/admin/cms/page/plugin_forms_history.html
    	cms/templates/cms/toolbar/toolbar.html
    	cms/tests/plugins.py
    Jonas Obrist committed Aug 4, 2011
  5. @chrisglass

    Merge pull request #921 from ojii/feature/javascript-cleanup

    Feature/javascript cleanup
    chrisglass committed Aug 4, 2011
  6. Fixed failing test

    Jonas Obrist committed Aug 4, 2011
  7. Renamed ui.*.js to jquery.ui.*.js

    Renamed effects.*.js to jquery.ui.effects.*.js
    Updated references
    Jonas Obrist committed Aug 4, 2011
  8. Removed not yet needed jquery.ui.core.js, jquery.ui.draggable.js and …

    …jquery.ui.droppable.js
    
    Moved jquery.tweet.js to /libs/
    Jonas Obrist committed Aug 4, 2011
  9. Fixed some broken js in the backend admin

    Jonas Obrist committed Aug 4, 2011
  10. Moved all javascript libraries from /cms/media/cms/js/lib/ to /cms/me…

    …dia/cms/js/libs/ and update their references
    
    Removed no longer required javascript files:
    * cms/media/cms/js/lib/jquery.backgroundposition.js
    * cms/media/cms/js/lib/jquery.cookie.js
    * cms/media/cms/js/lib/jquery.js (we use the one from django now)
    * cms/media/cms/js/lib/jquery.nyroModal-1.6.2.pack.js
    Jonas Obrist committed Aug 4, 2011
  11. @chrisglass

    Merge pull request #918 from ojii/finalangel-feature/toolbar-frontend

    Fixed PlaceholderField frontend edit (#729)
    chrisglass committed Aug 4, 2011
  12. Removed author/license notes from some CMS javascript files. @FinalAngel

     gave his okay for this.
    
    The reason behind this is NOT to take credit from @FinalAngel, but because over time there will be many authors to those files, also the license did not match the one of the CMS (though it was compatible).
    Jonas Obrist committed Aug 4, 2011
  13. Removed comment as requested by @FinalAngel

    Jonas Obrist committed Aug 4, 2011
  14. Added CMS.API.Toolbar.isToolbarHidden Javascript API to check if the …

    …toolbar is currently hidden.
    
    On CMS.Placeholder.editPlugin, if the toolbar is currently hidden, show it for the edit process (and hide it again if necessary after the edit is done)
    Special thanks to @chrisglass for finding this weird edge case
    Jonas Obrist committed Aug 4, 2011
  15. @ojii

    Merge pull request #19 from chrisglass/ojii-finalangel-feature/toolba…

    …r-frontend
    
    Ojii finalangel feature/toolbar frontend
    ojii committed Aug 4, 2011
  16. @chrisglass
Commits on Aug 3, 2011
  1. @kezabelle
  2. @kezabelle
  3. Changed the 'admin check', many thanks to xtine on #pyladies for help…

    …ing with this
    Jonas Obrist committed Aug 3, 2011
  4. Fixed /admin/ plugin editor (fixes #896)

    Jonas Obrist committed Aug 3, 2011
  5. Fixed adding plugins to PlaceholderFields in frontend

    Added a view in the tests project to see the placeholder field frontend admin in action
    Jonas Obrist committed Aug 3, 2011
  6. Merge branch 'develop' of github.com:divio/django-cms into finalangel…

    …-feature/toolbar-frontend
    Jonas Obrist committed Aug 3, 2011
  7. Fixed 'new.html' template

    Jonas Obrist committed Aug 3, 2011
  8. Fixed wym editor

    Jonas Obrist committed Aug 3, 2011
  9. Fixed a bug reported by @dangerfield where the main cmsplugin table w…

    …ould get misnamed
    Jonas Obrist committed Aug 3, 2011
  10. Tests blergh

    Jonas Obrist committed Aug 3, 2011
  11. Merge branch 'feature/staticfiles' of https://github.com/stephrdev/dj…

    …ango-cms into stephrdev-feature/staticfiles
    
    Conflicts:
    	cms/plugins/video/templates/cms/plugins/video.html
    	cms/toolbar/items.py
    	tests/project/settings.py
    Jonas Obrist committed Aug 3, 2011
  12. Merge branch 'feature/toolbar-frontend' of git://github.com/FinalAnge…

    …l/django-cms into finalangel-feature/toolbar-frontend
    Jonas Obrist committed Aug 3, 2011
  13. Improved the release notes for 2.2 slightly

    Jonas Obrist committed Aug 3, 2011
  14. @ojii

    Added Luke Crooks to AUTHORS

    ojii committed Aug 3, 2011