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

162 Commits

Author SHA1 Message Date
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
Mario Visic 791c5f9d43 Merge pull request #223 from frisoft/master 
Method missing "disable_parent_editable_elements" for nil
 2011-11-27 01:53:25 -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 7f7ed896cf use starts_with? instead of start_with, fixes #253 and #251 2011-11-27 18:22:00 +11:00
did 47625dfa17 refactor code (wip) + fix bugs (wip) + tweak ui + save an existing page in ajax (HTML5 + FormData) + create a new page in ajax (wip) 2011-11-25 02:04:42 +01: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
did a3f66e19b5 fix issue #243 (Kaminari causing error on Bushido) 2011-11-05 15:18:15 +01:00
Mario Visic ad0adc7153 Added a cucumber feature to paginate through models. 2011-11-05 19:10:26 +11:00
Mario Visic c3c5d8e754 Tests are passing for has many pagination with Kaminari. 2011-11-05 18:42:04 +11:00
Mario Visic 06ab49ecec Replaced will_paginate with kaminari 2011-11-05 16:45:43 +11:00
did 87d2440f14 working on fixing issues with devise (wip) 2011-11-04 16:55:51 +01:00
did cdab48f0a9 isolate the engine (urls, helpers, ...etc) + change urls + remove the warning about bson_ext 2011-11-01 00:44:23 +01:00
did 99e442673c namespace controllers, models, ...etc (wip) 2011-10-31 00:02:41 +01:00
Mario Visic 786d2d9693 Added will paginate to liquid. 2011-10-24 23:44:35 +08:00
Mario Visic e6abd6bbe0 Path fix for pagination. 2011-10-24 23:37:39 +08:00
Mario Visic 2bb9f5ed05 Revert "Arrays now paginate correctly." 
This reverts commit 25441ff60a.
 2011-10-24 23:34:43 +08:00
Mario Visic 25441ff60a Arrays now paginate correctly. 2011-10-24 22:35:21 +08:00
Rytis Lukoševičius 6b9d2317da adding .published? and .listed? methods for the liquid Page drop class 2011-10-04 04:35:40 +03:00
Andrea Frigido d5534a4a2b Bugfix in snippets with block and editable_elements. 2011-09-27 09:01:55 +02:00
did 718b3c67bb improve the with_scope tag based on the work on the editor 2011-09-27 00:25:47 +02:00
Karl Brightman 769b0569db Added examples 2011-09-16 11:37:48 +08:00
Karl Brightman 75f4835d3e Integrated next and previous methods for content in content types 2011-09-16 11:35:40 +08:00
did 8dfefe5094 fix issue #201 2011-09-14 11:32:14 +02:00
did 71a592eec1 fix issue #177 2011-08-25 18:27:43 +02:00
Alex Sanford 88fd17a5aa Fixed issue with tablerow tag 2011-08-19 10:10:26 -03:00
Rytis Lukoševičius 69e24e8fe0 added .breadcrumbs method to Page drop. It gives all the ancestors of the page and the page itself 2011-08-14 11:34:57 +03:00
Rytis Lukoševičius 025d5a7dda added .parent method to Page drop 2011-08-14 11:34:08 +03:00
did a9b6c234e7 fix issue #150 2011-07-28 16:42:16 +02:00
did e05586d387 write tests for the last cells menu + write tests for the bushi.do events + refactor the locomotive logger + add the cas_extra_attributes hook 2011-07-26 21:20:03 +02:00
Petr Blaho a491b15801 Added possibility to use https in js and css url with liquid tags 2011-07-19 23:00:58 +02:00
Petr Blaho 41472c88bd Created stylesheet_url and javascript_url liquid filters 2011-07-19 16:27:42 +02:00
did 770ae3a543 fix a couple of tiny bugs about: export, import and aloha 2011-07-13 11:14:44 +02:00
did 007f34ed8c export didn't work when sub pages 2011-07-07 01:34:11 +02:00