98 Commits

Author	SHA1	Message	Date
dinedine	aa764ee185	add French translations for the installation + installation allowed if both no sites and no accounts	2010-10-29 17:28:38 +02:00
dinedine	9b175c3cda	add options when importing new site + fix page toolbar style + fix minor stuff	2010-10-29 17:12:57 +02:00
dinedine	9c77180a63	fix minor issues	2010-10-29 16:19:41 +02:00
dinedine	680a42b8f5	first attempt of an installation wizzard	2010-10-27 02:11:44 +02:00
dinedine	c2766f0273	Merge branch 'origin/nodefault'	2010-10-26 15:09:58 +02:00
dinedine	c1b21fac8b	use BSON::ObjectId to find elements (asset collection, content type) + make the import module work with S3	2010-10-19 12:20:09 +02:00
dinedine	344a737b9a	clean code + fix gem requirements for the engine version of this app	2010-10-17 03:18:41 +02:00
dinedine	163077be43	index in first, 404 page in last when importing theme	2010-10-14 23:56:51 +02:00
dinedine	3863272ced	finish to merge + tweak minor stuff	2010-10-14 16:01:18 +02:00
dinedine	282fbb7244	merging	2010-10-14 14:37:14 +02:00
dinedine	1c86db05f8	polish the import module + some code refactoring / cleaning	2010-10-12 02:12:18 +02:00
dinedine	54063d6b46	create a middleware for serving fonts (solve cross domain issue) + add cache for consume liquid tag + fix image picker	2010-10-11 16:26:46 +02:00
dinedine	32f8351889	button to see all theme assets (including hidden ones)	2010-10-10 23:59:56 +02:00
dinedine	2f4128bf8f	refactoring theme assets in progress	2010-10-10 16:37:34 +02:00
dinedine	ecfa466074	add missing asset collections import module + add google analytics import + work on simplifying the theme asset logic	2010-10-07 02:45:41 +02:00
dinedine	eabe4903f3	refactor locomotive liquid drops + implement the theme or site import page (95% done)	2010-09-29 00:08:11 +02:00
dinedine	1e1c3bd97b	haml always in ugly mode + refactor theme files section in admin	2010-09-22 14:50:01 +02:00
Jacques Crocker	9097200339	Adding specific admin templates for the "no site" and "no page" errors. ... Goal should be to use these to allow someone to create a new site right here	2010-09-21 04:45:34 -07:00
dinedine	2e4a15a511	new image plugin for tinymce	2010-09-15 02:19:34 +02:00
dinedine	d5223e5c91	skinning tinymce to match locomotive style	2010-09-06 23:47:03 +02:00
dinedine	9967e9d3d3	first attempt to build the inline editor module	2010-09-03 01:03:20 +02:00
dinedine	35b4e5358c	editable_file tag is implemented + remove not used editable elements all in once for better performance + default content inherits from the content of the parent element	2010-08-31 23:53:30 +02:00
dinedine	af5fe62d89	clean and improve the ui concerning the editable elements of a page + fix bugs and refactor a bit	2010-08-28 02:00:05 +02:00
dinedine	0d72a9f932	first working attempt for editable_short_text liquid tag + update of the admin ui to reflect the new way of managing editable elements	2010-08-27 17:40:03 +02:00
dinedine	4805d8813e	template errors in pages are handled correctly now (bug) + {% extends parent %} is implemented	2010-08-22 01:56:44 +02:00
dinedine	8196c0a6de	handle more liquid errors during page editing	2010-08-22 00:58:26 +02:00
dinedine	9d78a32340	completely get rid of old layouts + enhance snippets integration + refactor parsing page module	2010-08-22 00:48:24 +02:00
dinedine	dbc542c4d7	fix bugs with acts_as_tree + fix cucumber tests	2010-08-20 18:24:59 +02:00
dinedine	e25ded881b	custom fields has its own repo + upgrade code for Mongoid beta 16 + clean code + fix rspec tests	2010-08-20 17:56:15 +02:00
dinedine	fbda6a17f9	update benchmark with results on my imac + tweak ui in order to reflect changes about with liquid inheritance	2010-08-08 15:16:32 +02:00
dinedine	c76cd6527c	merge	2010-08-02 16:16:08 +02:00
dinedine	d973868a06	merge + fix tiny bugs	2010-08-02 13:45:50 +02:00
Jacques Crocker	150654ec84	Death to RJS and its kin!	2010-08-01 23:32:52 -07:00
Jacques Crocker	cc8ae8e18c	Oops, didnt quite understand the "consider requests local" flag. ... Reverting it to its previous settings	2010-07-30 23:50:44 -07:00
Jacques Crocker	7e53560255	Fixing cucumber configuration so it can handle features in subfolders correctly	2010-07-30 23:46:55 -07:00
Jacques Crocker	8cddd6cb80	Some more dependency updates (devise and rspec-rails)	2010-07-30 14:34:35 -07:00
Jacques Crocker	2d19e8d557	Remove Rails rc1 deprecation warnings from routes ... Was a tough one to track down. But hurray... now I know what .arity means!	2010-07-30 14:27:41 -07:00
Jacques Crocker	071196e97b	Upgrading to Rails3 rc	2010-07-29 16:21:48 -07:00
Jacques Crocker	84c9831db6	simplify cucumber runtime settings	2010-07-29 13:26:45 -07:00
dinedine	e74fa1de56	custom error pages (404 for the backend section + 500 for the whole application) + clean up	2010-07-29 12:46:13 +02:00
dinedine	54116d9ebb	multi site selector with cross domain authentication	2010-07-28 02:42:33 +02:00
Jacques Crocker	4eea9855aa	Fixing up Cucumber env (database_cleaner and envjs)	2010-07-26 01:19:42 -07:00
Jacques Crocker	1e79f5bcfd	Updating devise to be compatible with latest mongoid	2010-07-26 00:59:02 -07: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	2608430cae	allow users to use shortcut for theme images when editing snippets / layouts / stylesheets + fix minor ui bugs	2010-07-23 00:10:40 +02:00
dinedine	35e0120cab	fix js bug when changing layout in page editing + improve nav tag	2010-07-22 01:35:30 +02:00
dinedine	b2c39b4137	updating Rails to beta 4 + mongoid to beta 9 + fix all broken parts caused by the upgrade	2010-07-20 12:15:53 +02:00
dinedine	81dc8ea623	build a generic theme image picker	2010-07-18 00:01:00 +02:00
dinedine	fb148a31a4	templatized page + fix bug with nav widget	2010-07-16 22:36:07 +02:00
dinedine	533a4ee4aa	flash messages in French + new icon for assets + ajax update for almost all forms	2010-07-13 22:01:40 +02:00