projects / GitHub / WoltLab / WCF.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e8afc7c 7efd39d)
Merge branch '6.2' into 6.2-user-coverphoto
authorCyperghost <olaf_schmitz_1@t-online.de>
Mon, 23 Dec 2024 08:02:45 +0000 (09:02 +0100)
committerCyperghost <olaf_schmitz_1@t-online.de>
Mon, 23 Dec 2024 08:02:45 +0000 (09:02 +0100)
commit6f56543e0314e89cb796fb18e158f0b0b3b58a13
treed5c3185252b272809d13d90c6a13507502e7f65ctree | snapshot (tar.gz zip)
parente8afc7c3e87978ca995f37094c8503a606cf1ddacommit | diff
parent7efd39d13b1e9b214680878d9f3291885f6f09a0commit | diff
Merge branch '6.2' into 6.2-user-coverphoto

# Conflicts:
# com.woltlab.wcf/fileDelete.xml
# com.woltlab.wcf/objectType.xml
# wcfsetup/install/files/acp/database/update_com.woltlab.wcf_6.2.php
# wcfsetup/install/files/lib/data/user/UserProfile.class.php
# wcfsetup/install/files/lib/data/user/UserProfileAction.class.php
# wcfsetup/install/files/lib/data/user/UserProfileList.class.php
# wcfsetup/setup/db/install.sql
18 files changed:
com.woltlab.wcf/fileDelete.xml diff1 | diff2 | blob | history
com.woltlab.wcf/objectType.xml diff1 | diff2 | blob | history
com.woltlab.wcf/templates/userProfileHeader.tpl diff1 | diff2 | blob | history
ts/WoltLabSuite/Core/Bootstrap.ts diff1 | diff2 | blob | history
ts/WoltLabSuite/Core/Component/Image/Cropper.ts diff1 | diff2 | blob | history
wcfsetup/install/files/acp/database/update_com.woltlab.wcf_6.2.php diff1 | diff2 | blob | history
wcfsetup/install/files/acp/templates/userAdd.tpl diff1 | diff2 | blob | history
wcfsetup/install/files/js/WoltLabSuite/Core/Bootstrap.js diff1 | diff2 | blob | history
wcfsetup/install/files/js/WoltLabSuite/Core/Component/Image/Cropper.js diff1 | diff2 | blob | history
wcfsetup/install/files/lib/acp/form/UserEditForm.class.php diff1 | diff2 | blob | history
wcfsetup/install/files/lib/data/user/User.class.php diff1 | diff2 | blob | history
wcfsetup/install/files/lib/data/user/UserProfile.class.php diff1 | diff2 | blob | history
wcfsetup/install/files/lib/data/user/UserProfileAction.class.php diff1 | diff2 | blob | history
wcfsetup/install/files/lib/data/user/UserProfileList.class.php diff1 | diff2 | blob | history
wcfsetup/install/files/lib/system/worker/UserRebuildDataWorker.class.php diff1 | diff2 | blob | history
wcfsetup/install/lang/de.xml diff1 | diff2 | blob | history
wcfsetup/install/lang/en.xml diff1 | diff2 | blob | history
wcfsetup/setup/db/install.sql diff1 | diff2 | blob | history
WoltLab Suite Core (previously WoltLab Community Framework)