Mario Visic
ddfd8c6a07
Fixed up some specs for the global action spec.
2012-01-15 15:38:07 +11:00
Mario Visic
ae244c2703
Fixed a failing test (class missing namespace).
2012-01-15 15:05:50 +11:00
Mario Visic
4622c4359f
Fixed up a failing test due to the i18n module, left a fixme note.
2012-01-15 15:05:31 +11:00
Mario Visic
216b77ab41
Fixed up a bad merge of the content instance spec changes.
2012-01-15 14:50:23 +11:00
Mario Visic
a50715091d
Merge remote-tracking branch 'origin/rails_3_1' into rails_3_1
2012-01-15 00:03:06 +10:30
Mario Visic
8ac8289394
Merge remote-tracking branch 'origin/master' into rails_3_1
...
Conflicts:
app/models/content_instance.rb
config/locales/admin_ui.de.yml
public/javascripts/admin/inline_editor_toolbar.js
spec/models/content_instance_spec.rb
2012-01-15 00:02:46 +10:30
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
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
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
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
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
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
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
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
