Commit Graph

1020 Commits

Author SHA1 Message Date
Enrique García Cota
5a4cc5508c Merge remote-tracking branch 'upstream/master' into current_user_liquid_extensions 2012-03-03 00:05:59 +01:00
Enrique García Cota
7466f17141 Merge remote-tracking branch 'upstream/master' into current_user_liquid_extensions 2012-03-03 00:01:14 +01:00
Enrique García Cota
db171eba22 use memberships correctly 2012-03-02 23:59:58 +01:00
Enrique García Cota
ae18098c6d kinda-sorta working? 2012-03-02 14:02:33 +01:00
Sean Grove
188cb373e3 Comments out S3 storage in assets.yml by default 2012-03-01 19:03:19 -08:00
Enrique García Cota
b359152757 semi working 2012-03-01 17:07:09 +01:00
Enrique García Cota
f407bc7a8f initial version 2012-02-28 19:29:54 +01:00
Didier Lafforgue
d75604d654 stick to cells 3.8.0 2012-02-09 12:48:35 +01:00
Corey Woodcox
7aadd9d129 add a message for deprecated config option 2012-01-25 18:52:55 +11:00
Corey Woodcox
1a5050a0c1 case sensitive search is a monster. 2012-01-25 18:52:54 +11:00
Corey Woodcox
81db1da423 fix spelling error in locales 2012-01-25 18:52:54 +11:00
Gil Vandendriessche
d665a85591 Add sample option on import rake task 2012-01-21 16:05:36 +11:00
Mario Visic
07ff99e135 Ensure uniqueness and format of an accounts email address. 2012-01-21 15:51:38 +11:00
Mario Visic
40c2902e80 Added shoulda matchers. 2012-01-21 15:51:16 +11:00
Mario Visic
0a2bd13058 Merge pull request #283 from cwoodcox/facebook
Upgrade to devise 1.5.x
2012-01-20 20:19:08 -08:00
Mario Visic
34f9755d9a Altered admin menu cells inheritence, fixes #257 without limiting cells version. 2012-01-21 15:10:58 +11:00
Corey Woodcox
868c2d2e0e upgrade devise to 1.5.x 2012-01-20 19:32:53 -07:00
Mario Visic
c2779dde51 Merge pull request #277 from jstirk/pr-229
German locale changes from locomotivecms/engine#229
2012-01-14 05:11:19 -08:00
benni
00035287c3 Update german locales (admin_ui and formtastic)
Conflicts:

	config/locales/admin_ui.de.yml
	config/locales/formtastic.de.yml
2012-01-14 23:19:57 +10:30
benni
edc1907cfa Fixed i18n bug in german locale when creating a new resource from api. 2012-01-14 23:13:18 +10:30
Mario Visic
23f3705223 Added a contributing section to the readme. 2012-01-14 22:34:39 +10:30
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