Commit Graph

48 Commits

Author SHA1 Message Date
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 02e48f5c36 fix the specs for the page model 2012-02-16 22:07:00 +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
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 739d2db0a9 first api draft 2012-01-23 09:05:50 +01:00
did 01c5de36a5 add the ui element to select the languages for a site 2012-01-09 17:24:34 -08:00
did 435d4067c0 namespace vendor assets 2012-01-08 16:27:13 -08:00
did 5dfbb2bdb7 upgrade to the last version of delayed_job_mongoid gem + remove reference to the previous handlebars-rails gem (just add the js file instead) + refactor the way to display the list of content types in the back-office menu 2012-01-08 16:17:31 -08:00
did 912251d49b big refactoring (wip) + add/edit entries for content types 2012-01-02 05:54:01 -08:00
did b383086242 wip 2011-11-06 12:18:34 +01:00
did 87d2440f14 working on fixing issues with devise (wip) 2011-11-04 16:55:51 +01:00
Sharagoz ffc7057669 "no" locale added to config options 2011-09-19 16:15:25 +02:00
GarPit 1e5e151be6 russian translation 2011-08-29 16:54:21 +04:00
did 6d66275def merge pull request #148 2011-07-28 15:03:13 +02:00
did 4f7312a659 CAS feature + Cells 2011-07-25 23:07:32 +02:00
did 2236b43222 fix bug #111 2011-07-09 00:47:05 +02:00
did 6acec074e2 spanish translation (ticket #103) 2011-07-06 00:33:34 +02:00
did 0737919c2c Dutch translation (ticket #92) 2011-07-05 23:55:26 +02:00
did 5e8eac53d4 refactor the way the middlewares are loaded (both app and engine) + tweaks some back-office texts + improve the UI by adding icons on addind a picture links + fix an annoying bug with carrierwave 2011-06-28 15:38:13 +02:00
Andrea Frigido bee4f01e56 Italian localization. 2011-05-04 13:05:16 +02:00
did 820d55a83c use delayed_job by default on bushi.do 2011-04-28 17:17:15 +02:00
did b58e49fce2 make locomotive work with bushido + refactor some portions of code (routing constraints, ...etc) + fix broken tests 2011-04-25 01:21:38 +02:00
did 551ef03ff6 simply the installation screens + fix all the broken tests + add tests for bushido 2011-04-05 02:18:17 +02:00
dinedine c0a5a4b443 single site / multi sites option in progress + integrating bushi.do + revert back to mongoid rc.7 2011-04-04 01:59:41 +02:00
did 551d8a5761 big refactoring of the locomotive config file in order to handle bushido / single / multi sites, ...etc 2011-04-01 02:34:19 +02:00
Sean Grove 89758570f8 Require bushido files and enable support if needed. 2011-03-21 03:33:17 -07:00
Bernd Hauser 32701d7894 german language added 2011-02-23 12:40:56 +01:00
did af5ec86c57 merging 2011-02-12 18:13:06 +01:00
Raphael Costa eaab196d06 Brazilian Portuguese Translations 2011-02-11 23:44:35 -02:00
Raphael Costa 7998e3a841 Brazillian Portuguese Translation 2011-02-09 23:29:20 -02:00
dinedine 2fc99bf90a rename translation files (convention) + email notification when adding contents (api) 2011-01-18 15:24:42 +01:00
dinedine 62564021b6 the theme import module can work without delayedjob + fix bugs 2010-12-17 00:42:38 +01:00
dinedine 680a42b8f5 first attempt of an installation wizzard 2010-10-27 02:11:44 +02:00
dinedine 9967e9d3d3 first attempt to build the inline editor module 2010-09-03 01:03:20 +02:00
Jacques Crocker a09329c030 Cleaning whitespace on all .rb files so commit diffs from now on will be a bit more readable 2010-07-23 13:09:54 -07:00
dinedine 29c22c05c1 heroku support + fix minor bugs 2010-06-14 15:04:01 +02:00
dinedine 1d5786638b add logging option in Locomotive settings 2010-06-11 11:29:51 +02:00
dinedine 9e7d1d3a08 make an engine of the cms 2010-06-03 17:32:40 +02:00
dinedine 9901f53e12 now can add new sites / accounts + basic membership mechanism iimplemented + fix a lot of minor bugs + add more rspec tests 2010-05-11 00:39:52 +02:00
dinedine ae20b51636 page acts as tree / list + improve validations 2010-04-30 16:05:53 +02:00
dinedine e81b4a353a creating page in progress 2010-04-25 02:33:38 +02:00
dinedine 0d606852ef beautiful login page is up 2010-04-23 01:52:11 +02:00
dinedine 8d1f6a24e1 Site dispatcher in its core version works + tests are coming 2010-04-12 01:59:18 +02:00
dinedine 3b8a6c67df add validations to site 2010-04-10 17:25:07 +02:00
dinedine cd67a29b88 working stack ? 2010-04-09 11:23:41 +02:00