7ab8110e41
with_scope also takes care of order_by (pull request #278 )
2012-03-09 01:01:09 +01:00
1f49eca09f
with_scope did not resolve (ie the Liquid way) correctly the values
2012-03-08 09:24:33 -08:00
effce313bf
Merge pull request #319 from paulsponagl/nav_with_liquid_2.0
...
added a snippet option to the liquid nav tag
2012-03-07 17:44:00 -08:00
0c65516807
fix issue #320
2012-03-08 02:32:59 +01:00
b13c5d1d40
added a snippet option to the liquid nav tag
...
this is useful if you want to render more than
just a page.title string within the nav list item.
(page.menue_image, page.menue_teaser...)
use nav snippet: "<liquid snippet>" to provide a string
or nav snippet: "<snippetname>" to load the snippet from db.
added page.<editable_field> for usage within liquid templates
2012-03-07 16:32:25 +01:00
ac823aac66
entries can be grouped by a belongs_to field in the back-office + add the show action for the content_entries API
2012-03-07 01:39:24 +01:00
f77bdd9826
fix #289 . This fix is different from the one in the master branch. It only the filename (without the whole path and the extension)
2012-03-05 14:17:33 -08:00
a1cbdf9ed8
page templates were not updated if a related snippet got modified (BUG)
2012-03-02 08:37:54 -08:00
dd9b382637
alpha version of the upgrade script (good results with my existing locomotive sites) + fix bugs according to my tests with my existing live websites + remove useless code (polishing)
2012-02-20 01:15:43 +01:00
dae0b665ac
script to upgrade from 1.0. to 2.0 (wip)
2012-02-19 10:38:56 +01:00
8f1ac5968f
better way of declaring a hosting env
2012-02-18 15:55:20 +01:00
ffee024a96
a little bit of cleaning + prepare the engine to make it work with the hosting extensions
2012-02-18 01:57:06 +01:00
02e48f5c36
fix the specs for the page model
2012-02-16 22:07:00 +01:00
73b559260e
fix specs for the content_type and editable_element models
2012-02-16 16:17:30 +01:00
2fd0410b66
tests pass for the account, content_entry and content_asset models
2012-02-16 12:42:41 +01:00
6619d4e5dc
all the non-models specs have been fixed
2012-02-16 02:45:14 +01:00
64a050dff9
fixing specs (wip) + cell specs are fine
2012-02-16 01:32:37 +01:00
62eaeb10f5
templatized page can now use models from the main app + add new liquid filters
2012-02-10 00:57:57 +01:00
fa36b95a9d
get rid of warnings about InstanceMethods (deprecated) + make the engine work smoother with an existing app + clean code
2012-02-06 00:54:09 +01:00
dfd437a762
fix an issue with compass + move to rails 3.2 + switch from mongoid_acts_as_tree to mongoid_tree + implement the UI to deal with has_many field types (wip)
2012-02-01 02:01:42 +01:00
b132c3bba9
merge
2012-01-30 11:14:00 +01:00
c9f07c823f
remove the old way of doing cross domain authentication (use the :domain => all option) + fix a couple of tiny bugs
2012-01-30 10:56:38 +01:00
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
40ef3e4fff
Fixed a couple of failing tests.
2011-11-22 00:08:18 +11:00
e21a40c157
Some fixes for the content asset spec.
2011-11-20 22:52:20 +11:00
75041ba21c
Specs now run for all models. The account model now passes GREEEEn.
2011-11-20 22:47:41 +11:00
47db53e0e5
Namespace factory girl factories.
2011-11-20 22:25:01 +11:00
a7b66f0e25
Lots of fixes to get tets closer to working.
2011-11-20 21:59:12 +11:00
51c0397531
Removed spork to get spec helper working. Will readd later if required.
2011-11-20 21:39:46 +11:00
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
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
dd75f69b74
fix module collisions and missing namespaces all over the templates (wip)
2011-11-08 01:11:15 +01:00
9169cb386e
waiting for the new devise gem (coming probably this week)
2011-11-08 00:16:23 +01:00
b383086242
wip
2011-11-06 12:18:34 +01:00
06ab49ecec
Replaced will_paginate with kaminari
2011-11-05 16:45:43 +11:00
87d2440f14
working on fixing issues with devise (wip)
2011-11-04 16:55:51 +01:00
8979957d43
convert stylesheets in sass (wip) + fix the installation module + customize devise (wip)
2011-11-03 14:01:08 +01:00
851a255301
fixing assets (wip)
2011-11-01 01:58:44 +01:00
cdab48f0a9
isolate the engine (urls, helpers, ...etc) + change urls + remove the warning about bson_ext
2011-11-01 00:44:23 +01:00
99e442673c
namespace controllers, models, ...etc (wip)
2011-10-31 00:02:41 +01:00
9f8906d840
Merge branch 'master' into 236_paginate_has_many
2011-10-29 14:36:01 +08:00
4939017f8d
No Site now renders a 404 error, this will prevent indexing of pages that do not exist.
2011-10-29 14:35:23 +08:00
d574939e2c
Added a failing test for paginating has many associations.
2011-10-24 20:52:43 +08:00
6b9d2317da
adding .published? and .listed? methods for the liquid Page drop class
2011-10-04 04:35:40 +03:00
016d773b2d
fix issue #217 (memberships not correctly removed)
2011-09-28 18:27:29 +02:00
718b3c67bb
improve the with_scope tag based on the work on the editor
2011-09-27 00:25:47 +02:00
ce24270948
fix issue #193
2011-09-22 01:38:23 +02:00
03b6649742
Designers cannot set others to admins, fixes #197
2011-09-17 22:23:43 +08:00
75f4835d3e
Integrated next and previous methods for content in content types
2011-09-16 11:35:40 +08:00
8dfefe5094
fix issue #201
2011-09-14 11:32:14 +02:00
bb48552b51
Ruby MRI 1.9.3 Compatability Fixes
2011-08-25 23:28:56 +02:00
Didier Lafforgue
did
Paul Sponagl
Mario Visic
Robsteranium
Rytis Lukoševičius
Karl Brightman