Commit Graph

29 Commits

Author SHA1 Message Date
Mario Visic 8ac8289394 Merge remote-tracking branch 'origin/master' into rails_3_1
Conflicts:
	app/models/content_instance.rb
	config/locales/admin_ui.de.yml
	public/javascripts/admin/inline_editor_toolbar.js
	spec/models/content_instance_spec.rb
2012-01-15 00:02:46 +10:30
Paul Sponagl 27dd3b2001 Fit issue 240 by using slug to find content-type
export.rb exports targets with
field_attributes['target'] = target_klass._parent.slug
but import imports it with:
target_content_type = site.content_types.where(:name => association.target).first

this fails if one uses capitalized names for Models.
i changed the default.zip to contain a site yaml with capitalized
Model-Names too.
2012-01-09 15:01:51 +01:00
did 912251d49b big refactoring (wip) + add/edit entries for content types 2012-01-02 05:54:01 -08:00
did e9ef4d48c3 content_instance becomes now content_entry with its shortcut content_type.entries + change references to the old custom_fields API 2011-12-23 00:45:32 +01:00
Mario Visic 4e6fc04889 Use contents_custom_fields instead of content_custom_fields 2011-12-05 22:29:32 +08:00
did ce24270948 fix issue #193 2011-09-22 01:38:23 +02:00
did 2d4f3df106 has_many target is not exported correctly (issue #165) + fix the import function as well 2011-08-15 14:39:53 -07:00
Didier Lafforgue 92ec012472 Merge pull request #149 from corgibytes/content_type_names
Fixed issue with the way import was handling content_type name attributes
2011-07-28 06:09:23 -07:00
did 4c8272dfa0 seo information were not imported for contents 2011-07-28 11:53:36 +02:00
M. Scott Ford 36914834a1 Switched from calling #update to #update_attributes!. 2011-07-28 01:21:28 -04:00
M. Scott Ford a532bb4c60 Fixed issues with the way import handled the content_type.name attribute. 2011-07-28 01:20:39 -04:00
did 770ae3a543 fix a couple of tiny bugs about: export, import and aloha 2011-07-13 11:14:44 +02:00
did f4d9acd282 fix the tests + finish the integration of Dragonfly + clean code 2011-06-20 17:39:59 -07:00
did 21ccbb635b removing asset collections 2011-06-17 14:32:54 -07:00
Mario Visic c7109af0b8 Importer now supports date content type fields as strings or date objects. 2011-05-17 21:42:47 +08:00
did b58e49fce2 make locomotive work with bushido + refactor some portions of code (routing constraints, ...etc) + fix broken tests 2011-04-25 01:21:38 +02:00
did 67fba7542c does not need to fill all the fields of a content type during the theme import 2011-03-23 11:01:49 +01:00
did 50f06a7b85 invalidate dynamic klass after an import + change the id of a link in the nav tag 2011-03-09 00:27:46 +01:00
dinedine ff01539bb5 date in content types compatible with ruby 1.9.2 2011-01-11 00:50:42 +01:00
dinedine a1d9a5d548 reflect changes from the last imported theme (enhancements + bugs fixed) 2010-10-31 00:30:30 +02:00
dinedine 89f106405d fix broken tests + get rid of warnings in cucumber 2010-10-29 17:40:58 +02:00
dinedine 9c77180a63 fix minor issues 2010-10-29 16:19:41 +02:00
dinedine cc0b50e22e add rspec tests for the import module + debug the cms to handle correctly the default theme 2010-10-29 01:36:45 +02:00
dinedine 680a42b8f5 first attempt of an installation wizzard 2010-10-27 02:11:44 +02:00
dinedine 1c86db05f8 polish the import module + some code refactoring / cleaning 2010-10-12 02:12:18 +02:00
dinedine ecfa466074 add missing asset collections import module + add google analytics import + work on simplifying the theme asset logic 2010-10-07 02:45:41 +02:00
Didier Lafforgue e31012f861 fix a lot of tiny bugs (not yet) + testing import tool 2010-09-27 00:31:50 +02:00
dinedine 9a722c4268 working on importing pages 2010-09-24 01:00:13 +02:00
dinedine 39886427e0 first and unfinished draft of the import tool 2010-09-23 00:59:30 +02:00