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

1123 Commits

Author SHA1 Message Date
did ebe149110b first draft of the new inline editing toolbar 2012-01-16 23:59:59 +01:00
did 4060b1859f use the right path to the back-office in the js components as well as in the middlewares 2012-01-14 14:54:01 +01:00
did 531017ab62 merging 2012-01-14 13:14:59 +01:00
did 50a2453995 polish again the content_locale picker 2012-01-14 13:12:44 +01:00
Mario Visic 8f5a363d74 Remove cucumber-rails version. 2012-01-14 16:38:42 +10:30
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 d191d2d783 polish the content_locale picker + does not display the picker if less than 2 locales 2012-01-14 02:08:03 +01:00
did 0489bbe4c2 implement the mechanism to pick a different locale for content types + implement multi-language for content types + rename scss files to css.scss 2012-01-14 01:38:09 +01:00
did 42db5ba656 namespace assets in vendor 2012-01-10 09:09:56 +01:00
did 01c5de36a5 add the ui element to select the languages for a site 2012-01-09 17:24: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 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 a650acd535 forgot to reflect changes in the gemspec file 2012-01-07 03:11:48 +01:00
did 9a21cd818a new rspec-cells gem 2012-01-07 02:53:33 +01:00
did a1e692a34d fix tests suite with ruby 1.9.2 2012-01-07 02:49:23 +01:00
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