Commit Graph

469 Commits

Author SHA1 Message Date
Didier Lafforgue 11d92ab80e nested templatized pages finally done (+ specs) + upgrade gems + change the zindex value of the start button for the inline editor + change version (rc.3) for the next rc release 2012-03-28 00:26:32 +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 58c5e9e238 Merge pull request #327 from belighted/2.0.0.rc
Add nav compatibility with twitter menu dropdown
2012-03-22 16:21:38 -07: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 6b8e3db8c3 add missing files for the last commit about the control editable element + implement feature #326 2012-03-22 02:13:24 +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
Gil Vandendriessche caa0e69760 Add nav compatibility with twitter menu dropdown 2012-03-15 11:39:20 +01:00
Didier Lafforgue 834042fda3 bump version 2012-03-14 01:20:55 +01:00
Mario Visic 52247242fc Requiring locomotive is now much less noisy. 2012-03-12 14:04:52 +08: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
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
did 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
did 1da5617b80 it did not display the no_site page 2012-03-05 00:09:54 -08:00
Didier Lafforgue 989f608755 change the default way to config AWS for carrierwave + fix issue #299 2012-03-02 01:46:02 +01:00
Didier Lafforgue 05baecad0b change the path to files added in the content entries + ui settings are a hash not an object 2012-03-02 00:31:45 +01:00
Didier Lafforgue 50a3addf45 fix ALL the cucumber tests + also solve a couple of UI bugs with the has_many and many_to_many relationships 2012-03-01 11:07:22 +01:00
Didier Lafforgue 61281db943 the API for content_types now allows to change the label_field property of a content type 2012-02-20 16:16:59 +01:00
Didier Lafforgue 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
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 085a54d7c1 introduce the proxy collection liquid drop so that we can paginate for real + fix the cucumber features for the public part of the engine 2012-02-17 00:51:33 +01:00
Didier Lafforgue 02e48f5c36 fix the specs for the page model 2012-02-16 22:07:00 +01:00
Didier Lafforgue 6619d4e5dc all the non-models specs have been fixed 2012-02-16 02:45:14 +01:00
Didier Lafforgue 87c8f3bfd7 enhance the nav tag (allow custom css classes for the list and the selected menu item) + clean the locomotive.rb template file 2012-02-15 18:26:58 +01:00
Didier Lafforgue 3b5d04238f remove deprecated warning about ActiveSupport::Concern + add the handle property to Page in order to retrieve them more easily (very useful to display a page from an external controller for instance 2012-02-11 00:39:06 +01:00
Didier Lafforgue ca380de115 the admin path is not used anymore (use Locomotive.mounted_on instead) 2012-02-10 10:05:56 +01:00
Didier Lafforgue 62eaeb10f5 templatized page can now use models from the main app + add new liquid filters 2012-02-10 00:57:57 +01:00
Didier Lafforgue 39d9c354da API access for the current site + easy way to specify the localization of any controllers + fix a minor bug about adding/removing domains 2012-02-09 11:36:10 +01:00
Didier Lafforgue 51a0862d89 use a string instead of a symbol for X-Message-Type causing an error in Passenger 2012-02-07 12:19:54 +01:00
did 5fd244e66c do not mention DelayedJob anymore 2012-02-06 02:44:02 -08:00
did 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
did 25e08596ef refactor the code (move some pieces of code into the custom_fields gem) + solve a ton of bugs: circular dependencies inside the content_entry presenter, fix Locomotive.mounted_on (broken in rails 3.2), js errors when creating a page, locale switcher broken if a page was not translated in the target locale 2012-02-04 02:10:55 +01:00
did 9e9fe49ccf the has_many ui component is done 2012-02-02 16:53:26 +01:00
did 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
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
did b33d081c28 use the view_context method to reach helper methods from a controller 2012-01-28 01:05:26 -08:00
did b5fa2c761a change the location url for the API responses + force the use of the default site locale when creating a new entry, content type or page 2012-01-26 07:51:32 -08:00
did 192518d258 disable the rethrow exceptions option for the liquid templates 2012-01-26 02:43:55 +01:00
did 50917a919e Use the 2.0.0.rc branch for the custom_fields gem 2012-01-26 02:41:31 +01:00
did c0b8587eb2 rename the i18n site module into locales in order to avoid conflicts with the original i18n + rendering a page according to a locale specified in the url seems to work (tests are following) 2012-01-26 02:33:39 +01:00
Mario Visic 5c191e59cd Merge remote-tracking branch 'origin/2.0.0.rc' into 2.0.0.rc
Conflicts:
	Gemfile.lock
2012-01-25 22:20:05 +11:00
Mario Visic 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
Corey Woodcox 7aadd9d129 add a message for deprecated config option 2012-01-25 18:52:55 +11:00
Corey Woodcox 81db1da423 fix spelling error in locales 2012-01-25 18:52:54 +11:00