Alexander Ebert [Wed, 8 Oct 2014 20:15:04 +0000 (22:15 +0200)]
Merge branch 'master' of github.com:WoltLab/WCF
Conflicts:
wcfsetup/install/lang/en.xml
Marcel Werk [Wed, 8 Oct 2014 16:26:04 +0000 (18:26 +0200)]
Added missing descriptions (WIP)
Alexander Ebert [Wed, 8 Oct 2014 15:27:23 +0000 (17:27 +0200)]
Updated English translation
woltlab.com [Tue, 7 Oct 2014 20:11:52 +0000 (22:11 +0200)]
Updating minified JavaScript files
Alexander Ebert [Tue, 7 Oct 2014 20:10:03 +0000 (22:10 +0200)]
Resolved a few issues
woltlab.com [Tue, 7 Oct 2014 15:21:53 +0000 (17:21 +0200)]
Updating minified JavaScript files
Alexander Ebert [Tue, 7 Oct 2014 15:18:09 +0000 (17:18 +0200)]
Fixed IIFE
woltlab.com [Tue, 7 Oct 2014 15:11:52 +0000 (17:11 +0200)]
Updating minified JavaScript files
woltlab.com [Tue, 7 Oct 2014 13:31:53 +0000 (15:31 +0200)]
Updating minified JavaScript files
Alexander Ebert [Tue, 7 Oct 2014 13:30:08 +0000 (15:30 +0200)]
Fixed a few issues
woltlab.com [Tue, 7 Oct 2014 13:01:54 +0000 (15:01 +0200)]
Updating minified JavaScript files
Alexander Ebert [Tue, 7 Oct 2014 12:59:03 +0000 (14:59 +0200)]
Merge branch 'master' of github.com:WoltLab/WCF
Alexander Ebert [Tue, 7 Oct 2014 12:58:47 +0000 (14:58 +0200)]
Moved 3rd party stuff into WCF.Assets.js and enabled JS strict mode
Marcel Werk [Tue, 7 Oct 2014 12:57:31 +0000 (14:57 +0200)]
Merge pull request #1824 from SoftCreatR/patch-6
Add Safari Mobile Browser Detection
woltlab.com [Tue, 7 Oct 2014 12:51:52 +0000 (14:51 +0200)]
Updating minified JavaScript files
Alexander Ebert [Tue, 7 Oct 2014 12:47:20 +0000 (14:47 +0200)]
Fixed autosave
Sascha Greuel [Tue, 7 Oct 2014 12:46:53 +0000 (14:46 +0200)]
Added Safari Mobile Browser Detection
woltlab.com [Tue, 7 Oct 2014 10:21:52 +0000 (12:21 +0200)]
Updating minified JavaScript files
Alexander Ebert [Tue, 7 Oct 2014 10:20:22 +0000 (12:20 +0200)]
Some adjustments for Redactor 10.0.1
woltlab.com [Mon, 6 Oct 2014 18:11:52 +0000 (20:11 +0200)]
Updating minified JavaScript files
Alexander Ebert [Mon, 6 Oct 2014 18:10:50 +0000 (20:10 +0200)]
Upload plugin now works w/ Redactor 10
Marcel Werk [Mon, 6 Oct 2014 13:59:58 +0000 (15:59 +0200)]
Merge branch 'master' of github.com:WoltLab/WCF
Marcel Werk [Mon, 6 Oct 2014 13:59:46 +0000 (15:59 +0200)]
Fixed issues in paypal payment procession
Marcel Werk [Mon, 6 Oct 2014 13:59:08 +0000 (15:59 +0200)]
Fixed floating issue in empty DDs
woltlab.com [Mon, 6 Oct 2014 00:16:52 +0000 (02:16 +0200)]
Updating minified JavaScript files
Alexander Ebert [Mon, 6 Oct 2014 00:15:10 +0000 (02:15 +0200)]
Fixed some issues
woltlab.com [Sun, 5 Oct 2014 16:31:54 +0000 (18:31 +0200)]
Updating minified JavaScript files
Alexander Ebert [Sun, 5 Oct 2014 16:29:29 +0000 (18:29 +0200)]
Updated templates (WIP)
woltlab.com [Sun, 5 Oct 2014 14:26:53 +0000 (16:26 +0200)]
Updating minified JavaScript files
Alexander Ebert [Sun, 5 Oct 2014 14:23:11 +0000 (16:23 +0200)]
Fixed a few issues related to editor API access
Marcel Werk [Sun, 5 Oct 2014 14:00:13 +0000 (16:00 +0200)]
Merge branch '2.0'
Conflicts:
wcfsetup/install/files/js/WCF.ACL.min.js
Marcel Werk [Sun, 5 Oct 2014 13:57:40 +0000 (15:57 +0200)]
Fixed reset to default value
woltlab.com [Sun, 5 Oct 2014 09:41:53 +0000 (11:41 +0200)]
Updating minified JavaScript files
Matthias Schmidt [Sun, 5 Oct 2014 09:36:23 +0000 (11:36 +0200)]
Use unique IDs in WCF.ACL.List for grantAll and denyAll
woltlab.com [Sun, 5 Oct 2014 08:21:52 +0000 (10:21 +0200)]
Updating minified JavaScript files
woltlab.com [Sun, 5 Oct 2014 08:20:58 +0000 (10:20 +0200)]
Updating minified JavaScript files
Matthias Schmidt [Sun, 5 Oct 2014 08:20:13 +0000 (10:20 +0200)]
Merge branch '2.0'
Matthias Schmidt [Sun, 5 Oct 2014 08:17:22 +0000 (10:17 +0200)]
Remove for attributes of deny all/grant all labels
Fixes issue if two ACL lists are used on the same page.
Marcel Werk [Sat, 4 Oct 2014 19:49:03 +0000 (21:49 +0200)]
Added missing permission check / limit
woltlab.com [Sat, 4 Oct 2014 13:51:53 +0000 (15:51 +0200)]
Updating minified JavaScript files
Alexander Ebert [Sat, 4 Oct 2014 13:49:34 +0000 (15:49 +0200)]
Updated Redactor 9.2 -> 10.0
There are still some small glitches and I have not yet overhauled the API access from our own scripts (e.g. mentions). If something related to the editor is now broken, blame me.
Matthias Schmidt [Sat, 4 Oct 2014 10:36:47 +0000 (12:36 +0200)]
Add FileUtil::checkMemoryLimit()
Matthias Schmidt [Sat, 4 Oct 2014 09:54:46 +0000 (11:54 +0200)]
Add benchmark data to AJAXProxyAction response
Marcel Werk [Fri, 3 Oct 2014 20:28:57 +0000 (22:28 +0200)]
Merge branch 'master' of github.com:WoltLab/WCF
Marcel Werk [Fri, 3 Oct 2014 20:28:45 +0000 (22:28 +0200)]
Fixed minor issues in payment procession
Marcel Werk [Fri, 3 Oct 2014 20:28:21 +0000 (22:28 +0200)]
Added debug mode for paypal payments
Marcel Werk [Fri, 3 Oct 2014 20:27:28 +0000 (22:27 +0200)]
Fixed floating issue
woltlab.com [Fri, 3 Oct 2014 16:41:53 +0000 (18:41 +0200)]
Updating minified JavaScript files
Matthias Schmidt [Fri, 3 Oct 2014 16:36:35 +0000 (18:36 +0200)]
Fix closed confirmation being triggered by enter
Matthias Schmidt [Fri, 3 Oct 2014 09:35:57 +0000 (11:35 +0200)]
Add global hide button language item
Matthias Schmidt [Fri, 3 Oct 2014 09:32:02 +0000 (11:32 +0200)]
Move inline CSS code into LESS file
Marcel Werk [Thu, 2 Oct 2014 23:08:42 +0000 (01:08 +0200)]
Added support for terms of service confirmation
Marcel Werk [Thu, 2 Oct 2014 18:06:48 +0000 (20:06 +0200)]
Added fallback for empty log-file path
Marcel Werk [Wed, 1 Oct 2014 16:52:12 +0000 (18:52 +0200)]
Merge branch 'master' of github.com:WoltLab/WCF
Marcel Werk [Wed, 1 Oct 2014 16:52:02 +0000 (18:52 +0200)]
Image viewer mobile optimizations
Alexander Ebert [Wed, 1 Oct 2014 16:45:54 +0000 (18:45 +0200)]
Merge pull request #1821 from joshuaruesweg/patch-35
add getRoutes()-methode
Joshua Rüsweg [Wed, 1 Oct 2014 14:32:57 +0000 (16:32 +0200)]
add getRoutes()-methode
For a WCF2.1 plugin I need all the routes, which are registered. Since it's not possible to directly access the routes as a plugin, I would propose, for introducing a method.
Marcel Werk [Tue, 30 Sep 2014 21:13:28 +0000 (23:13 +0200)]
Added missing translations
Tim Düsterhus [Tue, 30 Sep 2014 01:00:51 +0000 (03:00 +0200)]
Fix AtomicWriter race condition on Windows
woltlab.com [Mon, 29 Sep 2014 14:16:51 +0000 (16:16 +0200)]
Updating minified JavaScript files
Marcel Werk [Mon, 29 Sep 2014 14:11:47 +0000 (16:11 +0200)]
Improved recent activity filter button
Marcel Werk [Sat, 27 Sep 2014 20:45:30 +0000 (22:45 +0200)]
Added censorship in 'about me' text
Marcel Werk [Sat, 27 Sep 2014 20:16:59 +0000 (22:16 +0200)]
Merge branch '2.0'
Conflicts:
wcfsetup/install/files/lib/system/message/QuickReplyManager.class.php
Marcel Werk [Fri, 26 Sep 2014 22:52:02 +0000 (00:52 +0200)]
Added missing error message in quick reply manager
Marcel Werk [Fri, 26 Sep 2014 22:29:20 +0000 (00:29 +0200)]
Fixed quick reply issues with empty messages
woltlab.com [Fri, 26 Sep 2014 16:41:52 +0000 (18:41 +0200)]
Updating minified JavaScript files
Marcel Werk [Fri, 26 Sep 2014 16:38:12 +0000 (18:38 +0200)]
Merge branch '2.0'
Conflicts:
wcfsetup/install/files/js/WCF.ImageViewer.min.js
woltlab.com [Fri, 26 Sep 2014 15:50:59 +0000 (17:50 +0200)]
Updating minified JavaScript files
Marcel Werk [Fri, 26 Sep 2014 15:44:51 +0000 (17:44 +0200)]
Small code optimization
Marcel Werk [Thu, 25 Sep 2014 20:42:34 +0000 (22:42 +0200)]
Merge branch 'master' of github.com:WoltLab/WCF
Marcel Werk [Thu, 25 Sep 2014 20:42:21 +0000 (22:42 +0200)]
Added detection for 'android browser'
woltlab.com [Thu, 25 Sep 2014 19:26:51 +0000 (21:26 +0200)]
Updating minified JavaScript files
Alexander Ebert [Thu, 25 Sep 2014 19:21:15 +0000 (21:21 +0200)]
Overhauled flexible menus and added support for message tab menu
Alexander Ebert [Tue, 23 Sep 2014 22:05:55 +0000 (00:05 +0200)]
Improved Redactor buttons UI if they wrap into multiple lines
Alexander Ebert [Tue, 23 Sep 2014 20:23:59 +0000 (22:23 +0200)]
Slightly decreased button width in Redactor's toolbar
Alexander Ebert [Tue, 23 Sep 2014 18:41:14 +0000 (20:41 +0200)]
Merge branch '2.0'
Alexander Ebert [Tue, 23 Sep 2014 18:39:54 +0000 (20:39 +0200)]
Added proper exclusion check during automatic update
Marcel Werk [Tue, 23 Sep 2014 17:15:07 +0000 (19:15 +0200)]
Added missing form redirect
Marcel Werk [Tue, 23 Sep 2014 16:51:47 +0000 (18:51 +0200)]
Fixed wrong CSS class
Alexander Ebert [Mon, 22 Sep 2014 16:08:36 +0000 (18:08 +0200)]
Restored PIP validation for WCF 2.1
Alexander Ebert [Mon, 22 Sep 2014 14:54:07 +0000 (16:54 +0200)]
Merge branch '2.0'
Conflicts:
wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl
wcfsetup/install/files/js/WCF.ImageViewer.min.js
wcfsetup/install/files/lib/system/package/validation/PackageValidationArchive.class.php
wcfsetup/install/files/lib/system/package/validation/PackageValidationException.class.php
wcfsetup/install/files/lib/system/package/validation/PackageValidationManager.class.php
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml
Alexander Ebert [Mon, 22 Sep 2014 14:46:02 +0000 (16:46 +0200)]
Merge branch 'master' of github.com:WoltLab/WCF
Marcel Werk [Mon, 22 Sep 2014 13:56:24 +0000 (15:56 +0200)]
Merge branch 'master' of github.com:WoltLab/WCF
Marcel Werk [Mon, 22 Sep 2014 13:56:12 +0000 (15:56 +0200)]
edit-history styling overhaul
Alexander Ebert [Mon, 22 Sep 2014 13:09:04 +0000 (15:09 +0200)]
Overhauled manual package installation (backport from WCF 2.1)
woltlab.com [Mon, 22 Sep 2014 12:06:51 +0000 (14:06 +0200)]
Updating minified JavaScript files
Marcel Werk [Mon, 22 Sep 2014 12:05:28 +0000 (14:05 +0200)]
Added lock icon for banned users
Marcel Werk [Sun, 21 Sep 2014 18:58:01 +0000 (20:58 +0200)]
Avoid multiple loading of same embedded objects
Closes #1795
Marcel Werk [Sun, 21 Sep 2014 18:38:06 +0000 (20:38 +0200)]
Improved encoding of emails
Closes #1566
Alexander Ebert [Sun, 21 Sep 2014 18:14:03 +0000 (20:14 +0200)]
Pseudo update instructions for testing only
Alexander Ebert [Sun, 21 Sep 2014 14:50:30 +0000 (16:50 +0200)]
Merge branch 'master' of github.com:WoltLab/WCF
Alexander Ebert [Sun, 21 Sep 2014 14:50:12 +0000 (16:50 +0200)]
Added support for 'DROP FOREIGN KEY'
Marcel Werk [Sat, 20 Sep 2014 20:16:56 +0000 (22:16 +0200)]
Fixed CSS syntax error
Closes #1516
woltlab.com [Sat, 20 Sep 2014 19:21:51 +0000 (21:21 +0200)]
Updating minified JavaScript files
woltlab.com [Sat, 20 Sep 2014 19:15:57 +0000 (21:15 +0200)]
Updating minified JavaScript files
Tim Düsterhus [Sat, 20 Sep 2014 19:15:29 +0000 (21:15 +0200)]
Merge branch '2.0'
Tim Düsterhus [Sat, 20 Sep 2014 19:14:27 +0000 (21:14 +0200)]
Merge pull request #1818 from max-m/patch-12
Fix calculation of maximum width in WCF.ImageViewer._checkImageSize()
Maximilian Mader [Sat, 20 Sep 2014 18:52:11 +0000 (20:52 +0200)]
Fix calculation of maximum width in WCF.ImageViewer._checkImageSize()
jQuery’s `.innerWidth()` returns the width of the element, including left and right padding, in pixels but the maximum width of an image should be the content width of its container.
Alexander Ebert [Sat, 20 Sep 2014 11:53:26 +0000 (13:53 +0200)]
Merge branch '2.0'
Alexander Ebert [Sat, 20 Sep 2014 11:53:06 +0000 (13:53 +0200)]
Fixed multistep updates updating the version number in the wrong order
Fixes #1778
projects / GitHub / WoltLab / WCF.git / log