projects
/
GitHub
/
WoltLab
/
WCF.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0e0fede
a40fd80
)
Merge branch 'master' into next
author
Matthias Schmidt
<gravatronics@live.com>
Sun, 15 Apr 2018 12:54:39 +0000
(14:54 +0200)
committer
Matthias Schmidt
<gravatronics@live.com>
Sun, 15 Apr 2018 12:54:39 +0000
(14:54 +0200)
14 files changed:
1
2
wcfsetup/install/files/lib/action/CoreRewriteTestAction.class.php
patch
|
diff1
|
diff2
|
blob
|
history
wcfsetup/install/files/lib/data/label/group/LabelGroupAction.class.php
patch
|
diff1
|
diff2
|
blob
|
history
wcfsetup/install/files/lib/form/ContactForm.class.php
patch
|
diff1
|
diff2
|
blob
|
history
wcfsetup/install/files/lib/system/WCF.class.php
patch
|
diff1
|
diff2
|
blob
|
history
wcfsetup/install/files/lib/system/bbcode/AttachmentBBCode.class.php
patch
|
diff1
|
diff2
|
blob
|
history
wcfsetup/install/files/lib/system/bbcode/HtmlBBCodeParser.class.php
patch
|
diff1
|
diff2
|
blob
|
history
wcfsetup/install/files/lib/system/bbcode/highlighter/Highlighter.class.php
patch
|
diff1
|
diff2
|
blob
|
history
wcfsetup/install/files/lib/system/html/input/HtmlInputProcessor.class.php
patch
|
diff1
|
diff2
|
blob
|
history
wcfsetup/install/files/lib/system/html/input/node/HtmlInputNodeImg.class.php
patch
|
diff1
|
diff2
|
blob
|
history
wcfsetup/install/files/lib/system/image/adapter/GDImageAdapter.class.php
patch
|
diff1
|
diff2
|
blob
|
history
wcfsetup/install/files/lib/system/image/adapter/ImagickImageAdapter.class.php
patch
|
diff1
|
diff2
|
blob
|
history
wcfsetup/install/files/lib/system/importer/UserImporter.class.php
patch
|
diff1
|
diff2
|
blob
|
history
wcfsetup/install/files/lib/system/message/QuickReplyManager.class.php
patch
|
diff1
|
diff2
|
blob
|
history
wcfsetup/install/files/lib/system/request/route/DynamicRequestRoute.class.php
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
wcfsetup/install/files/lib/action/CoreRewriteTestAction.class.php
Simple merge
diff --cc
wcfsetup/install/files/lib/data/label/group/LabelGroupAction.class.php
index 25e7546b15d702cd48dabaf9d6344a690a9ab89a,bd4ac5386a09ddc31ba9ce45fe164cf1a6b30501..44116e3ab362f64bd858a17c42807cbd74df57c6
---
1
/
wcfsetup/install/files/lib/data/label/group/LabelGroupAction.class.php
---
2
/
wcfsetup/install/files/lib/data/label/group/LabelGroupAction.class.php
+++ b/
wcfsetup/install/files/lib/data/label/group/LabelGroupAction.class.php
@@@
-1,6
-1,6
+1,7
@@@
<?php
+declare(strict_types=1);
namespace wcf\data\label\group;
+ use wcf\data\label\LabelAction;
use wcf\data\language\item\LanguageItemAction;
use wcf\data\object\type\ObjectTypeCache;
use wcf\data\AbstractDatabaseObjectAction;
diff --cc
wcfsetup/install/files/lib/form/ContactForm.class.php
Simple merge
diff --cc
wcfsetup/install/files/lib/system/WCF.class.php
Simple merge
diff --cc
wcfsetup/install/files/lib/system/bbcode/AttachmentBBCode.class.php
Simple merge
diff --cc
wcfsetup/install/files/lib/system/bbcode/HtmlBBCodeParser.class.php
index 4fe55d1fb7c11969014ad13d13dd6579e75dbd7b,40f181ff15e7f6551aceed638a657ff29a5b9d0a..78dd78c8ead40fa3da7094e031322612cf74b95b
---
1
/
wcfsetup/install/files/lib/system/bbcode/HtmlBBCodeParser.class.php
---
2
/
wcfsetup/install/files/lib/system/bbcode/HtmlBBCodeParser.class.php
+++ b/
wcfsetup/install/files/lib/system/bbcode/HtmlBBCodeParser.class.php
@@@
-1,6
-1,6
+1,7
@@@
<?php
+declare(strict_types=1);
namespace wcf\system\bbcode;
+ use wcf\data\bbcode\attribute\BBCodeAttribute;
use wcf\system\exception\SystemException;
use wcf\util\DOMUtil;
use wcf\util\JSON;
diff --cc
wcfsetup/install/files/lib/system/bbcode/highlighter/Highlighter.class.php
Simple merge
diff --cc
wcfsetup/install/files/lib/system/html/input/HtmlInputProcessor.class.php
Simple merge
diff --cc
wcfsetup/install/files/lib/system/html/input/node/HtmlInputNodeImg.class.php
Simple merge
diff --cc
wcfsetup/install/files/lib/system/image/adapter/GDImageAdapter.class.php
Simple merge
diff --cc
wcfsetup/install/files/lib/system/image/adapter/ImagickImageAdapter.class.php
Simple merge
diff --cc
wcfsetup/install/files/lib/system/importer/UserImporter.class.php
Simple merge
diff --cc
wcfsetup/install/files/lib/system/message/QuickReplyManager.class.php
Simple merge
diff --cc
wcfsetup/install/files/lib/system/request/route/DynamicRequestRoute.class.php
Simple merge