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

1406 Commits

Author SHA1 Message Date
did dc24c1b184 update delayed_job / delayed_job_mongoid gems (issue #267) 2012-01-07 01:39:30 +01:00
Mario Visic c881750d78 Bundle update cells. 2012-01-05 01:47:10 +08:00
Mario Visic 5719381ba5 Merge remote-tracking branch 'origin/master' 2012-01-05 01:46:54 +08: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 8a493088ca Merge pull request #263 from paulsponagl/de-translations 
de translations
 2012-01-04 09:41:23 -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
Mario Visic 0926286318 The content liquid drop is now contents (plural). 2012-01-04 21:06:06 +08:00
did 0f1b4f59d3 listing all entries (done) + fix bugs + tweak ui 2012-01-04 02:07:53 +01:00
did 81fc524fdc Merge branch 'rails_3_1' of github.com:locomotivecms/engine into rails_3_1 2012-01-02 05:54:18 -08: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
Mario Visic a65a871e19 Fixed a tiny bug preventing the robots controller rending. 2011-12-27 21:31:36 +08: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
did 81a6569fe7 UI compoment to add options for the select type field (wip) 2011-12-22 02:59:30 +01:00
did d1bb45d7c8 polishing the UI for the content types, refactoring still in progress 2011-12-22 01:31:33 +01:00
did 00283993c0 minimal version of the new UI for content types 2011-12-21 15:24:39 +01:00
did 217000042a refactoring the content types section (wip) 2011-12-19 14:15:11 +01:00
Mario Visic eb5f0557ff Merge branch 'master' into rails_3_1 
Conflicts:
	app/models/content_instance.rb
	spec/models/locomotive/content_instance_spec.rb
 2011-12-18 01:18:56 +08:00
Mario Visic 4efa43e342 Content instances will now generate a unique slug (if existing is taken). Fixes #210. 2011-12-18 01:11:39 +08:00
did 592a110fe5 first attempt to refactor the content types 2011-12-16 13:02:10 +01:00
Mario Visic 9a1a0f016f Merge branch 'master' into rails_3_1 
Conflicts:
	app/models/content_type.rb
	config/boot.rb
 2011-12-15 22:29:07 +08:00
Mario Visic 4ae6fe7977 False values for custom fields are now correctly exported. Fixes #250. 2011-12-15 22:11:54 +08:00
Mario Visic 79bf38c419 Merge pull request #254 from Robsteranium/patch-1 
Previous comparison method failed when the sort column is a date with Nil
 2011-12-15 05:47:17 -08:00
Robsteranium 82a61b1d2d spec added to confirm content_type Date problem & patch. Also 1.8.7 compatibility with syck init. 2011-12-15 03:16:11 +00:00
Robsteranium 282e2486b6 Previous comparison method failed when the sort column is a date with a Nil. This revision doesn't really sort Nils, rather ignore them. 2011-12-14 11:26:24 +00:00
did e500a1985b refactoring of the sites picker is done 2011-12-12 10:35:42 +01:00
did 8271782284 refactoring of the import UI is done 2011-12-11 23:33:38 +01:00
did bbf0b0e083 Merge branch 'rails_3_1' of github.com:locomotivecms/engine into rails_3_1 2011-12-08 07:48:11 -08:00
did a25009824c fix some bugs + refactor look and feel of the import screens (wip) 2011-12-08 07:47:17 -08:00
Mario Visic 1c139af4e0 Small namespace fixes to specs. 2011-12-08 23:36:53 +08:00
did b60b1378f8 no more flash uploader only HTML5 goodness 2011-12-07 07:10:21 -08:00
did d21f32d849 upload many theme assets at once 2011-12-07 03:25:30 -08:00
did 4da434deb1 replace Asset by ContentAsset in the export module 2011-12-07 00:52:13 -08:00
did eacdb2873e Merge branch 'rails_3_1' of github.com:locomotivecms/engine into rails_3_1 2011-12-07 02:09:35 +01:00
did 368f643cf0 theme assets page in progress 2011-12-07 02:09:13 +01:00
Mario Visic 264ba8ebf2 Cucumber tests are now running, only a few passing, most fail. 2011-12-06 22:46:21 +08:00
Mario Visic a76020108f Fixed some broken tests, mainly due to routing issues. Down to 68 failing tests. 2011-12-06 21:42:41 +08:00
Mario Visic e6d72cfc71 Bumped the custom fields version, should now work with the namespaced models. 2011-12-06 21:17:47 +08:00
did af955ef927 delete snippets in ajax + new way of render theme assets in the back-office (backbone view) + change the way to fire growl messages 2011-12-06 12:39:32 +01:00
did dd15e3a758 delete snippets in ajax (wip) 2011-12-05 15:19:57 -08:00
did 5d750bee44 Merge branch 'rails_3_1' of github.com:locomotivecms/engine into rails_3_1 2011-12-05 06:40:48 -08:00
did ad8fad3ce5 trying to implement the destroy action for theme assets (wip) 2011-12-05 06:39:52 -08:00
Mario Visic aa68d59979 Merge remote-tracking branch 'origin/rails_3_1' into rails_3_1 2011-12-05 22:31:14 +08:00
Mario Visic 4e6fc04889 Use contents_custom_fields instead of content_custom_fields 2011-12-05 22:29:32 +08:00
did 1b8c1c7157 use the slugify js plugin for the page form 2011-12-05 06:14:50 -08:00
did 8af3445045 snippets done 2011-12-05 04:29:58 -08:00