226 Commits

Author	SHA1	Message	Date
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	09bd73c7ac	enhance carrierwave settings to support bushi.do	2011-04-07 11:53:07 +02:00
did	f16201f6cd	do not run bushido subdomain validation if the value does not get changed + prevent to change the subdomain in Heroku (non multi-sites mode)	2011-04-07 02:18:07 +02:00
did	e03d7b5dcc	smoother integration with bushi.do	2011-04-07 01:34:36 +02:00
did	917208812b	wrong bushido ENV name + do not ask for subdomain during the installation	2011-04-06 11:44:52 +02:00
did	34c7df04b8	wrong redirection during the installation process	2011-04-05 23:41:50 +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
did	d270bf8f69	new custom_fields gem	2011-03-20 21:12:40 +01:00
did	1e5624ce06	fix js bugs	2011-03-20 11:21:07 +01:00
did	630577658d	Merge branch 'image_sizing' of https://github.com/themgt/engine into themgt-image_sizing	2011-03-17 17:54:59 +01:00
did	a66e745746	fix bug #52	2011-03-17 17:41:25 +01:00
Paul	e7b33c807a	calculating Asset size using rmagick rather than an imagemagick shell command	2011-03-15 18:35:05 +01:00
did	63530a3a30	still a problem with the last heroku gem (json) + fix an issue with invalid assets	2011-03-10 02:59:35 +01:00
did	f38e6a8514	order direction for content types	2011-03-10 00:54:38 +01:00
did	2ba0718647	application error when submitting an asset without a name	2011-03-10 00:17:16 +01:00
did	bbac778dda	dates can also be used as highlighted field	2011-03-08 17:25:38 +01:00
did	80f792cfd3	generated sitemaps were invalid according to google web tools	2011-03-08 17:20:53 +01:00
did	e4b34eac3f	patch mongoid to enable the limit option for embedded collections + ui widget to allow more than 5 custom models in the content section	2011-03-08 16:05:07 +01:00
Dirk Kelly	44f84c266b	merge	2011-03-07 19:59:02 +08:00
did	d3abdd3f37	refactor the asset collections part + disable the image processing for non image assets (use a newer version of locomotive carrierwave for that purpose)	2011-03-05 23:27:26 +01:00
did	110c7a0fc9	request from Bernd (Designhunger) #45	2011-03-05 00:41:44 +01:00
did	a2ea522964	clean translations (a part of it moved to the CustomFields gem) + refactor the custom fields form (mustache) as well as enhance the ui/look&feel + fix some bugs related to the creation/edition of content types and contents	2011-03-05 00:29:40 +01:00
did	2022b08b83	split the General Information section in the page form in two sub sections	2011-03-04 00:03:55 +01:00
did	f0ee8a7b37	new menu layout in CSS3 and SASS (will make our life easier when integrating new modules)	2011-03-03 23:51:07 +01:00
Dirk Kelly	2482567db3	avoid updating child pages which have a default_attribute on change of a template they inherit from	2011-03-03 15:35:37 +08:00
Dirk Kelly	c998d4150c	Added fullpath and the error message to liquid syntax error. Translations are pretty dodgy (sorry)	2011-03-03 08:18:19 +08:00
Dirk Kelly	be4169c991	Beginning to improve the error messages with variables to make the import function more verbose on problems	2011-03-03 08:05:04 +08:00
Dirk Kelly	97e3ddb6e3	reading that default attribute on inheriting editable_elements and calling the method on that page (instead of getting it from the parent)	2011-03-02 14:38:57 +08:00
Dirk Kelly	ea81025d33	storing default_attribute on the editable_element if a default attribute has been parsed.	2011-03-02 14:38:32 +08:00
Dirk Kelly	adbae00457	changed the editable inheritance tag to be assignable, avoiding confusion between that and the content tag inheritance	2011-03-02 09:13:45 +08:00
Dirk Kelly	778a55245c	added the inheritable attribute to editable elements	2011-03-02 08:13:03 +08:00
Dirk Kelly	ed88eb82b0	added inheritable? to the parent check on editable_contents	2011-03-02 08:12:42 +08:00
Dirk Kelly	e059ce2023	Making the error message a bit more useful	2011-02-28 13:42:50 +08:00
did	abcc61a8e6	add the missing index view for theme assets + update the 2 locomotive.rb files (generator + default)	2011-02-27 12:18:48 +01:00
did	68e1a543bf	Merge branch 'master' of https://github.com/designhunger/engine into designhunger-master	2011-02-27 12:03:30 +01:00
Mario Visic	1c04b39c7e	Fixed a bug that was preventing deleting sites	2011-02-26 21:12:26 +08:00
Bernd Hauser	09f3162861	fix in default.de.yml	2011-02-23 14:57:33 +01:00
did	2244aa782a	Merge branch 'nested-snippets-fix' of https://github.com/mariovisic/engine into mariovisic-nested-snippets-fix	2011-02-19 01:34:32 +01:00
did	bd992cc882	fix issue #37 plus other ones related to theme assets and assets	2011-02-19 00:51:57 +01:00
Mario Visic	26a2b7d2a7	Fixed a bug with snippets within blocks	2011-02-16 17:37:26 +08:00
did	94be90986d	merge Dirk's branch + upgrade a lot of gems (rails, ...etc)	2011-02-12 15:00:57 +01:00
dinedine	6ac4ff0393	revert a piece of the theme assets refactoring + upgrade Gemfile as well as the gemspec	2011-02-04 11:18:34 +01:00
dinedine	c178346969	fix the creation of theme assets (and add tests of course) + upgrade Gemfile + remove the mongoid patches	2011-02-04 10:39:23 +01:00
Keith Pitt	e3f40558a0	Provide the error message aswell	2011-02-04 16:21:50 +08:00
Keith Pitt	da3bd6cef2	Include error backtrace in output	2011-02-04 15:57:26 +08:00
Keith Pitt	713d30bdb6	Hacked the admin images controller to work	2011-02-04 15:44:42 +08:00
Dirk Kelly	c11c18c445	Fixes issue where custom content wouldn't get created.	2011-02-03 07:40:06 +08:00
Dirk Kelly	7d30d00ec4	minimal attributes to include listed	2011-02-01 17:05:36 +08:00