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

124 Commits

Author SHA1 Message Date
Didier Lafforgue b751e3d990 trying to fix the big problem with jQuery UI modals (if modals have the same z-index, it causes weird behaviours) (WIP) 2012-05-29 01:26:51 +02:00
Didier Lafforgue f42fb1afe1 finally the new version of the multi_json gem (issue #387) 2012-05-05 11:17:18 +02:00
Didier Lafforgue 23600edb1f performance improvements as described in #383 2012-04-26 03:39:23 +02:00
Didier Lafforgue 69c51fbe07 new aloha-rails gem (fixing a typo in a css when precompiling it) 2012-04-23 01:03:21 +02:00
Didier Lafforgue 08cf381bc3 simple media plugin for Aloha 2012-04-22 01:14:25 +02:00
Didier Lafforgue 9b4fc56e82 fix issue #360 2012-04-19 16:30:16 +02:00
Didier Lafforgue 47015d3473 write cucumber tests to illustrate how to deal with a contact form + fix a tiny bug about it 2012-04-17 17:48:42 +02:00
Didier Lafforgue 1d19d606b8 closing textarea tags do not break the page form anymore 2012-04-17 16:13:21 +02:00
Didier Lafforgue 26662acae9 force version of the multi_json gem (1.2.0) 2012-04-16 20:50:07 +02:00
Didier Lafforgue 3eb521ba75 upgrade FOG 2012-04-16 12:36:30 +02:00
Didier Lafforgue d0698b1ffc fix issue #348 2012-04-13 15:29:06 +02:00
Mario Visic f74306503b Use unidecoder for converting non ascii charcters for page slugs. Fixes #340 2012-04-08 15:13:07 +08:00
Didier Lafforgue 6bd1154886 use the last version of mongoid / rails + bump the new gem version (rc.4) 2012-04-02 21:46:23 +02:00
Mario Visic ea62835b2e Fixed up some deprication warnings. 2012-04-02 21:56:00 +08:00
Didier Lafforgue 3f6e7acda6 fix issue #333 2012-03-28 17:33:20 +02:00
Didier Lafforgue fbd945cf6d implement feature #324 2012-03-14 01:16:01 +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 b3b7519c7c new version of the custom_fields gem 2012-03-08 19:40:48 +01:00
Didier Lafforgue 3e3691ad4a upgrade to mongoid 2.4.5 + allow authors to edit editable elements from the back-office (bug) 2012-03-01 16:39:38 +01:00
Didier Lafforgue c5ddabd585 new version of the custom_fields gem 2012-02-20 10:53:46 +01:00
Didier Lafforgue d0cc2984b8 upgrade fog (we need a newer version for the heroku-api gem) 2012-02-17 11:31:51 +01:00
Didier Lafforgue 219f6e1339 upgrade to custom_fields 2.0.0.rc4 2012-02-07 11:46:07 +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 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 b132c3bba9 merge 2012-01-30 11:14:00 +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
Maik Kempe 0d747b14fe [➠] Include gemspec dependencies in Gemfile. 2012-01-29 19:15:13 +11: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 c5692aeb2a fix errors when deploying a new brand new engine instance 2012-01-27 02:27:26 +01:00
did 50917a919e Use the 2.0.0.rc branch for the custom_fields gem 2012-01-26 02:41:31 +01: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
Mario Visic 0a2bd13058 Merge pull request #283 from cwoodcox/facebook 
Upgrade to devise 1.5.x
 2012-01-20 20:19:08 -08:00
Mario Visic 34f9755d9a Altered admin menu cells inheritence, fixes #257 without limiting cells version. 2012-01-21 15:10:58 +11:00
Corey Woodcox 868c2d2e0e upgrade devise to 1.5.x 2012-01-20 19:32:53 -07: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
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
Mario Visic 04b1a7aa90 Bump RedCloth to a newer version to avoid warnings when running tests. 2012-01-14 13:04: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
did a650acd535 forgot to reflect changes in the gemspec file 2012-01-07 03:11:48 +01:00
Mario Visic b9755947ff Limit cells to version 3.7, fixes #257 and fixes #260 2012-01-05 01:44:32 +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 9b049aa055 Bumped delayed job versions, fixes #249. 2011-11-27 19:44:06 +11: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 2c18f401bb adding the last refactored features on the pages section (wip) + clean code 2011-11-16 01:39:16 +01:00
Mario Visic 45d4b7cb60 Merge branch 'master' into 236_paginate_has_many 2011-11-05 18:03:27 +11:00
Mario Visic 06ab49ecec Replaced will_paginate with kaminari 2011-11-05 16:45:43 +11:00
did 732f8f76f3 revert to bson_ext (1.3.1) because the last versions (1.4.x) have been yanked recently (temporary solution) 2011-10-30 14:58:13 +01:00
did 32f7552a50 typo in the French translation for Norway + remove crack from Gemfile 2011-10-17 19:15:08 +02:00