442e254202
Fixed a problem in the spec_helper preventing tests from being run.
2012-01-29 19:41:53 +11:00
b93c7f8f51
remove the import/export functionalities (replaced by the API and the new locomotive editor) + upgrade gems (codemirror, ...etc)
2012-01-28 12:41:00 +01:00
840609cbce
Merge remote-tracking branch 'origin/master' into rails_3_1
...
Conflicts:
Gemfile
Gemfile.lock
app/cells/locomotive/menu_cell.rb
app/helpers/admin/content_types_helper.rb
app/models/content_instance.rb
app/models/page.rb
app/views/admin/shared/menu/_contents.html.haml
config/initializers/locomotive.rb
config/locales/admin_ui.de.yml
config/locales/admin_ui.en.yml
config/locales/admin_ui.es.yml
config/locales/admin_ui.fr.yml
config/locales/admin_ui.it.yml
config/locales/admin_ui.nl.yml
config/locales/admin_ui.no.yml
config/locales/admin_ui.pt-BR.yml
config/locales/admin_ui.ru.yml
lib/generators/locomotive/install/templates/locomotive.rb
lib/locomotive/configuration.rb
locomotive_cms.gemspec
spec/models/locomotive/account_spec.rb
2012-01-25 22:16:43 +11:00
07ff99e135
Ensure uniqueness and format of an accounts email address.
2012-01-21 15:51:38 +11:00
7af9ea34a6
trying to make it work with the precompilation of assets (issue with Aloha and TinyMCE)
2012-01-20 14:46:09 +01:00
801f7bfca5
Merge branch 'rails_3_1' of github.com:locomotivecms/engine into rails_3_1
2012-01-17 12:05:52 +01:00
ebe149110b
first draft of the new inline editing toolbar
2012-01-16 23:59:59 +01:00
15f9111ea8
Small fix to the global action spec.
2012-01-15 17:05:33 +11:00
9a06042c4b
Fixed some main menu tests.
2012-01-15 16:50:58 +11:00
ddfd8c6a07
Fixed up some specs for the global action spec.
2012-01-15 15:38:07 +11:00
ae244c2703
Fixed a failing test (class missing namespace).
2012-01-15 15:05:50 +11:00
216b77ab41
Fixed up a bad merge of the content instance spec changes.
2012-01-15 14:50:23 +11:00
a50715091d
Merge remote-tracking branch 'origin/rails_3_1' into rails_3_1
2012-01-15 00:03:06 +10:30
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
531017ab62
merging
2012-01-14 13:14:59 +01:00
50a2453995
polish again the content_locale picker
2012-01-14 13:12:44 +01:00
a0d02b2fce
Add a failing tests for ContentInstance#set_visibility returning false.
2012-01-14 22:06:42 +10:30
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
01c5de36a5
add the ui element to select the languages for a site
2012-01-09 17:24:34 -08:00
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
435d4067c0
namespace vendor assets
2012-01-08 16:27:13 -08:00
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
a1e692a34d
fix tests suite with ruby 1.9.2
2012-01-07 02:49:23 +01:00
0926286318
The content liquid drop is now contents (plural).
2012-01-04 21:06:06 +08:00
0f1b4f59d3
listing all entries (done) + fix bugs + tweak ui
2012-01-04 02:07:53 +01:00
912251d49b
big refactoring (wip) + add/edit entries for content types
2012-01-02 05:54:01 -08:00
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
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
4efa43e342
Content instances will now generate a unique slug (if existing is taken). Fixes #210 .
2011-12-18 01:11:39 +08:00
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
4ae6fe7977
False values for custom fields are now correctly exported. Fixes #250 .
2011-12-15 22:11:54 +08:00
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
bbf0b0e083
Merge branch 'rails_3_1' of github.com:locomotivecms/engine into rails_3_1
2011-12-08 07:48:11 -08:00
a25009824c
fix some bugs + refactor look and feel of the import screens (wip)
2011-12-08 07:47:17 -08:00
1c139af4e0
Small namespace fixes to specs.
2011-12-08 23:36:53 +08:00
a76020108f
Fixed some broken tests, mainly due to routing issues. Down to 68 failing tests.
2011-12-06 21:42:41 +08:00
4e6fc04889
Use contents_custom_fields instead of content_custom_fields
2011-12-05 22:29:32 +08:00
cad1f5e68f
Merge branch 'rails_3_1' of github.com:locomotivecms/engine into rails_3_1
2011-11-27 08:23:12 -08:00
71d48fe726
refactor the current site editing screen (screen)
2011-11-27 08:22:54 -08:00
9f56eecd56
Merge branch 'master' into rails_3_1
...
Conflicts:
Gemfile
Gemfile.lock
config/boot.rb
2011-11-27 20:33:45 +11:00
5c6794d69c
Fixed some failing dragonfly specs.
2011-11-27 19:02:20 +11:00
ad6273e2fd
Lots of spec fixes (mostly namespacing), down to 107 failing specs.
2011-11-26 17:24:34 +11:00
9f1ce08136
Specs are now all running, 190 failures.
2011-11-26 16:33:57 +11:00
fa138b28d0
Fixed some failing export specs.
2011-11-26 16:22:48 +11:00
9a603eb57f
Removed bushido and heroku lib specs (implemenation already gone).
2011-11-26 16:17:24 +11:00
cfd0be5755
Controller specs now run.
2011-11-26 16:10:47 +11:00
cffe64f6be
rebuilding the editing page for the site (wip)
2011-11-25 15:10:56 +01:00
2a5861e8a7
Specs now correctly use a multisite test app.
2011-11-25 23:59:44 +11:00
1c5d19ad71
Fixed for locomotive setup test method.
2011-11-25 23:45:16 +11:00
06f4fc98e3
Fixed a bunch of model tests.
2011-11-25 00:37:17 +11:00
Mario Visic
did
did
Paul Sponagl
Robsteranium