Skip to content

merge pimcore on local#1

Open
theghostbel wants to merge 10000 commits intotheghostbel:masterfrom
pimcore:master
Open

merge pimcore on local#1
theghostbel wants to merge 10000 commits intotheghostbel:masterfrom
pimcore:master

Conversation

@theghostbel
Copy link
Owner

No description provided.

brusch and others added 28 commits May 6, 2021 16:04
* use sqlite for locks
remove sync plugin

* use sqlite for locks

* use Pmcore database for WebDAV locks

* use Pimcore database for WebDAV locks

* use Pimcore database for WebDAV locks

* use Pimcore database for WebDAV locks
# Conflicts:
#	lib/Document/Adapter/Ghostscript.php
#	models/Document/Editable/Video.php
…9028)

* [Workflows] Fix object not unpublished with force_unpublished option - #7586

* Update Upgrade Notes for force_unpublished behavior change
Correct way to check for array key existence to prevent errors / warnings
# Conflicts:
#	doc/Development_Documentation/23_Installation_and_Upgrade/09_Upgrade_Notes/README.md
#	lib/Workflow/Manager.php
* Updated to PHP CS Fixer v3 - resolves #9050

* Updated typo in license header
# Conflicts:
#	.github/workflows/codeception.yml
#	.github/workflows/docs.yml
#	.github/workflows/static-analysis.yml
…ta column editor (#9033)

* [DataObjects] Fix Advanced ManyToMany Relations field checkbox metadata column editor - resolves #8999

* [DataObjects] Fix Advanced ManyToMany Relations field checkbox metadata column editor - resolves #8999
…ariables works (#9060)

* [Document] Check if adding "document" and "editmode" as global Twig variables works - fixes #9051

* Apply php-cs-fixer changes
# Conflicts:
#	.github/workflows/php-cs-fixer.yml
@brusch brusch deleted the branch theghostbel:master May 10, 2021 08:10
@brusch brusch deleted the master branch May 10, 2021 08:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.