Skip to content

Commit

Permalink
Reverting two commits, that were accidentally pushed to develop
Browse files Browse the repository at this point in the history
Revert "Changing event recurrance, should not alter ID if possible. DDFFORM-967"

This reverts commit 573592f.

Revert "Update reccurring_events to stable 2.0"

This reverts commit e2c1bf4.
  • Loading branch information
rasben committed Oct 3, 2024
1 parent 573592f commit 11fa516
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 23 deletions.
10 changes: 4 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@
"drupal/pathauto": "^1.12",
"drupal/potion": "dev-2.x#e48d6ee336d960b9d2efb5d88e68402db6d229a6",
"drupal/purge": "^3.6",
"drupal/recurring_events": "^2",
"drupal/recurring_events": "^2.0@RC",
"drupal/redirect": "^1.9",
"drupal/redis": "^1.7",
"drupal/restui": "^1.21",
Expand Down Expand Up @@ -359,11 +359,9 @@
},
"drupal/recurring_events": {
"3178696: Make compatible with Scheduler": "https://git.drupalcode.org/project/recurring_events/-/commit/35045cb17c7bbd1184553f83771939047175bc24.patch",
"3461740: Fatal error when using 'Event series start date' filter in views": "https://www.drupal.org/files/issues/2024-07-16/reccuring_events_event_start_date.patch",
"3468521: (1/4) When changing recurrance, identical date combinations should not be deleted and recreated": "https://git.drupalcode.org/project/recurring_events/-/commit/67261f4ac34546f2c9514199d9febb6dcce6fd10.patch",
"3468521: (2/4)": "https://git.drupalcode.org/project/recurring_events/-/commit/603d34936b97535f66e11429dcc9a2c61fc7cb40.patch",
"3468521: (3/4)": "https://git.drupalcode.org/project/recurring_events/-/commit/ad8a4294b1ffb754a338bb2cfa0146f203aa6fc1.patch",
"3468521: (4/4)": "https://git.drupalcode.org/project/recurring_events/-/commit/ad99ae79f5c55fc2db17427e9936ab141314609d.patch"
"3416436: Avoid array conversion warning when daily events are disabled": "https://git.drupalcode.org/project/recurring_events/-/commit/832ae52f135dd3f205eb74acf2d3715fb443e759.patch",
"3451613: Start date of weekly reccurring event jumps incorrectly": "https://git.drupalcode.org/project/recurring_events/-/commit/581c53dd1b0b067a8b6454d76cc0187887f7b187.patch",
"3461740: Fatal error when using 'Event series start date' filter in views": "https://www.drupal.org/files/issues/2024-07-16/reccuring_events_event_start_date.patch"
},
"drupal/theme_permission": {
"3105637: Edit, install and uninstall permission": "https://www.drupal.org/files/issues/2024-02-01/theme-permission-edit-install-uninstall-3105637-7.patch",
Expand Down
27 changes: 10 additions & 17 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 11fa516

Please sign in to comment.