Commit Graph

999 Commits

Author SHA1 Message Date
Mario Visic 14fc4bf12d Merge remote-tracking branch 'origin/master' 2012-01-14 22:07:08 +10:30
Mario Visic a0d02b2fce Add a failing tests for ContentInstance#set_visibility returning false. 2012-01-14 22:06:42 +10:30
Mario Visic 81b89ba389 Merge pull request #273 from giorgian/fix_content_not_visible
Fix a before_filter preventing to save a content instance with a
2012-01-14 03:36:10 -08:00
Mario Visic 76b611b848 Merge pull request #268 from paulsponagl/issue_240
fix issue 240 by using slug to find content-type
2012-01-14 03:22:58 -08:00
Mario Visic 9aa6bf89be Merge pull request #270 from giorgian/fix_i18n_files_for_psych
Fix i18n files so that they don't make Psych angry.
2012-01-14 02:59:42 -08:00
Mario Visic 7eccb97b44 Merge pull request #276 from antulik/master
Added russian translation for tiny_mce image uploader
2012-01-14 02:38:01 -08:00
Anton Katunin 3fad905314 Added russian translation for tiny_mce image uploader 2012-01-14 21:05:41 +10:30
Mario Visic 0476771ee4 Merge pull request #271 from twinslash/russian_locale
Added russian localisation to tiny_mcs
2012-01-14 02:21:05 -08:00
Mario Visic e6a527f0f5 Merge pull request #275 from twinslash/russian_locale_to_inline_editor
Added ru locale to inline_editor
2012-01-14 01:58:14 -08:00
Mario Visic 04b1a7aa90 Bump RedCloth to a newer version to avoid warnings when running tests. 2012-01-14 13:04:34 +08:00
Mac Shifford 3e7babc9dd Added ru locale to inline_editor 2012-01-13 11:55:28 +03:00
Pietro Giorgianni 99d889f6e2 Fix a before_filter preventing to save a content instance with a
custom field `active' or `visible' set to false.
Fixes #272.
2012-01-12 16:18:55 +01:00
Mac Shifford 131331633f Added russian localisation to tiny_mcs 2012-01-12 17:19:42 +03:00
Pietro Giorgianni 6d08daaba3 Fix i18n files so that they don't make Psych angry.
(Fixes #269)
2012-01-10 15:00:07 +01:00
Paul Sponagl 27dd3b2001 Fit issue 240 by using slug to find content-type
export.rb exports targets with
field_attributes['target'] = target_klass._parent.slug
but import imports it with:
target_content_type = site.content_types.where(:name => association.target).first

this fails if one uses capitalized names for Models.
i changed the default.zip to contain a site yaml with capitalized
Model-Names too.
2012-01-09 15:01:51 +01: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
Paul Sponagl 9a28ecbd1e update cells dependency 2011-12-27 23:34:00 +01: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
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
Mario Visic 63192a76f3 Updated readme with update instructions, helps with bug #251. 2011-11-28 09:51:37 +11:00
Mario Visic 867878a4f4 Test on ruby 1.9.3, removed the require for ruby-debug19 as it breaks on 1.9.3 2011-11-27 21:21:27 +11:00
Mario Visic 791c5f9d43 Merge pull request #223 from frisoft/master
Method missing "disable_parent_editable_elements" for nil
2011-11-27 01:53:25 -08:00
Mario Visic 1a350e7d0c Updated readme to include community information. 2011-11-27 20:17:08 +11:00
Mario Visic 05d9990e69 Use syck for yaml, fixes an issuew with new delayed job. 2011-11-27 20:05:39 +11:00
Mario Visic 9b049aa055 Bumped delayed job versions, fixes #249. 2011-11-27 19:44:06 +11:00
Mario Visic 83da41a2b1 Add the travis-ci button to the readme. 2011-11-27 19:35:08 +11:00
Mario Visic 0f09c577d0 New capybara and selenium version, works in FF8 now. 2011-11-27 19:29:09 +11:00
Mario Visic 5c6794d69c Fixed some failing dragonfly specs. 2011-11-27 19:02:20 +11:00
Mario Visic 7f7ed896cf use starts_with? instead of start_with, fixes #253 and #251 2011-11-27 18:22:00 +11:00
Sean Grove 0e5e16c8b4 Merge pull request #245 from locomotivecms/bushido_add_user
Bushido user.added, user.removed, app.claimed, and login fixes
2011-11-16 12:30:23 -08:00
Sean Grove ef5caad897 Proper mongoid exists? syntax 2011-11-16 12:04:51 -08:00
Sean Grove d1306aec53 Horrific rebasing strategy, but working code. 2011-11-16 11:39:47 -08:00
Sean Grove ed96ab1cf5 BUSHIDO_FIX: Adds bushido hooks user.added user.removed, and updates app.claimed to work with bushido_user_id as the permanent id
Conflicts:

	lib/locomotive/hosting/bushido/hooks.rb
2011-11-16 11:38:23 -08:00
Sean Grove 43dee9391d Uses a more careful approach when removing a user based on the bushido user.removed hook 2011-11-16 11:38:01 -08:00
Sean Grove 5a4a9f5475 BUSHIDO_FIX: Adds bushido hooks user.added user.removed, and updates app.claimed to work with bushido_user_id as the permanent id
Conflicts:

	lib/locomotive/hosting/bushido/hooks.rb
2011-11-16 11:37:30 -08:00
Sean Grove b2bfec1bc4 BUSHIDO_FIX: Adds hooks for user.added and user.removed, updates app.claimed event, switches to using bushido_user_id as permanent unchanging user id 2011-11-16 11:32:00 -08:00
did a3f66e19b5 fix issue #243 (Kaminari causing error on Bushido) 2011-11-05 15:18:15 +01:00