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
did
8271782284
refactoring of the import UI is done
2011-12-11 23:33:38 +01:00
did
a25009824c
fix some bugs + refactor look and feel of the import screens (wip)
2011-12-08 07:47:17 -08:00
Mario Visic
4e6fc04889
Use contents_custom_fields instead of content_custom_fields
2011-12-05 22:29:32 +08:00
Mario Visic
fa138b28d0
Fixed some failing export specs.
2011-11-26 16:22:48 +11: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
Andrea Frigido
37c50d27ff
Bugfix: import site with empty editable file.
2011-08-03 08:58:47 +02: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
8da0db2454
improve the solution for the issue #127 and write tests (pull request #139 )
2011-07-28 00:39:59 +02:00
Didier Lafforgue
e74f996c8c
Merge pull request #139 from frisoft/master
...
Added fix for #127
2011-07-27 07:58:16 -07:00
did
e05586d387
write tests for the last cells menu + write tests for the bushi.do events + refactor the locomotive logger + add the cas_extra_attributes hook
2011-07-26 21:20:03 +02:00
Andrea Frigido
1dd432c2c8
Added fix for #127
2011-07-26 09:51:18 +02:00
did
194a01d15f
solve temporarily the issue #127
2011-07-19 15:51:29 +02:00
did
47088f9b0e
fix issue #115 + clean code + exporting a site works now with ruby 1.8.7
2011-07-19 14:52:02 +02:00
did
45ff488ae8
enhance the rake task which forces to serialize page templates + do not import twice an asset with the same filename
2011-07-19 11:49:15 +02:00
did
770ae3a543
fix a couple of tiny bugs about: export, import and aloha
2011-07-13 11:14:44 +02:00
did
00fd00240f
the error message was not displayed correctly during a wrong import + remove the last tracks of the deprecated asset collections
2011-07-04 23:11:35 +02:00
did
1e465e231e
remove whilelist for theme assets (no useful since we have got roles now) + a little bit of refactoring
2011-07-04 19:40:14 +02:00
did
02186d7368
add the export link + fix the bugs for the export module + a little bit of refactoring
2011-07-04 15:25:02 +02:00
did
aad4b09ad7
first draft of the export module (not tested)
2011-07-04 03:22:04 -07:00
did
3c31c8dbcf
remove all the references to asset_collections
2011-06-21 06:12:20 -07: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
did
49080b737d
testing out the lastest gems for rails / carrierwave / ...etc
2011-06-08 16:33:33 +02:00
did
2ce1fadf52
simplify the installation procedure for bushido users
2011-05-27 08:19:20 -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
a01e204d29
refactor the way locomotive was updating a template and its descendants + add custom action_mailer settings for the bushi.do env + fix bug about index and 404 pages positions during the import + fix a little display issue when a subdomain is wrong in the site edit page
2011-04-28 17:04:18 +02: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
Dirk Kelly
2c1a6c381c
the template parsers was broken on ree, made it a bit simpler, just look for slashes
2011-03-04 17:53:20 +08:00
Dirk Kelly
9aa68c4611
oversight on the fact you shouldn't have to put template in quotes. return of the gsub
2011-03-03 13:23:37 +08:00
Dirk Kelly
9145540ef0
the import build_parent_template regex was missing nested layouts. Test theme has two new pages to test this.
2011-03-03 07:50:22 +08:00
did
59618d4f66
when importing theme, force the position of a page as an integer
2011-02-13 00:01:42 +01:00
did
44a7c33f9f
preserve positions of the index and 404 page
2011-02-12 15:32:35 +01:00
dinedine
0be4c93924
import theme from the rails console is now possible
2011-02-04 15:43:43 +01:00
dinedine
2402ef2cd4
positions for the index and not found pages were messed up when importing site
2011-02-03 11:22:19 +01:00
dinedine
da51dbc14e
more information in the logs when errors during the import + import asset collections without custom fields
2011-01-30 00:20:15 +01:00
dinedine
a7dfe1152d
fix encoding issue in Ruby 1.9
2011-01-27 14:07:10 +01:00
dinedine
2e774b2a97
conflict between the index scope in the page model and the mongoid index method
2011-01-27 10:49:42 +01:00
dinedine
ff01539bb5
date in content types compatible with ruby 1.9.2
2011-01-11 00:50:42 +01:00
dinedine
890d5d7e18
the import module takes care of redirection pages (+ tests)
2011-01-10 14:57:44 +01:00
dinedine
572ee360a1
preserve page orders when importing theme + handle favicon as theme asset + add tests for the nav tag + polish code (remove useless logs)
2011-01-03 11:50:09 +01:00
