alchemy_cms 6.0.0.pre.rc2 → 6.0.0.pre.rc5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (45) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/ci.yml +0 -7
  3. data/CHANGELOG.md +37 -0
  4. data/Gemfile +5 -0
  5. data/alchemy_cms.gemspec +2 -2
  6. data/app/assets/javascripts/alchemy/admin.js +0 -1
  7. data/app/assets/javascripts/alchemy/alchemy.gui.js.coffee +2 -2
  8. data/app/assets/stylesheets/alchemy/_extends.scss +4 -4
  9. data/app/assets/stylesheets/alchemy/flatpickr.scss +182 -232
  10. data/app/assets/stylesheets/tinymce/skins/alchemy/content.min.css.scss +3 -3
  11. data/app/assets/stylesheets/tinymce/skins/alchemy/skin.min.css.scss +7 -7
  12. data/app/controllers/alchemy/admin/base_controller.rb +9 -3
  13. data/app/models/alchemy/attachment.rb +1 -1
  14. data/app/models/alchemy/element.rb +1 -1
  15. data/app/models/alchemy/node.rb +1 -1
  16. data/app/models/alchemy/page.rb +7 -2
  17. data/app/models/alchemy/picture.rb +1 -1
  18. data/app/services/alchemy/tag_validations.rb +21 -0
  19. data/app/views/alchemy/ingredients/_picture_editor.html.erb +2 -2
  20. data/config/brakeman.ignore +25 -5
  21. data/config/routes.rb +0 -1
  22. data/db/migrate/20200226213334_alchemy_four_point_four.rb +30 -30
  23. data/db/migrate/20200423073425_create_alchemy_essence_nodes.rb +1 -1
  24. data/db/migrate/20200504210159_remove_site_id_from_nodes.rb +1 -1
  25. data/db/migrate/20200505215518_add_language_id_foreign_key_to_alchemy_pages.rb +1 -1
  26. data/db/migrate/20200511113603_add_menu_type_to_alchemy_nodes.rb +1 -1
  27. data/db/migrate/20200514091507_make_page_layoutpage_null_false.rb +1 -1
  28. data/db/migrate/20200519073500_remove_visible_from_alchemy_pages.rb +1 -1
  29. data/db/migrate/20200617110713_create_alchemy_picture_thumbs.rb +1 -1
  30. data/db/migrate/20200907111332_remove_tri_state_booleans.rb +1 -1
  31. data/db/migrate/20201207131309_create_page_versions.rb +1 -1
  32. data/db/migrate/20201207135820_add_page_version_id_to_alchemy_elements.rb +1 -1
  33. data/lib/alchemy/engine.rb +6 -5
  34. data/lib/alchemy/error_tracking.rb +14 -0
  35. data/lib/alchemy/taggable.rb +11 -4
  36. data/lib/alchemy/upgrader.rb +6 -0
  37. data/lib/alchemy/version.rb +1 -1
  38. data/lib/alchemy_cms.rb +1 -0
  39. data/lib/generators/alchemy/install/install_generator.rb +2 -1
  40. data/lib/tasks/alchemy/upgrade.rake +6 -0
  41. data/package/admin.js +3 -1
  42. data/package/src/datepicker.js +39 -0
  43. data/package.json +2 -1
  44. metadata +24 -22
  45. data/app/assets/javascripts/alchemy/alchemy.datepicker.js.coffee +0 -29
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: aa6425ce6e3aa16df7d9df57ac4d098093cc6707f95856f4a7030204b82cb7b9
4
- data.tar.gz: ea96e420624ff64d60dccaa6e9e425354f85aa47e2a8602a20799414adf37096
3
+ metadata.gz: 380b59193f2297abbf578f48a662afd797a678edd9948b5967a5df870df20b5f
4
+ data.tar.gz: e36993e934138b801ce941d7a3b272790b41dde673f1cbded7e874cba637dd8d
5
5
  SHA512:
6
- metadata.gz: 8842fb9afc57ca77301e7658c3b00ca96306d5de1eda7827ba114d8fa0501fb9d520416ba8e9d100b785c9555be4b0d8f277dde4b44124539c9a9dbe2756d0b7
7
- data.tar.gz: d18b971bd54abf71a988e78751ce104d6ba7ea8ad24fd809cdc44e7c4564c65b4f777971819ca7df14ab23162dfeeb5c0ab5936f58097139277fd72fb22567f2
6
+ metadata.gz: '01489e9bf191e8ba5f42d19dfc93336d318744c41ccf6764625ebf787b8f2f030d219829be4b3b5830db93699e681883217909d8239ca023323469c95b7aab28'
7
+ data.tar.gz: 33599581bdff5315660e260562179f7e9b12ef9269dd50aeba7e5e52cdcb8bf5db5188bb86cb8cc60b53a0346d6c0bf8fe336c5eef234aec54a6110f7d5386b8
@@ -72,13 +72,6 @@ jobs:
72
72
  sudo apt update -qq
73
73
  sudo apt install -qq --fix-missing libmysqlclient-dev -o dir::cache::archives="/home/runner/apt/cache"
74
74
  sudo chown -R runner /home/runner/apt/cache
75
- - name: Install bundler
76
- run: |
77
- gem install bundler
78
- - name: Install bundle
79
- timeout-minutes: 10
80
- run: |
81
- bundle install --jobs 4 --retry 3
82
75
  - name: Restore node modules cache
83
76
  id: yarn-cache
84
77
  uses: actions/cache@v2.1.3
data/CHANGELOG.md CHANGED
@@ -1,3 +1,40 @@
1
+ ## 6.0.0-rc5 (2022-02-24)
2
+
3
+ ### Changes
4
+
5
+ - Change database version to 6.0 [#2239](https://github.com/AlchemyCMS/alchemy_cms/pull/2239) ([tvdeyen](https://github.com/tvdeyen))
6
+ - Remove unused route [#2238](https://github.com/AlchemyCMS/alchemy_cms/pull/2238) ([phantomwhale](https://github.com/phantomwhale))
7
+ - Add custom gutentag tag validations class [#2232](https://github.com/AlchemyCMS/alchemy_cms/pull/2232) ([tvdeyen](https://github.com/tvdeyen))
8
+ - Touch nodes and all ancestors on page update [#2226](https://github.com/AlchemyCMS/alchemy_cms/pull/2226) ([tvdeyen](https://github.com/tvdeyen))
9
+ - Extract Airbrake error handler into extension [#2221](https://github.com/AlchemyCMS/alchemy_cms/pull/2221) ([tvdeyen](https://github.com/tvdeyen))
10
+
11
+ ## 6.0.0-rc4 (2022-01-16)
12
+
13
+ ### Changes
14
+
15
+ - Allow ransack 2.5.0 [#2223](https://github.com/AlchemyCMS/alchemy_cms/pull/2223) ([depfu](https://github.com/apps/depfu))
16
+ - make the admin error tracker customizable [#2220](https://github.com/AlchemyCMS/alchemy_cms/pull/2220) ([DarkSwoop](https://github.com/DarkSwoop))
17
+ - Update Flatpickr to 4.6.9 [#2197](https://github.com/AlchemyCMS/alchemy_cms/pull/2197) ([tvdeyen](https://github.com/tvdeyen))
18
+
19
+ ## 6.0.0-rc3 (2021-11-24)
20
+
21
+ ### Changes
22
+
23
+ - Set stampable user_class_name without root identifier [#2215](https://github.com/AlchemyCMS/alchemy_cms/pull/2215) ([tvdeyen](https://github.com/tvdeyen))
24
+ - Allow all possible args in tagged_with method [#2211](https://github.com/AlchemyCMS/alchemy_cms/pull/2211) ([robinboening](https://github.com/robinboening))
25
+
26
+ ### Fixes
27
+
28
+ - fix(ImageCropper): Add dom ids to picture crop fields [#2219](https://github.com/AlchemyCMS/alchemy_cms/pull/2219) ([tvdeyen](https://github.com/tvdeyen))
29
+ - Adjust tinymce skin assets urls again [#2218](https://github.com/AlchemyCMS/alchemy_cms/pull/2218) ([tvdeyen](https://github.com/tvdeyen))
30
+ - Use relative path for tinymce font-face [#2214](https://github.com/AlchemyCMS/alchemy_cms/pull/2214) ([tvdeyen](https://github.com/tvdeyen))
31
+
32
+ ### Misc
33
+
34
+ - Install correct npm package [#2204](https://github.com/AlchemyCMS/alchemy_cms/pull/2204) ([tvdeyen](https://github.com/tvdeyen))
35
+ - Switch to cuprite for system testing [#2203](https://github.com/AlchemyCMS/alchemy_cms/pull/2203) ([tvdeyen](https://github.com/tvdeyen))
36
+ - Upgrade webdrivers to version 5.0.0 [#2201](https://github.com/AlchemyCMS/alchemy_cms/pull/2201) ([depfu](https://github.com/apps/depfu))
37
+
1
38
  ## 6.0.0-rc2 (2021-10-13)
2
39
 
3
40
  - Fix init link dialog if used in tinymce [#2200](https://github.com/AlchemyCMS/alchemy_cms/pull/2200) ([tvdeyen](https://github.com/tvdeyen))
data/Gemfile CHANGED
@@ -40,3 +40,8 @@ group :development, :test do
40
40
  gem "brakeman", require: false
41
41
  end
42
42
  end
43
+
44
+ # Necessary for system tests in Rails 6.0
45
+ if ENV["RAILS_VERSION"] == "6.0"
46
+ gem "selenium-webdriver"
47
+ end
data/alchemy_cms.gemspec CHANGED
@@ -46,7 +46,7 @@ Gem::Specification.new do |gem|
46
46
  gem.add_runtime_dependency "kaminari", ["~> 1.1"]
47
47
  gem.add_runtime_dependency "originator", ["~> 3.1"]
48
48
  gem.add_runtime_dependency "non-stupid-digest-assets", ["~> 1.0.8"]
49
- gem.add_runtime_dependency "ransack", [">= 1.8", "< 2.4.2"] # 2.4.2 dropped Ruby 2.5 support in a patch level release
49
+ gem.add_runtime_dependency "ransack", [">= 1.8", "<= 2.5.0"] # 2.4.2 dropped Ruby 2.5 support in a patch level release
50
50
  gem.add_runtime_dependency "request_store", ["~> 1.2"]
51
51
  gem.add_runtime_dependency "responders", [">= 2.0", "< 4.0"]
52
52
  gem.add_runtime_dependency "sassc-rails", ["~> 2.1"]
@@ -57,13 +57,13 @@ Gem::Specification.new do |gem|
57
57
 
58
58
  gem.add_development_dependency "capybara", ["~> 3.0"]
59
59
  gem.add_development_dependency "capybara-screenshot", ["~> 1.0"]
60
+ gem.add_development_dependency "cuprite", ["~> 0.13"]
60
61
  gem.add_development_dependency "factory_bot_rails", ["~> 6.0"]
61
62
  gem.add_development_dependency "puma", ["~> 5.0"]
62
63
  gem.add_development_dependency "rails-controller-testing", ["~> 1.0"]
63
64
  gem.add_development_dependency "rspec-activemodel-mocks", ["~> 1.0"]
64
65
  gem.add_development_dependency "rspec-rails", [">= 4.0.0.beta2"]
65
66
  gem.add_development_dependency "simplecov", ["~> 0.20"]
66
- gem.add_development_dependency "webdrivers", ["~> 4.0"]
67
67
  gem.add_development_dependency "webmock", ["~> 3.3"]
68
68
  gem.add_development_dependency "shoulda-matchers", ["~> 5.0"]
69
69
  gem.add_development_dependency "timecop", ["~> 0.9"]
@@ -22,7 +22,6 @@
22
22
  //= require alchemy/alchemy.dialog
23
23
  //= require alchemy/alchemy.char_counter
24
24
  //= require alchemy/alchemy.confirm_dialog
25
- //= require alchemy/alchemy.datepicker
26
25
  //= require alchemy/alchemy.dirty
27
26
  //= require alchemy/alchemy.dragndrop
28
27
  //= require alchemy/alchemy.element_editors
@@ -6,7 +6,7 @@ Alchemy.GUI =
6
6
  # Initializes all Alchemy GUI elements in given scope
7
7
  init: (scope) ->
8
8
  Alchemy.SelectBox(scope)
9
- Alchemy.Datepicker(scope)
9
+ Alchemy.Datepicker(scope && scope.selector)
10
10
  Alchemy.Tooltips(scope)
11
11
  Alchemy.Buttons.observe(scope)
12
12
  # Dialog links use event delegation and therefore do not
@@ -21,7 +21,7 @@ Alchemy.GUI =
21
21
 
22
22
  initElement: ($el) ->
23
23
  Alchemy.ElementDirtyObserver($el)
24
- Alchemy.GUI.init($el)
24
+ Alchemy.GUI.init($el && $el.selector)
25
25
  Alchemy.ImageLoader($el[0])
26
26
  Alchemy.fileEditors($el.find(".essence_file, .essence_video, .essence_audio, .ingredient-editor.file, .ingredient-editor.audio, .ingredient-editor.video").selector)
27
27
  Alchemy.pictureEditors($el.find(".essence_picture, .ingredient-editor.picture").selector)
@@ -37,8 +37,8 @@
37
37
 
38
38
  &[disabled],
39
39
  &.disabled,
40
- &[readonly],
41
- &.readonly {
40
+ &:not(.flatpickr-input)[readonly],
41
+ &:not(.flatpickr-input).readonly {
42
42
  color: $form-field-disabled-text-color;
43
43
  background-color: $form-field-disabled-bg-color;
44
44
  cursor: default;
@@ -49,8 +49,8 @@
49
49
  cursor: not-allowed;
50
50
  }
51
51
 
52
- &[readonly],
53
- &.readonly {
52
+ &:not(.flatpickr-input)[readonly],
53
+ &:not(.flatpickr-input).readonly {
54
54
  pointer-events: none;
55
55
  }
56
56
  }