Changeset [95b21f33bdd7702dc8e78917e58be5fe42cc32ce] by Doug Youch
April 2nd, 2010 @ 11:02 AM
Merge branch 'development' of git://github.com/cykod/Webiva into
simple-content
http://github.com/cykod/Webiva/commit/95b21f33bdd7702dc8e78917e58be...
Committed by Doug Youch
- R public/javascripts/edit_area/change_log.txt
- R public/javascripts/edit_area/edit_area_full_with_plugins.gz
- R public/javascripts/edit_area/edit_area_full_with_plugins.js
- R public/javascripts/edit_area/todo.txt
- M app/controllers/editor/action_renderer.rb
- M app/controllers/editor/auth_controller.rb
- M app/controllers/paragraph_controller.rb
- M app/controllers/templates_controller.rb
- M app/models/content/core_field.rb
- M app/models/content/field.rb
- M app/models/content_model_field.rb
- M app/views/content/index.rhtml
- M app/views/edit/_set_template_features.rhtml
- M app/views/editor/action/html_headers.rhtml
- M app/views/templates/_style_selector.rhtml
- M app/views/templates/edit.rhtml
- M app/views/templates/feature.rhtml
- M app/views/templates/save_feature.rjs
- M public/javascripts/edit_area/edit_area.css
- M public/javascripts/edit_area/edit_area.js
- M public/javascripts/edit_area/edit_area_compressor.php
- M public/javascripts/edit_area/edit_area_full.gz
- M public/javascripts/edit_area/edit_area_full.js
- M public/javascripts/edit_area/edit_area_functions.js
- M public/javascripts/edit_area/edit_area_loader.js
- M public/javascripts/edit_area/elements_functions.js
- M public/javascripts/edit_area/highlight.js
- M public/javascripts/edit_area/keyboard.js
- M public/javascripts/edit_area/langs/bg.js
- M public/javascripts/edit_area/langs/cs.js
- M public/javascripts/edit_area/langs/de.js
- M public/javascripts/edit_area/langs/dk.js
- M public/javascripts/edit_area/langs/en.js
- M public/javascripts/edit_area/langs/eo.js
- M public/javascripts/edit_area/langs/es.js
- M public/javascripts/edit_area/langs/fi.js
- M public/javascripts/edit_area/langs/fr.js
- M public/javascripts/edit_area/langs/hr.js
- M public/javascripts/edit_area/langs/it.js
- M public/javascripts/edit_area/langs/ja.js
- M public/javascripts/edit_area/langs/mk.js
- M public/javascripts/edit_area/langs/nl.js
- M public/javascripts/edit_area/langs/pl.js
- M public/javascripts/edit_area/langs/pt.js
- M public/javascripts/edit_area/langs/ru.js
- M public/javascripts/edit_area/langs/sk.js
- M public/javascripts/edit_area/langs/zh.js
- M public/javascripts/edit_area/reg_syntax/basic.js
- M public/javascripts/edit_area/reg_syntax/brainfuck.js
- M public/javascripts/edit_area/reg_syntax/c.js
- M public/javascripts/edit_area/reg_syntax/coldfusion.js
- M public/javascripts/edit_area/reg_syntax/cpp.js
- M public/javascripts/edit_area/reg_syntax/css.js
- M public/javascripts/edit_area/reg_syntax/html.js
- M public/javascripts/edit_area/reg_syntax/java.js
- M public/javascripts/edit_area/reg_syntax/js.js
- M public/javascripts/edit_area/reg_syntax/pas.js
- M public/javascripts/edit_area/reg_syntax/perl.js
- M public/javascripts/edit_area/reg_syntax/php.js
- M public/javascripts/edit_area/reg_syntax/python.js
- M public/javascripts/edit_area/reg_syntax/robotstxt.js
- M public/javascripts/edit_area/reg_syntax/ruby.js
- M public/javascripts/edit_area/reg_syntax/sql.js
- M public/javascripts/edit_area/reg_syntax/tsql.js
- M public/javascripts/edit_area/reg_syntax/vb.js
- M public/javascripts/edit_area/reg_syntax/xml.js
- M public/javascripts/edit_area/template.html
- M spec/controllers/content_controller_spec.rb
- M vendor/modules/media/app/controllers/media/gallery_renderer.rb
Create your profile
Help contribute to this project by taking a few moments to create your personal profile. Create your profile ยป