github-migration/engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,135 Commits 13 Branches 7 Tags 15 MiB
8ac8289394
Commit Graph

236 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
Mario Visic
a0d02b2fce Add a failing tests for ContentInstance#set_visibility returning false. 2012-01-14 22:06:42 +10:30
Mario Visic
75b0137230 Merge remote-tracking branch 'origin/master' into rails_3_1 
Conflicts:
	Gemfile
	Gemfile.lock
	features/support/env.rb
	locomotive_cms.gemspec
	spec/cells/locomotive/global_actions_spec.rb
	spec/cells/locomotive/main_menu_cell_spec.rb
	spec/cells/locomotive/settings_menu_cell_spec.rb
 2012-01-14 16:37:24 +10:30
did
01c5de36a5 add the ui element to select the languages for a site 2012-01-09 17:24:34 -08:00
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
435d4067c0 namespace vendor assets 2012-01-08 16:27:13 -08:00
did
5dfbb2bdb7 upgrade to the last version of delayed_job_mongoid gem + remove reference to the previous handlebars-rails gem (just add the js file instead) + refactor the way to display the list of content types in the back-office menu 2012-01-08 16:17:31 -08:00
did
a1e692a34d fix tests suite with ruby 1.9.2 2012-01-07 02:49:23 +01:00
Mario Visic
0926286318 The content liquid drop is now contents (plural). 2012-01-04 21:06:06 +08:00
did
0f1b4f59d3 listing all entries (done) + fix bugs + tweak ui 2012-01-04 02:07:53 +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
eb5f0557ff Merge branch 'master' into rails_3_1 
Conflicts:
	app/models/content_instance.rb
	spec/models/locomotive/content_instance_spec.rb
 2011-12-18 01:18:56 +08:00
Mario Visic
4efa43e342 Content instances will now generate a unique slug (if existing is taken). Fixes #210. 2011-12-18 01:11:39 +08:00
Mario Visic
9a1a0f016f Merge branch 'master' into rails_3_1 
Conflicts:
	app/models/content_type.rb
	config/boot.rb
 2011-12-15 22:29:07 +08:00
Mario Visic
4ae6fe7977 False values for custom fields are now correctly exported. Fixes #250. 2011-12-15 22:11:54 +08:00
Robsteranium
82a61b1d2d spec added to confirm content_type Date problem & patch. Also 1.8.7 compatibility with syck init. 2011-12-15 03:16:11 +00:00
did
bbf0b0e083 Merge branch 'rails_3_1' of github.com:locomotivecms/engine into rails_3_1 2011-12-08 07:48:11 -08: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
1c139af4e0 Small namespace fixes to specs. 2011-12-08 23:36:53 +08:00
Mario Visic
a76020108f Fixed some broken tests, mainly due to routing issues. Down to 68 failing tests. 2011-12-06 21:42:41 +08:00
Mario Visic
4e6fc04889 Use contents_custom_fields instead of content_custom_fields 2011-12-05 22:29:32 +08:00
did
cad1f5e68f Merge branch 'rails_3_1' of github.com:locomotivecms/engine into rails_3_1 2011-11-27 08:23:12 -08:00
did
71d48fe726 refactor the current site editing screen (screen) 2011-11-27 08:22:54 -08:00
Mario Visic
9f56eecd56 Merge branch 'master' into rails_3_1 
Conflicts:
	Gemfile
	Gemfile.lock
	config/boot.rb
 2011-11-27 20:33:45 +11:00
Mario Visic
5c6794d69c Fixed some failing dragonfly specs. 2011-11-27 19:02:20 +11:00
Mario Visic
ad6273e2fd Lots of spec fixes (mostly namespacing), down to 107 failing specs. 2011-11-26 17:24:34 +11:00
Mario Visic
9f1ce08136 Specs are now all running, 190 failures. 2011-11-26 16:33:57 +11:00
Mario Visic
fa138b28d0 Fixed some failing export specs. 2011-11-26 16:22:48 +11:00
Mario Visic
9a603eb57f Removed bushido and heroku lib specs (implemenation already gone). 2011-11-26 16:17:24 +11:00
Mario Visic
cfd0be5755 Controller specs now run. 2011-11-26 16:10:47 +11:00
did
cffe64f6be rebuilding the editing page for the site (wip) 2011-11-25 15:10:56 +01:00
Mario Visic
2a5861e8a7 Specs now correctly use a multisite test app. 2011-11-25 23:59:44 +11:00
Mario Visic
1c5d19ad71 Fixed for locomotive setup test method. 2011-11-25 23:45:16 +11:00
Mario Visic
06f4fc98e3 Fixed a bunch of model tests. 2011-11-25 00:37:17 +11:00
Mario Visic
40ef3e4fff Fixed a couple of failing tests. 2011-11-22 00:08:18 +11:00
Mario Visic
e21a40c157 Some fixes for the content asset spec. 2011-11-20 22:52:20 +11:00
Mario Visic
75041ba21c Specs now run for all models. The account model now passes GREEEEn. 2011-11-20 22:47:41 +11:00
Mario Visic
47db53e0e5 Namespace factory girl factories. 2011-11-20 22:25:01 +11:00
Mario Visic
a7b66f0e25 Lots of fixes to get tets closer to working. 2011-11-20 21:59:12 +11:00
Mario Visic
51c0397531 Removed spork to get spec helper working. Will readd later if required. 2011-11-20 21:39:46 +11:00
Mario Visic
5f893d51c0 Merge remote-tracking branch 'origin/master' into rails_3_1 
Conflicts:
	Gemfile
	Gemfile.lock
	config/initializers/will_paginate.rb
	lib/locomotive/engine.rb
	lib/locomotive/hosting/bushido/account_ext.rb
	lib/locomotive/hosting/bushido/enabler.rb
	lib/locomotive/hosting/bushido/hooks.rb
 2011-11-20 21:08:23 +11:00
did
248d3803c2 use the last version of formtastic + tweak the css for formtastic with scss + compass (wip) + clean code (wip) 2011-11-09 02:35:59 +01:00
did
dd75f69b74 fix module collisions and missing namespaces all over the templates (wip) 2011-11-08 01:11:15 +01:00
did
9169cb386e waiting for the new devise gem (coming probably this week) 2011-11-08 00:16:23 +01:00
did
b383086242 wip 2011-11-06 12:18:34 +01:00
Mario Visic
06ab49ecec Replaced will_paginate with kaminari 2011-11-05 16:45:43 +11:00
did
87d2440f14 working on fixing issues with devise (wip) 2011-11-04 16:55:51 +01:00
did
8979957d43 convert stylesheets in sass (wip) + fix the installation module + customize devise (wip) 2011-11-03 14:01:08 +01:00
did
851a255301 fixing assets (wip) 2011-11-01 01:58:44 +01:00