Marcel Werk [Sun, 22 Apr 2018 11:31:38 +0000 (13:31 +0200)]
Merge remote-tracking branch 'refs/remotes/origin/3.0'
Marcel Werk [Sun, 22 Apr 2018 11:01:30 +0000 (13:01 +0200)]
Merge remote-tracking branch 'refs/remotes/origin/2.1' into 3.0
# Conflicts:
# wcfsetup/install/files/lib/system/MetaTagHandler.class.php
Marcel Werk [Sun, 22 Apr 2018 10:56:49 +0000 (12:56 +0200)]
An empty og-description no longer overwrites the global meta-description
Alexander Ebert [Sat, 21 Apr 2018 11:54:54 +0000 (13:54 +0200)]
Preparing the release 3.1.2 pl 2
Alexander Ebert [Sat, 21 Apr 2018 11:54:43 +0000 (13:54 +0200)]
Merge branch '3.0'
Alexander Ebert [Sat, 21 Apr 2018 11:42:06 +0000 (13:42 +0200)]
Preparing the release 3.0.14 pl 2
Alexander Ebert [Sat, 21 Apr 2018 11:41:05 +0000 (13:41 +0200)]
Merge branch '2.1' into 3.0
Alexander Ebert [Sat, 21 Apr 2018 11:03:02 +0000 (13:03 +0200)]
Preparing release 2.1.21 pl 1
Alexander Ebert [Sat, 21 Apr 2018 11:01:54 +0000 (13:01 +0200)]
Force-enable the reCAPTCHA option in the ACP selection
Alexander Ebert [Sat, 21 Apr 2018 08:12:14 +0000 (10:12 +0200)]
Merge branch 'master' of github.com:WoltLab/WCF
Alexander Ebert [Sat, 21 Apr 2018 08:12:10 +0000 (10:12 +0200)]
Always reset the timestamp for disabled phrase variants
Previously the time was only reset if the phrase was enabled again, causing the notice to stay even though the phrase has been reviewed and the user decided to keep the original version instead.
Marcel Werk [Fri, 20 Apr 2018 22:13:08 +0000 (00:13 +0200)]
Merge remote-tracking branch 'refs/remotes/origin/3.0'
Marcel Werk [Fri, 20 Apr 2018 22:11:36 +0000 (00:11 +0200)]
Improved RSS feeds of articles
Alexander Ebert [Fri, 20 Apr 2018 15:51:37 +0000 (17:51 +0200)]
Preparing release 3.1.2 pl 1
Alexander Ebert [Fri, 20 Apr 2018 15:50:45 +0000 (17:50 +0200)]
Merge branch '3.0'
Alexander Ebert [Fri, 20 Apr 2018 15:46:29 +0000 (17:46 +0200)]
Preparing release 3.0.14 pl 1
woltlab.com [Fri, 20 Apr 2018 15:38:05 +0000 (17:38 +0200)]
Updating minified JavaScript files
woltlab.com [Fri, 20 Apr 2018 15:34:27 +0000 (17:34 +0200)]
Updating minified JavaScript files
Alexander Ebert [Fri, 20 Apr 2018 15:31:48 +0000 (17:31 +0200)]
Merge branch '3.0'
Alexander Ebert [Fri, 20 Apr 2018 15:30:46 +0000 (17:30 +0200)]
Missing event for custom message options
Alexander Ebert [Fri, 20 Apr 2018 15:08:24 +0000 (17:08 +0200)]
Timezone was lost on re-evaluated date-only pickers
The previous change was broken as it caused a mismatch between the internal state and the actual element state. This version alters the behavior based on the actual content, instead of an assumption.
Alexander Ebert [Fri, 20 Apr 2018 14:53:29 +0000 (16:53 +0200)]
Revert "Timezone was lost on re-evaluated date-only pickers"
This reverts commit
235e0a123ac6d3dc48ac15045778f79165d8197e.
Alexander Ebert [Fri, 20 Apr 2018 10:28:58 +0000 (12:28 +0200)]
Merge branch '3.0'
Alexander Ebert [Fri, 20 Apr 2018 10:26:55 +0000 (12:26 +0200)]
Flush the libxml error buffer after parsing HTML5
Alexander Ebert [Fri, 20 Apr 2018 09:36:32 +0000 (11:36 +0200)]
Merge remote-tracking branch 'refs/remotes/origin/3.0'
Alexander Ebert [Fri, 20 Apr 2018 09:13:24 +0000 (11:13 +0200)]
Work-around for a non-flushed xml error buffer
Alexander Ebert [Thu, 19 Apr 2018 20:07:54 +0000 (22:07 +0200)]
Work-around for a non-flushed xml error buffer
Alexander Ebert [Thu, 19 Apr 2018 11:33:47 +0000 (13:33 +0200)]
Updating the release date
Alexander Ebert [Thu, 19 Apr 2018 11:23:29 +0000 (13:23 +0200)]
Merge branch '3.0'
Alexander Ebert [Thu, 19 Apr 2018 10:48:58 +0000 (12:48 +0200)]
Updating the release date
Alexander Ebert [Thu, 19 Apr 2018 10:34:16 +0000 (12:34 +0200)]
Adopted the changes to the update script in 3.1
Alexander Ebert [Thu, 19 Apr 2018 10:28:13 +0000 (12:28 +0200)]
Merge branch '2.1' into 3.0
Alexander Ebert [Thu, 19 Apr 2018 10:23:59 +0000 (12:23 +0200)]
Updating the release date and instructions
Alexander Ebert [Wed, 18 Apr 2018 15:15:24 +0000 (17:15 +0200)]
Merge remote-tracking branch 'refs/remotes/origin/3.0'
Alexander Ebert [Wed, 18 Apr 2018 15:08:25 +0000 (17:08 +0200)]
Merge remote-tracking branch 'refs/remotes/origin/2.1' into 3.0
Alexander Ebert [Wed, 18 Apr 2018 14:40:31 +0000 (16:40 +0200)]
Disable reCAPTCHA without any provided keys
Alexander Ebert [Wed, 18 Apr 2018 13:48:46 +0000 (15:48 +0200)]
Compare by regular characters only
Alexander Ebert [Tue, 17 Apr 2018 11:41:32 +0000 (13:41 +0200)]
The privacy policy was not updated earlier
Alexander Ebert [Tue, 17 Apr 2018 11:31:46 +0000 (13:31 +0200)]
Incorrect fromversion value
Alexander Ebert [Mon, 16 Apr 2018 16:33:13 +0000 (18:33 +0200)]
Preparing release 3.1.2
Alexander Ebert [Mon, 16 Apr 2018 16:13:59 +0000 (18:13 +0200)]
Merge branch '3.0'
woltlab.com [Mon, 16 Apr 2018 15:47:37 +0000 (17:47 +0200)]
Updating minified JavaScript files
Alexander Ebert [Mon, 16 Apr 2018 15:43:03 +0000 (17:43 +0200)]
Minor code formatting
woltlab.com [Mon, 16 Apr 2018 15:41:32 +0000 (17:41 +0200)]
Updating minified JavaScript files
Alexander Ebert [Mon, 16 Apr 2018 15:31:50 +0000 (17:31 +0200)]
Preparing release 3.0.14
Alexander Ebert [Mon, 16 Apr 2018 14:34:37 +0000 (16:34 +0200)]
Update script for the privacy policy
This script checks the existing policy against a pre-computed hash. To
avoid errors, the hash is is based on the text content without any
whitespaces.
Alexander Ebert [Mon, 16 Apr 2018 13:35:14 +0000 (15:35 +0200)]
Merge branch '2.1' into 3.0
Alexander Ebert [Mon, 16 Apr 2018 13:28:45 +0000 (15:28 +0200)]
Preparing release 2.1.21
Marcel Werk [Mon, 16 Apr 2018 11:59:31 +0000 (13:59 +0200)]
Fixed processing of the mysql port
Alexander Ebert [Mon, 16 Apr 2018 11:29:46 +0000 (13:29 +0200)]
Merge remote-tracking branch 'refs/remotes/origin/3.0'
Alexander Ebert [Mon, 16 Apr 2018 11:16:29 +0000 (13:16 +0200)]
Prevent the loss of the scroll position on editor focus
Alexander Ebert [Sun, 15 Apr 2018 21:14:52 +0000 (23:14 +0200)]
Restrict external sources by host only
Alexander Ebert [Sun, 15 Apr 2018 21:12:31 +0000 (23:12 +0200)]
Merge remote-tracking branch 'refs/remotes/origin/3.0'
Alexander Ebert [Sun, 15 Apr 2018 21:12:07 +0000 (23:12 +0200)]
Restrict external sources by host only
Alexander Ebert [Sun, 15 Apr 2018 21:10:55 +0000 (23:10 +0200)]
Merge branch '2.1' into 3.0
Alexander Ebert [Sun, 15 Apr 2018 21:10:29 +0000 (23:10 +0200)]
Restrict external sources by host only
Alexander Ebert [Sun, 15 Apr 2018 18:54:59 +0000 (20:54 +0200)]
Merge remote-tracking branch 'refs/remotes/origin/3.0'
# Conflicts:
# com.woltlab.wcf/option.xml
# constants.php
# wcfsetup/install/files/lib/system/html/output/node/HtmlOutputNodeImg.class.php
# wcfsetup/install/lang/de.xml
# wcfsetup/install/lang/en.xml
Alexander Ebert [Sun, 15 Apr 2018 18:44:11 +0000 (20:44 +0200)]
Merge remote-tracking branch 'refs/remotes/origin/2.1' into 3.0
# Conflicts:
# com.woltlab.wcf/option.xml
# wcfsetup/install/files/lib/system/bbcode/ImageBBCode.class.php
# wcfsetup/install/lang/de.xml
# wcfsetup/install/lang/en.xml
Alexander Ebert [Sun, 15 Apr 2018 18:28:25 +0000 (20:28 +0200)]
Disable gravatar by default
Alexander Ebert [Sun, 15 Apr 2018 18:27:40 +0000 (20:27 +0200)]
Option to block images from external sources
Matthias Schmidt [Sun, 15 Apr 2018 12:53:52 +0000 (14:53 +0200)]
Fix wording of English sitemap `rebuildTime` description
woltlab.com [Sat, 14 Apr 2018 11:15:38 +0000 (13:15 +0200)]
Updating minified JavaScript files
Alexander Ebert [Sat, 14 Apr 2018 11:05:59 +0000 (13:05 +0200)]
Merge branch '3.0'
woltlab.com [Sat, 14 Apr 2018 11:01:08 +0000 (13:01 +0200)]
Updating minified JavaScript files
Alexander Ebert [Thu, 12 Apr 2018 14:58:12 +0000 (16:58 +0200)]
Merge remote-tracking branch 'refs/remotes/origin/3.0'
Alexander Ebert [Thu, 12 Apr 2018 14:58:03 +0000 (16:58 +0200)]
Merge branch 'refs/heads/31-qr'
Alexander Ebert [Thu, 12 Apr 2018 14:57:56 +0000 (16:57 +0200)]
Merge remote-tracking branch 'refs/remotes/origin/master' into 31-qr
Alexander Ebert [Thu, 12 Apr 2018 14:57:02 +0000 (16:57 +0200)]
Merge remote-tracking branch 'refs/remotes/origin/2.1' into 3.0
Alexander Ebert [Thu, 12 Apr 2018 14:56:55 +0000 (16:56 +0200)]
Merge branch 'refs/heads/30-qr' into 3.0
Alexander Ebert [Thu, 12 Apr 2018 14:55:02 +0000 (16:55 +0200)]
Merge remote-tracking branch 'refs/remotes/origin/3.0' into 30-qr
Alexander Ebert [Thu, 12 Apr 2018 14:54:15 +0000 (16:54 +0200)]
Merge branch 'refs/heads/21-qr' into 2.1
Alexander Ebert [Thu, 12 Apr 2018 14:54:07 +0000 (16:54 +0200)]
Merge remote-tracking branch 'refs/remotes/origin/2.1' into 21-qr
Alexander Ebert [Thu, 12 Apr 2018 14:49:34 +0000 (16:49 +0200)]
Merge remote-tracking branch 'refs/remotes/origin/3.0'
Alexander Ebert [Thu, 12 Apr 2018 14:49:03 +0000 (16:49 +0200)]
Timezone was lost on re-evaluated date-only pickers
Alexander Ebert [Thu, 12 Apr 2018 13:33:30 +0000 (15:33 +0200)]
Merge remote-tracking branch 'refs/remotes/origin/3.0' into 30-qr
Alexander Ebert [Thu, 12 Apr 2018 13:32:19 +0000 (15:32 +0200)]
Merge remote-tracking branch 'refs/remotes/origin/master' into 31-qr
Alexander Ebert [Thu, 12 Apr 2018 13:28:22 +0000 (15:28 +0200)]
Adjustements for attached images in Google AMP
Marcel Werk [Thu, 12 Apr 2018 10:50:50 +0000 (12:50 +0200)]
Merge remote-tracking branch 'refs/remotes/origin/3.0'
# Conflicts:
# com.woltlab.wcf/userGroupOption.xml
Marcel Werk [Thu, 12 Apr 2018 10:47:47 +0000 (12:47 +0200)]
Added missing check of module setting
Alexander Ebert [Thu, 12 Apr 2018 10:36:34 +0000 (12:36 +0200)]
Improve user importer performance
Marcel Werk [Wed, 11 Apr 2018 16:49:37 +0000 (18:49 +0200)]
Merge remote-tracking branch 'refs/remotes/origin/3.0'
Marcel Werk [Wed, 11 Apr 2018 16:48:06 +0000 (18:48 +0200)]
Merge remote-tracking branch 'refs/remotes/origin/2.1' into 3.0
Marcel Werk [Wed, 11 Apr 2018 16:45:26 +0000 (18:45 +0200)]
Improved description of 'log_ip_address' setting
Alexander Ebert [Wed, 11 Apr 2018 10:19:22 +0000 (12:19 +0200)]
Merge remote-tracking branch 'refs/remotes/origin/3.0'
Alexander Ebert [Wed, 11 Apr 2018 10:18:10 +0000 (12:18 +0200)]
Avoid protocol replacement for valid URLs
Marcel Werk [Mon, 9 Apr 2018 15:19:53 +0000 (17:19 +0200)]
Updated default privacy policy
Marcel Werk [Mon, 9 Apr 2018 15:09:28 +0000 (17:09 +0200)]
Merge branch '3.0'
Marcel Werk [Mon, 9 Apr 2018 15:09:23 +0000 (17:09 +0200)]
Merge branch '2.1'
Marcel Werk [Mon, 9 Apr 2018 14:43:20 +0000 (16:43 +0200)]
Updated privacy policy
Marcel Werk [Mon, 9 Apr 2018 14:39:44 +0000 (16:39 +0200)]
Merge branch '2.1' into 3.0
Marcel Werk [Mon, 9 Apr 2018 14:37:48 +0000 (16:37 +0200)]
Removed obsolete placeholder
Marcel Werk [Mon, 9 Apr 2018 14:25:59 +0000 (16:25 +0200)]
Merge branch '2.1' into 3.0
Marcel Werk [Mon, 9 Apr 2018 14:25:08 +0000 (16:25 +0200)]
Updated privacy policy
Alexander Ebert [Sun, 8 Apr 2018 21:25:24 +0000 (23:25 +0200)]
Discard invalid routes
Fixes #2553
Alexander Ebert [Sun, 8 Apr 2018 18:38:39 +0000 (20:38 +0200)]
Avoid issues with CORS checks
Alexander Ebert [Sun, 8 Apr 2018 18:20:01 +0000 (20:20 +0200)]
Prevent duplication of `<strong>` elements on paste
Alexander Ebert [Sun, 8 Apr 2018 18:09:24 +0000 (20:09 +0200)]
Set focus to the next button for completed workers
Alexander Ebert [Sun, 8 Apr 2018 17:59:34 +0000 (19:59 +0200)]
Loading responses should not open the reply box
Alexander Ebert [Sun, 8 Apr 2018 17:20:39 +0000 (19:20 +0200)]
Avoid implicit type conversions
Alexander Ebert [Sun, 8 Apr 2018 17:20:28 +0000 (19:20 +0200)]
Treat `"false"` as boolean false