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

341 Commits

Author SHA1 Message Date
Didier Lafforgue fcf32f9d53 update deutch translations 2012-03-03 11:23:39 +01:00
Didier Lafforgue c5577240de add the engine version in the footer (useful) 2012-02-29 01:15:49 +01:00
did 520b68104b fixing tests (wip) + sync javascript objects when updating an entry in a has_many relationship 2012-02-27 03:48:06 -08: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 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 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 f2467bbf42 ask for default site locale when creating the first site 2012-02-07 01:29:33 +01: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 2a911d912c implement the UI for the many_to_many relationship (WIP) 2012-02-03 01:50:45 +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 e2bd55fe35 add the UI for the belongs_to custom field 2012-01-31 01:50:09 +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
Gregory horion 0d5d2af27f give me the rool url in the 2.0.0rc please 
Conflicts:

	config/routes.rb
 2012-01-28 16:12:10 +11: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 e849318cc4 Fixed a few remaining typos. 2012-01-25 22:24:36 +11:00
Mario Visic 44b3579e02 Removed the locomotive init. 2012-01-25 22:24:13 +11: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 1a5050a0c1 case sensitive search is a monster. 2012-01-25 18:52:54 +11:00
Corey Woodcox 81db1da423 fix spelling error in locales 2012-01-25 18:52:54 +11:00
did e523cb952c access entries of a content type from the API 2012-01-24 21:33:34 +01:00
did ab507dc165 change the default API base path + implement the API for content_assets, content_types and pages resources 2012-01-24 21:16:53 +01: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
did b8b8cef089 make the edition of content types more robust (ex: better errors handler) 2012-01-18 01:43:01 +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 89020e7cf5 got a working version of the inline editor 2012-01-17 02:53:49 +01:00
did ebe149110b first draft of the new inline editing toolbar 2012-01-16 23:59:59 +01:00
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
benni 00035287c3 Update german locales (admin_ui and formtastic) 
Conflicts:

	config/locales/admin_ui.de.yml
	config/locales/formtastic.de.yml
 2012-01-14 23:19:57 +10:30
benni edc1907cfa Fixed i18n bug in german locale when creating a new resource from api. 2012-01-14 23:13:18 +10:30
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
Pietro Giorgianni 6d08daaba3 Fix i18n files so that they don't make Psych angry. 
(Fixes #269)
 2012-01-10 15:00:07 +01:00
did 01c5de36a5 add the ui element to select the languages for a site 2012-01-09 17:24:34 -08:00
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
Paul Sponagl 2fd7b47b61 Revert "update cells dependency" 
This reverts commit 9a28ecbd1e.
 2012-01-04 17:53:58 +01:00
Paul Sponagl df10701746 added translations af bennibu 2012-01-04 17:43:47 +01:00
Paul Sponagl dc324893ce german translation additions 2012-01-04 14:12:41 +01:00
did 0f1b4f59d3 listing all entries (done) + fix bugs + tweak ui 2012-01-04 02:07:53 +01:00
did 912251d49b big refactoring (wip) + add/edit entries for content types 2012-01-02 05:54:01 -08:00
Paul Sponagl 9a28ecbd1e update cells dependency 2011-12-27 23:34:00 +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
did 9130544516 refactoring the creation of custom contents 2011-12-22 14:28:12 -08:00
did 2068fe060d it becomes possible to add options for the select type 2011-12-22 07:45:42 -08:00