git.stricted.de - GitHub/WoltLab/WCF.git/commit

projects / GitHub / WoltLab / WCF.git / commit

author	Cyperghost <olaf_schmitz_1@t-online.de>
	Thu, 12 Dec 2024 10:09:07 +0000 (11:09 +0100)
committer	Cyperghost <olaf_schmitz_1@t-online.de>
	Thu, 12 Dec 2024 10:09:07 +0000 (11:09 +0100)
commit	e5e64cda6a283093e6b39c840b3c315995951523
tree	7ea939a5c071d753c2dc37d75c1c370622e831d4	tree \| snapshot (tar.gz zip)
parent	b1250d987832dd375b4c51c8f881f7d876e96afc	commit \| diff
parent	fc90f963a65d8febb4c5c4f9da1f1e91f09ec2d0	commit \| diff

Merge branch 'file-upload-image-crop' into 6.2-user-coverphoto

# Conflicts:
# com.woltlab.wcf/templates/user.tpl
# ts/WoltLabSuite/Core/Bootstrap.ts
# ts/WoltLabSuite/Core/Ui/User/CoverPhoto/Delete.ts
# ts/WoltLabSuite/Core/Ui/User/CoverPhoto/Upload.ts
# wcfsetup/install/files/js/WoltLabSuite/Core/Bootstrap.js
# wcfsetup/install/files/js/WoltLabSuite/Core/Ui/User/CoverPhoto/Delete.js
# wcfsetup/install/files/js/WoltLabSuite/Core/Ui/User/CoverPhoto/Upload.js

WoltLab Suite Core (previously WoltLab Community Framework)

RSS Atom

com.woltlab.wcf/fileDelete.xml	diff1 \|	diff2 \|	blob \| history
com.woltlab.wcf/templates/user.tpl	diff1 \|	diff2 \|	blob \| history
ts/WoltLabSuite/Core/Bootstrap.ts	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/js/WoltLabSuite/Core/Bootstrap.js	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/lang/de.xml	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/lang/en.xml	diff1 \|	diff2 \|	blob \| history