Commit Graph

1452 Commits

Author SHA1 Message Date
Mario Visic ea62835b2e Fixed up some deprication warnings. 2012-04-02 21:56:00 +08:00
Mario Visic 29e40b39ea Removed output when compiling assets. It seems to break vendored assets when running as an engine. 2012-04-02 21:46:08 +08:00
Mario Visic 4c1e9fa9c4 Fix the problem where the last domain could not be removed. Closes #335. 2012-04-02 21:11:30 +08:00
Mario Visic f134601306 Added a passing feature for adding a domain. Failing one for removing a domain. 2012-04-02 19:57:24 +08:00
Mario Visic 114218b8c4 Merge remote-tracking branch 'origin/2.0.0.rc' into 2.0.0.rc 2012-04-02 19:28:21 +08:00
Mario Visic 60d253bd93 Test the 2.0.0rc branch on travis. 2012-04-02 19:27:44 +08:00
Didier Lafforgue b06b7b50aa the filter base file was missing, my bad (thanks Joel) 2012-04-02 11:57:52 +02:00
Mario Visic 370ec26d65 Allow engine assets to be precompiled when `config.assets.initialize_on_precompile` is set to false. 2012-04-02 15:31:48 +08: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 7877f11669 Merge branch '2.0.0.rc' of github.com:locomotivecms/engine into 2.0.0.rc 2012-03-28 17:33:48 +02:00
Didier Lafforgue 3f6e7acda6 fix issue #333 2012-03-28 17:33:20 +02:00
Didier Lafforgue 35e29d0e4b Merge pull request #331 from pimpin/2.0.0.rc
2.0.0.rc
2012-03-27 16:25:49 -07:00
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
Pierre Merlin 9cb48a3ad9 Adding public admin_ui.fr.yml for toolbar 2012-03-23 18:54:42 +01:00
Pierre Merlin 65c570c4aa Update app/assets/stylesheets/locomotive/inline_editor/layout.css.scss 2012-03-23 16:53:42 +01:00
Pierre Merlin 8b80a3e840 Update app/assets/stylesheets/locomotive/inline_editor/layout.css.scss 2012-03-23 15:57:55 +01:00
Didier Lafforgue a8d57794de fix issue #292 2012-03-23 01:29:12 +01: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
did e2f60f2e15 the template of related pages were not updated for the non default locale 2012-03-19 09:15:12 -07: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 1ef1e3fbf4 bump to rc2 2012-03-14 01:32:16 +01:00
Didier Lafforgue 834042fda3 bump version 2012-03-14 01:20:55 +01:00
Didier Lafforgue ada199cf3c Merge branch '2.0.0.rc' of github.com:locomotivecms/engine into 2.0.0.rc 2012-03-14 01:16:10 +01:00
Didier Lafforgue fbd945cf6d implement feature #324 2012-03-14 01:16:01 +01:00
Didier Lafforgue 79f958c505 create mongoDB indexes for locomotive models without any errors 2012-03-13 16:37:19 +01:00
Didier Lafforgue fad363a92a use the full witdh when displaying the UI of the has_many type 2012-03-13 16:13:40 +01:00
Mario Visic 52247242fc Requiring locomotive is now much less noisy. 2012-03-12 14:04:52 +08:00
Didier Lafforgue 37374207e8 wrong spaces in one of the locale yml files 2012-03-12 03:21:28 +01:00
Didier Lafforgue fbb92010e9 Merge branch '2.0.0.rc' of github.com:locomotivecms/engine into 2.0.0.rc 2012-03-12 03:13:00 +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 5e31865f3b Merge pull request #323 from paulsponagl/de_locale_changes_final_2.0
De locale changes final 2.0
2012-03-09 14:14:59 -08:00
Paul Sponagl fa9cbe2276 Neuer -> Neue 2012-03-09 16:26:19 +01:00
Paul Sponagl ca4640addb Final German translation 2012-03-09 16:20:03 +01:00
Didier Lafforgue 1c902a5448 fix a bug about the editable_file not correctly displayed in a snippet given as an argument of the new nav tag 2012-03-09 13:05:44 +01:00
Didier Lafforgue 7ab8110e41 with_scope also takes care of order_by (pull request #278) 2012-03-09 01:01:09 +01:00
Didier Lafforgue 4cccff065a merge 2012-03-08 19:43:42 +01:00
Didier Lafforgue b3b7519c7c new version of the custom_fields gem 2012-03-08 19:40:48 +01:00
did 1f49eca09f with_scope did not resolve (ie the Liquid way) correctly the values 2012-03-08 09:24:33 -08:00
Didier Lafforgue 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