trusty-cms 5.4.4 → 5.5.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (12) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +8 -10
  3. data/app/assets/javascripts/admin.js +1 -1
  4. data/app/assets/stylesheets/admin/partials/_popup.scss +5 -20
  5. data/app/models/standard_tags.rb +0 -2
  6. data/lib/trusty_cms.rb +1 -1
  7. data/package.json +1 -1
  8. data/spec/dummy/package.json +1 -1
  9. data/spec/dummy/yarn.lock +11 -3
  10. data/yarn.lock +11 -4
  11. metadata +2 -3
  12. data/lib/local_time.rb +0 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: ff46b212fc54c78db85a010e934a3d05856e134c6b527ab1f232576d9abef4bf
4
- data.tar.gz: aa5b6a4e20b1aa061c5c81ca89b298db857ca34dcf9398fa0bbfe1e518511b89
3
+ metadata.gz: d1fe00a8e1fbde680ce99052e154774972e5bedaa0770e2b2aa12fb19771f642
4
+ data.tar.gz: 70ba4a618e0a4c576879c67aecebbda1d00f4a21c07138709e2320a6f7d1c361
5
5
  SHA512:
6
- metadata.gz: ee1abd18254d737b5c2412ca33e6c5f09b8f6c701bff0ca96ed8b138ce1d75a8dbbdf2f9e4e413a150e169a1f619fca6e0658b30a24725a6c6066c6254ab1229
7
- data.tar.gz: e63c0fd4482b339cf99b828795f4a97e73cf81b368480fd878969406ce995d879129da8ada98ab7afa394029c07c4777799e2b3cb119bbe93a7dd908fc443550
6
+ metadata.gz: aed01177b5e39f78c398e24c8105d785325df410d8e272788097705cbcd02599d9a7246c14df3010d94ad1ab2ef293d83e7c292349ed19cd72e02970c7333bc9
7
+ data.tar.gz: c4fa21d06a553b7eaf9dd8a4d20798466986fa0b9d41ee698f89d8b37c390645df33a5a87500487be3b29ffa3a0402cba774a12cafda0203eebacdb4e81f3b0e
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- trusty-cms (5.4.2)
4
+ trusty-cms (5.5)
5
5
  RedCloth (= 4.3.2)
6
6
  activestorage-validator
7
7
  acts_as_list (>= 0.9.5, < 1.1.0)
@@ -177,10 +177,8 @@ GEM
177
177
  multipart-post
178
178
  launchy (2.5.0)
179
179
  addressable (~> 2.7)
180
- libv8 (8.4.255.0)
181
- libv8 (8.4.255.0-x86_64-darwin-18)
182
- libv8 (8.4.255.0-x86_64-darwin-20)
183
- libv8 (8.4.255.0-x86_64-linux)
180
+ libv8-node (16.10.0.0-x86_64-darwin)
181
+ libv8-node (16.10.0.0-x86_64-linux)
184
182
  loofah (2.19.0)
185
183
  crass (~> 1.0.2)
186
184
  nokogiri (>= 1.5.9)
@@ -193,8 +191,8 @@ GEM
193
191
  mime-types-data (3.2021.0225)
194
192
  mini_magick (4.11.0)
195
193
  mini_mime (1.1.2)
196
- mini_racer (0.3.1)
197
- libv8 (~> 8.4.255)
194
+ mini_racer (0.6.3)
195
+ libv8-node (~> 16.10.0.0)
198
196
  minitest (5.15.0)
199
197
  multi_xml (0.6.0)
200
198
  multipart-post (2.2.3)
@@ -260,12 +258,12 @@ GEM
260
258
  responders (3.0.1)
261
259
  actionpack (>= 5.0)
262
260
  railties (>= 5.0)
263
- roadie (4.0.0)
261
+ roadie (5.0.1)
264
262
  css_parser (~> 1.4)
265
263
  nokogiri (~> 1.8)
266
- roadie-rails (2.3.0)
264
+ roadie-rails (3.0.0)
267
265
  railties (>= 5.1, < 7.1)
268
- roadie (>= 3.1, < 5.0)
266
+ roadie (~> 5.0)
269
267
  rspec-core (3.12.0)
270
268
  rspec-support (~> 3.12.0)
271
269
  rspec-expectations (3.12.0)
data/app/assets/javascripts/admin.js CHANGED
@@ -12,7 +12,7 @@
12
12
  //
13
13
  //= require jquery/dist/jquery.js
14
14
  //= require jquery-ujs/src/rails.js
15
- //= require jquery-ui-bundle/jquery-ui
15
+ //= require jquery-ui/dist/jquery-ui
16
16
  //= require js-cookie/dist/js.cookie
17
17
  //= require 'jquery-validation/dist/jquery.validate.min'
18
18
  //= require jquery-treetable/jquery.treetable.js
data/app/assets/stylesheets/admin/partials/_popup.scss CHANGED
@@ -155,11 +155,11 @@ div.popup {
155
155
  width: 100%;
156
156
 
157
157
  th {
158
+ border-bottom: 1px dotted silver;
158
159
  color: green;
159
160
  font-size: 120%;
160
- padding: 5px;
161
- padding-left: 0;
162
- padding-right: 0;
161
+ padding: 8px 5px;
162
+ text-align: left;
163
163
  }
164
164
 
165
165
  td {
@@ -169,12 +169,12 @@ div.popup {
169
169
  text-align: left;
170
170
  }
171
171
 
172
- h1 {
172
+ h1, h2, h3, h4 {
173
173
  color: black;
174
174
  margin: 0;
175
175
  margin-bottom: 0.5em;
176
176
  }
177
-
177
+
178
178
  acronym {
179
179
  border-bottom: 1px dotted silver;
180
180
  }
@@ -233,21 +233,6 @@ div.popup {
233
233
  }
234
234
  }
235
235
 
236
- div.popup .reference table {
237
- th {
238
- border-bottom: 1px dotted silver;
239
- padding-bottom: 8px;
240
- padding-top: 8px;
241
- text-align: left;
242
- }
243
-
244
- h2, h3, h4 {
245
- color: black;
246
- margin: 0;
247
- margin-bottom: 0.5em;
248
- }
249
- }
250
-
251
236
  div#popup_window {
252
237
  display: none;
253
238
  position: absolute;
data/app/models/standard_tags.rb CHANGED
@@ -1,8 +1,6 @@
1
1
  require 'trusty_cms/taggable'
2
- require 'local_time'
3
2
  module StandardTags
4
3
  include TrustyCms::Taggable
5
- include LocalTime
6
4
 
7
5
  require 'will_paginate/view_helpers'
8
6
  include WillPaginate::ViewHelpers
data/lib/trusty_cms.rb CHANGED
@@ -2,6 +2,6 @@ TRUSTY_CMS_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..')) unle
2
2
 
3
3
  unless defined? TrustyCms::VERSION
4
4
  module TrustyCms
5
- VERSION = '5.4.4'.freeze
5
+ VERSION = '5.5.1'.freeze
6
6
  end
7
7
  end
data/package.json CHANGED
@@ -11,7 +11,7 @@
11
11
  "blueimp-file-upload": "^10.32.0",
12
12
  "jquery": "^3.5.0",
13
13
  "jquery-treetable": "^3.2.0-1",
14
- "jquery-ui-bundle": "^1.12.1",
14
+ "jquery-ui": "^1.13.2",
15
15
  "jquery-ujs": "^1.2.2",
16
16
  "jquery-validation": "^1.19.5",
17
17
  "js-cookie": "^3.0.1",
data/spec/dummy/package.json CHANGED
@@ -6,7 +6,7 @@
6
6
  "dependencies": {
7
7
  "jquery": "^3.5.0",
8
8
  "jquery-treetable": "^3.2.0-1",
9
- "jquery-ui-bundle": "^1.12.1",
9
+ "jquery-ui": "^1.12.1",
10
10
  "jquery-ujs": "^1.2.2"
11
11
  }
12
12
  }
data/spec/dummy/yarn.lock CHANGED
@@ -9,9 +9,12 @@ jquery-treetable@^3.2.0-1:
9
9
  dependencies:
10
10
  jquery ">=1.6"
11
11
 
12
- jquery-ui-bundle@^1.12.1:
13
- version "1.12.1"
14
- resolved "https://registry.yarnpkg.com/jquery-ui-bundle/-/jquery-ui-bundle-1.12.1.tgz#d6be2e4c377494e2378b1cae2920a91d1182d8c4"
12
+ jquery-ui@^1.12.1:
13
+ version "1.13.2"
14
+ resolved "https://registry.yarnpkg.com/jquery-ui/-/jquery-ui-1.13.2.tgz#de03580ae6604773602f8d786ad1abfb75232034"
15
+ integrity sha512-wBZPnqWs5GaYJmo1Jj0k/mrSkzdQzKDwhXNtHKcBdAcKVxMM3KNYFq+iJ2i1rwiG53Z8M4mTn3Qxrm17uH1D4Q==
16
+ dependencies:
17
+ jquery ">=1.8.0 <4.0.0"
15
18
 
16
19
  jquery-ujs@^1.2.2:
17
20
  version "1.2.2"
@@ -27,3 +30,8 @@ jquery@>=1.6:
27
30
  jquery@>=1.8.0, jquery@^3.5.0:
28
31
  version "3.5.0"
29
32
  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.0.tgz#9980b97d9e4194611c36530e7dc46a58d7340fc9"
33
+
34
+ "jquery@>=1.8.0 <4.0.0":
35
+ version "3.6.1"
36
+ resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.1.tgz#fab0408f8b45fc19f956205773b62b292c147a16"
37
+ integrity sha512-opJeO4nCucVnsjiXOE+/PcCgYw9Gwpvs/a6B1LL/lQhwWwpbVEVYDZ1FokFr8PRc7ghYlrFPuyHuiiDNTQxmcw==
data/yarn.lock CHANGED
@@ -962,10 +962,12 @@ jquery-treetable@^3.2.0-1:
962
962
  dependencies:
963
963
  jquery ">=1.6"
964
964
 
965
- jquery-ui-bundle@^1.12.1:
966
- version "1.12.1"
967
- resolved "https://registry.yarnpkg.com/jquery-ui-bundle/-/jquery-ui-bundle-1.12.1.tgz#d6be2e4c377494e2378b1cae2920a91d1182d8c4"
968
- integrity sha1-1r4uTDd0lOI3ixyuKSCpHRGC2MQ=
965
+ jquery-ui@^1.13.2:
966
+ version "1.13.2"
967
+ resolved "https://registry.yarnpkg.com/jquery-ui/-/jquery-ui-1.13.2.tgz#de03580ae6604773602f8d786ad1abfb75232034"
968
+ integrity sha512-wBZPnqWs5GaYJmo1Jj0k/mrSkzdQzKDwhXNtHKcBdAcKVxMM3KNYFq+iJ2i1rwiG53Z8M4mTn3Qxrm17uH1D4Q==
969
+ dependencies:
970
+ jquery ">=1.8.0 <4.0.0"
969
971
 
970
972
  jquery-ujs@^1.2.2:
971
973
  version "1.2.2"
@@ -989,6 +991,11 @@ jquery@>=1.8.0, jquery@^3.5.0:
989
991
  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.0.tgz#9980b97d9e4194611c36530e7dc46a58d7340fc9"
990
992
  integrity sha512-Xb7SVYMvygPxbFMpTFQiHh1J7HClEaThguL15N/Gg37Lri/qKyhRGZYzHRyLH8Stq3Aow0LsHO2O2ci86fCrNQ==
991
993
 
994
+ "jquery@>=1.8.0 <4.0.0":
995
+ version "3.6.1"
996
+ resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.1.tgz#fab0408f8b45fc19f956205773b62b292c147a16"
997
+ integrity sha512-opJeO4nCucVnsjiXOE+/PcCgYw9Gwpvs/a6B1LL/lQhwWwpbVEVYDZ1FokFr8PRc7ghYlrFPuyHuiiDNTQxmcw==
998
+
992
999
  js-cookie@^3.0.1:
993
1000
  version "3.0.1"
994
1001
  resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-3.0.1.tgz#9e39b4c6c2f56563708d7d31f6f5f21873a92414"
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: trusty-cms
3
3
  version: !ruby/object:Gem::Version
4
- version: 5.4.4
4
+ version: 5.5.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - TrustyCms CMS dev team
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2022-11-03 00:00:00.000000000 Z
11
+ date: 2022-11-17 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activestorage-validator
@@ -967,7 +967,6 @@ files:
967
967
  - lib/generators/trusty_cms/templates/routes.rb.erb
968
968
  - lib/generators/trusty_cms/trusty_cms_generator.rb
969
969
  - lib/inheritable_class_attributes.rb
970
- - lib/local_time.rb
971
970
  - lib/login_system.rb
972
971
  - lib/method_observer.rb
973
972
  - lib/ostruct.rb
data/lib/local_time.rb DELETED
@@ -1,6 +0,0 @@
1
- module LocalTime
2
- def adjust_time(time)
3
- ::ActiveSupport::Deprecation.warn("`adjust_time' is deprecated. All time output is now auto-adjusted to TrustyCms::Config['local.timezone'] or the default ActiveRecord time zone.", caller)
4
- time
5
- end
6
- end