Commit d5c674a4 authored by cp's avatar cp

updated ckeditor

git-svn-id: http://svn.sp-service.com.ua/svnroot/svn/base_site/trunk@11 d975c5f9-4e99-4c31-b122-d878075b96d9
parent c9cd8b77
......@@ -76,10 +76,10 @@ GEM
activemodel (>= 4.0.0)
activesupport (>= 4.0.0)
mime-types (>= 1.16)
ckeditor (4.2.2)
ckeditor (4.2.4)
cocaine
orm_adapter (~> 0.5.0)
climate_control (0.1.0)
climate_control (0.2.0)
cocaine (0.5.8)
climate_control (>= 0.0.3, < 1.0)
coffee-rails (4.1.1)
......
......@@ -78,10 +78,10 @@ class Phrase < ActiveRecord::Base
end
end
def empty?
any_translation = get_any_translation
any_translation.nil? or not any_translation.text.present?
end
# def empty?
# any_translation = get_any_translation
# any_translation.nil? or not any_translation.text.present?
# end
def completed?
(locales - translations.map(&:locale)).empty?
......
......@@ -28,7 +28,7 @@ class CkeditorPictureUploader < CarrierWave::Uploader::Base
# # do something
# end
process :read_dimensions
process :extract_dimensions
# Create different versions of your uploaded files:
version :thumb do
......
......@@ -47,8 +47,8 @@
<orderEntry type="library" scope="PROVIDED" name="capistrano-rails (v1.2.3, ruby-2.3.3-p222) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="capistrano-rvm (v0.1.2, ruby-2.3.3-p222) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="carrierwave (v1.0.0, ruby-2.3.3-p222) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="ckeditor (v4.2.2, ruby-2.3.3-p222) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="climate_control (v0.1.0, ruby-2.3.3-p222) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="ckeditor (v4.2.4, ruby-2.3.3-p222) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="climate_control (v0.2.0, ruby-2.3.3-p222) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="cocaine (v0.5.8, ruby-2.3.3-p222) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="coffee-rails (v4.1.1, ruby-2.3.3-p222) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="coffee-script (v2.4.1, ruby-2.3.3-p222) [gem]" level="application" />
......
# Be sure to restart your server when you modify this file.
Rails.application.config.session_store :cookie_store, key: '_stellar_session'
Rails.application.config.session_store :cookie_store, key: '_base_site_session'
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment