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

483 Commits

Author SHA1 Message Date
did a1bc3db8a6 path to codemirror/overlay.js has been modified in the last version of the codemirror gem 2012-02-28 06:54:02 -08: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 dae0b665ac script to upgrade from 1.0. to 2.0 (wip) 2012-02-19 10:38:56 +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 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 64a050dff9 fixing specs (wip) + cell specs are fine 2012-02-16 01:32:37 +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
Didier Lafforgue f1662770e7 use the default carrierwave settings for envs other than development and production + does not include the templates of snippets in the theme assets index page (it was breaking the layout in locomotive for some snippets) 2012-02-07 11:17:56 +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 c9f07c823f remove the old way of doing cross domain authentication (use the :domain => all option) + fix a couple of tiny bugs 2012-01-30 10:56:38 +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 c5692aeb2a fix errors when deploying a new brand new engine instance 2012-01-27 02:27:26 +01: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
did 4600f94922 extend i18n to pages (wip) 2012-01-25 22:07:10 +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
did 0534c5504f prevent pow to crash when no flash message (bug) + add api resources for pages 2012-01-24 01:00:41 +01:00
did 739d2db0a9 first api draft 2012-01-23 09:05:50 +01:00
Gil Vandendriessche d665a85591 Add sample option on import rake task 2012-01-21 16:05:36 +11: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 801f7bfca5 Merge branch 'rails_3_1' of github.com:locomotivecms/engine into rails_3_1 2012-01-17 12:05:52 +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
did 4060b1859f use the right path to the back-office in the js components as well as in the middlewares 2012-01-14 14:54:01 +01:00
Mario Visic a50715091d Merge remote-tracking branch 'origin/rails_3_1' into rails_3_1 2012-01-15 00:03:06 +10:30
Mario Visic 8ac8289394 Merge remote-tracking branch 'origin/master' into rails_3_1 
Conflicts:
	app/models/content_instance.rb
	config/locales/admin_ui.de.yml
	public/javascripts/admin/inline_editor_toolbar.js
	spec/models/content_instance_spec.rb
 2012-01-15 00:02:46 +10:30
did 531017ab62 merging 2012-01-14 13:14:59 +01:00
did 50a2453995 polish again the content_locale picker 2012-01-14 13:12:44 +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