Commit Graph

195 Commits

Author SHA1 Message Date
did 3f1380408e fix issue #427 + make the content types API features more predictable 2012-06-04 08:26:10 -07:00
Alex Sanford 6f5eec18c6 Fixed issue with page drop slug on templatized pages 2012-06-01 14:28:10 -03:00
Didier Lafforgue 2ac74c9a50 fix issue #411 2012-05-25 13:24:10 +02:00
did 04d9fe17f8 Merge branch 'master' of github.com:locomotivecms/engine 2012-05-23 15:03:37 -07:00
did d90123e321 public forms are now protected from csrf attacks (see issue #382 2012-05-23 15:03:21 -07:00
Will Cosgrove c0627bf8a7 Fixed typo for bootstrap setting: `data-toogle` to `data-toggle` 2012-05-08 22:31:20 -05: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 08cf381bc3 simple media plugin for Aloha 2012-04-22 01:14:25 +02:00
Annalisa 043b78a061 strange error 2012-04-21 01:50:37 +02:00
Annalisa fc380e3e4d strange error 2012-04-21 01:31:33 +02:00
Annalisa b87c76bc67 added current_user 2012-04-21 00:54:54 +02:00
Didier Lafforgue 9b4fc56e82 fix issue #360 2012-04-19 16:30:16 +02:00
Didier Lafforgue b06b7b50aa the filter base file was missing, my bad (thanks Joel) 2012-04-02 11:57:52 +02:00
Didier Lafforgue f0e41205fd re-organize filters + drop unused tags 2012-04-02 02:41:52 +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 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 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 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
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 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 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 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 62eaeb10f5 templatized page can now use models from the main app + add new liquid filters 2012-02-10 00:57:57 +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 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 b33d081c28 use the view_context method to reach helper methods from a controller 2012-01-28 01:05:26 -08: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
did 4d0f8610c5 bad display of content types if none + add new gems for tinymce and aloha 2012-01-21 01:48:00 +01:00
did 7af9ea34a6 trying to make it work with the precompilation of assets (issue with Aloha and TinyMCE) 2012-01-20 14:46:09 +01:00
did 09d6060633 refactoring (rename modules, clean code, remove useless files, ...etc) + improve the inline editor module (locale picker + better ui workflow) 2012-01-17 17:04:45 +01:00
did e210953d01 inline editor work in progress 2012-01-17 12:05:39 +01:00
did ebe149110b first draft of the new inline editing toolbar 2012-01-16 23:59:59 +01: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
did 4c204ef6a6 refactor and clean code (wip) + the api controller has been deleted and replace by the entry_submission_controller (+ custom responder) 2012-01-09 06:49:59 -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 cecdfa4762 Merge branch 'master' into rails_3_1 2011-11-27 21:17:58 +11:00