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

149 Commits

Author SHA1 Message Date
Alex Sanford
6f5eec18c6 Fixed issue with page drop slug on templatized pages 2012-06-01 14:28:10 -03:00
did
f4ee99b72b fix issue #425 2012-05-30 15:41:11 -07:00
Didier Lafforgue
2ac74c9a50 fix issue #411 2012-05-25 13:24:10 +02:00
did
d90123e321 public forms are now protected from csrf attacks (see issue #382 2012-05-23 15:03:21 -07:00
Didier Lafforgue
b3902bb3d5 Merge branch 'master' of github.com:locomotivecms/engine 2012-04-22 23:44:24 +02:00
Didier Lafforgue
ce5576da09 the extends tag was not looking for the right fullpath (when localization is enabled) + sample in order to modify the tinyMCE settings in the back-office 2012-04-22 23:25:18 +02:00
Mario Visic
283a0d9be4 Merge pull request #378 from davide-malagoli/master 
current_user liquid extension (issue #312) added
 2012-04-22 03:15:05 -07:00
Didier Lafforgue
57b7cc1ef2 just a quick test to demonstrate the documentation was wrong (issue #377) 2012-04-22 01:27:07 +02:00
Annalisa
632e16b18e issue #321 (current_user) working. url_helpers removed. 2012-04-21 11:06:13 +02:00
Didier Lafforgue
d6059c2a9b fix issue #373 2012-04-20 15:42:10 +02:00
Didier Lafforgue
486c6a12a2 fix issue #367 2012-04-20 00:31:48 +02:00
Didier Lafforgue
9b4fc56e82 fix issue #360 2012-04-19 16:30:16 +02:00
Didier Lafforgue
f0e41205fd re-organize filters + drop unused tags 2012-04-02 02:41:52 +02:00
Didier Lafforgue
21c5e8a627 small optimization when retrieving a page from a path 2012-03-29 16:17:09 +02:00
Didier Lafforgue
3f6e7acda6 fix issue #333 2012-03-28 17:33:20 +02:00
Didier Lafforgue
2329f26e4d new liquid filter: default 2012-03-26 18:12:16 +02:00
Didier Lafforgue
90e1c4f438 preserve GET parameters when paginating a collection 2012-03-26 17:58:01 +02:00
Didier Lafforgue
ed15c0d6b5 templatized pages can have now sub pages 2012-03-26 16:31:28 +02:00
Didier Lafforgue
e9bf29f297 the last commit broke the test suite: fixed now 2012-03-23 00:41:04 +01:00
Didier Lafforgue
b7424b1fd4 implement the auto_discovery_link_tag liquid filter (feature #206) 2012-03-23 00:18:32 +01:00
Didier Lafforgue
a9aeffba9b it is now possible to change the response type of a page + correct translations in French 2012-03-22 19:20:31 +01:00
Didier Lafforgue
b3b0a5ac16 new editable element for a page: the control 2012-03-22 00:50:34 +01:00
Didier Lafforgue
ab5a4755b8 make the editable elements more robust when working with localization + write tests to prove it 2012-03-21 03:21:29 +01:00
Didier Lafforgue
cfbe68564d fixed editable elements (wip) 2012-03-19 02:29:59 +01:00
Didier Lafforgue
9a9f270d99 fix issue #317 + with_scope works now with has_many relationships + clean code 2012-03-12 03:09:20 +01:00
Didier Lafforgue
7ab8110e41 with_scope also takes care of order_by (pull request #278) 2012-03-09 01:01:09 +01:00
did
1f49eca09f with_scope did not resolve (ie the Liquid way) correctly the values 2012-03-08 09:24:33 -08:00
Paul Sponagl
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
Didier Lafforgue
8f1ac5968f better way of declaring a hosting env 2012-02-18 15:55:20 +01:00
Didier Lafforgue
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
Didier Lafforgue
6619d4e5dc all the non-models specs have been fixed 2012-02-16 02:45:14 +01:00
did
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
Mario Visic
ae244c2703 Fixed a failing test (class missing namespace). 2012-01-15 15:05:50 +11:00
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
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
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
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
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
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
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
2a5861e8a7 Specs now correctly use a multisite test app. 2011-11-25 23:59:44 +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
Mario Visic
06ab49ecec Replaced will_paginate with kaminari 2011-11-05 16:45:43 +11:00