Tim Düsterhus [Mon, 7 Jan 2013 21:02:32 +0000 (22:02 +0100)]
Merge branch 'master' into cli
Tim Düsterhus [Mon, 7 Jan 2013 21:01:36 +0000 (22:01 +0100)]
Merge branch 'master' of github.com:WoltLab/WCF
Tim Düsterhus [Mon, 7 Jan 2013 21:00:53 +0000 (22:00 +0100)]
Fix recalculating hash when cost changes
Matthias Schmidt [Mon, 7 Jan 2013 20:22:45 +0000 (21:22 +0100)]
Fixes UserMailForm
Alexander Ebert [Sun, 6 Jan 2013 20:49:06 +0000 (21:49 +0100)]
Fixed bad variable reference
Alexander Ebert [Sat, 5 Jan 2013 17:38:24 +0000 (09:38 -0800)]
Merge pull request #1081 from MeinAccount/jsToggle/fixDeleting
Fixed deleting of containers in WCF.Action.Delete
Tim Düsterhus [Sat, 5 Jan 2013 17:26:25 +0000 (18:26 +0100)]
Properly handle extending a class with the same name in Sniff
Fixes #1082
Matthias Schmidt [Sat, 5 Jan 2013 17:08:23 +0000 (18:08 +0100)]
Fixes coding style
Magnus Kühn [Sat, 5 Jan 2013 16:37:33 +0000 (17:37 +0100)]
Fixed deleting of containers in WCF.Action.Delete
Tim Düsterhus [Sat, 5 Jan 2013 16:05:11 +0000 (17:05 +0100)]
Validate declaration of methods
Tim Düsterhus [Sat, 5 Jan 2013 15:42:56 +0000 (16:42 +0100)]
Ensure that all classes are imported via use
Tim Düsterhus [Sat, 5 Jan 2013 15:05:07 +0000 (16:05 +0100)]
Force self:: for own static members
Tim Düsterhus [Sat, 5 Jan 2013 13:04:40 +0000 (14:04 +0100)]
Merge branch 'master' of github.com:WoltLab/WCF
Tim Düsterhus [Sat, 5 Jan 2013 13:04:15 +0000 (14:04 +0100)]
Disabling PCRESniff for now
Matthias Schmidt [Sat, 5 Jan 2013 12:55:14 +0000 (13:55 +0100)]
Fixes SetupTemplateEngine
Matthias Schmidt [Sat, 5 Jan 2013 12:27:41 +0000 (13:27 +0100)]
Further CodeSniffer adaptions
Matthias Schmidt [Sat, 5 Jan 2013 12:18:49 +0000 (13:18 +0100)]
Merge branch 'master' of github.com:WoltLab/WCF into travis
Matthias Schmidt [Sat, 5 Jan 2013 12:18:10 +0000 (13:18 +0100)]
Fixes code to match PHP CodeSniffer rules
Matthias Schmidt [Sat, 5 Jan 2013 12:01:22 +0000 (13:01 +0100)]
Fixes SetupTemplateEngine::getCompiledFilename()
Marcel Werk [Sat, 5 Jan 2013 00:04:56 +0000 (01:04 +0100)]
Fixed template engine
Alexander Ebert [Fri, 4 Jan 2013 21:54:11 +0000 (13:54 -0800)]
Merge pull request #1080 from Gravatronics/bug/permissionCalculation
Fixes permission calculation
Matthias Schmidt [Fri, 4 Jan 2013 18:52:36 +0000 (19:52 +0100)]
Fixes permission calculation
This fix is relevant for user group option types that can have a list of values (e.g. list of usable attachments). In the database, only the difference between the default value and the user group's value is stored. This difference is calculated by `IUserGroupOptionType::diff()`. When the permissions for a certain type of user groups are calculated, the difference for all relevant user groups have to be merged, which is done by `IUserGroupOptionType::merge()`.
The code of the previous merge function is the same as the code of the new diff function. This worked fine when calculating the difference to store the values. But if the merge of two option values was calculated during the permission calculation for a certain type of user groups, again, the difference was calculated, not the merge. This had the effect, that if, for instance, the default value for the usable attachment types was "gif, jpg" and the value for the administrator group was "foo, jpg", administrators were only allowed to use "foo" attachments (which is the diff of the two) instead of "foo", "gif" and "jpg".
Tim Düsterhus [Fri, 4 Jan 2013 16:31:02 +0000 (17:31 +0100)]
Merge branch 'master' of github.com:WoltLab/WCF
Tim Düsterhus [Fri, 4 Jan 2013 16:30:23 +0000 (17:30 +0100)]
Check whether imports are correctly ordered
Closes #987
Alexander Ebert [Fri, 4 Jan 2013 16:17:02 +0000 (17:17 +0100)]
Fixed template handling in multi-app environment
Fixes #1076
Marcel Werk [Fri, 4 Jan 2013 15:39:03 +0000 (16:39 +0100)]
Merge branch 'master' of github.com:WoltLab/WCF
Marcel Werk [Fri, 4 Jan 2013 15:38:48 +0000 (16:38 +0100)]
Fixed badges in main menu
Tim Düsterhus [Fri, 4 Jan 2013 15:35:46 +0000 (16:35 +0100)]
Add Sniff that discourages use of raw PCRE
Closes #1054
Tim Düsterhus [Fri, 4 Jan 2013 15:30:23 +0000 (16:30 +0100)]
UseDeclarationSniff checks for newlines between use-statements
cf. #987
Tim Düsterhus [Fri, 4 Jan 2013 15:03:24 +0000 (16:03 +0100)]
Validate declaration of use
Tim Düsterhus [Fri, 4 Jan 2013 14:22:14 +0000 (15:22 +0100)]
Merge branch 'master' of github.com:WoltLab/WCF
Tim Düsterhus [Fri, 4 Jan 2013 14:17:45 +0000 (15:17 +0100)]
Disallow print, is_null and create_function as well.
Matthias Schmidt [Fri, 4 Jan 2013 14:14:21 +0000 (15:14 +0100)]
Resolves todo in PagesFunctionTemplatePlugin
Matthias Schmidt [Fri, 4 Jan 2013 10:46:28 +0000 (11:46 +0100)]
Makes Category a ProcessibleDatabaseObject
Matthias Schmidt [Fri, 4 Jan 2013 10:34:46 +0000 (11:34 +0100)]
Enhances/Fixes categoryList.tpl
Closes #1064
Marcel Werk [Fri, 4 Jan 2013 02:37:11 +0000 (03:37 +0100)]
Merge branch 'master' of github.com:WoltLab/WCF
Marcel Werk [Fri, 4 Jan 2013 02:37:00 +0000 (03:37 +0100)]
Small category system improvements
Alexander Ebert [Thu, 3 Jan 2013 21:05:27 +0000 (22:05 +0100)]
Fixed style description management
Fixes #890
Alexander Ebert [Thu, 3 Jan 2013 20:45:34 +0000 (21:45 +0100)]
Fixed handling of style descriptions
Alexander Ebert [Thu, 3 Jan 2013 20:32:05 +0000 (21:32 +0100)]
Fixed typo
Alexander Ebert [Thu, 3 Jan 2013 20:22:28 +0000 (21:22 +0100)]
Added support for i18n style descriptions (ACP missing)
See #890
Tim Düsterhus [Thu, 3 Jan 2013 17:53:32 +0000 (18:53 +0100)]
Use secure comparing for the access token
Alexander Ebert [Thu, 3 Jan 2013 17:45:08 +0000 (18:45 +0100)]
Added menuItemController for *Menu-PIPs
Alexander Ebert [Thu, 3 Jan 2013 17:30:17 +0000 (18:30 +0100)]
Fixed hash creation
Alexander Ebert [Thu, 3 Jan 2013 17:17:28 +0000 (18:17 +0100)]
Added PasswordUtil::secureCompare()
secureCompare() is invulnerable to timing attacks as the comparison of two strings always takes the same time to finish (no early return).
Alexander Ebert [Thu, 3 Jan 2013 16:20:24 +0000 (17:20 +0100)]
Improved RegEx for bcrypt probing
Alexander Ebert [Thu, 3 Jan 2013 15:39:27 +0000 (16:39 +0100)]
Added missing support for MyBB 1.x
Alexander Ebert [Thu, 3 Jan 2013 15:10:27 +0000 (16:10 +0100)]
Using bcrypt for passwords and added PasswordUtil
Tim Düsterhus [Thu, 3 Jan 2013 13:08:00 +0000 (14:08 +0100)]
Add CONTRIBUTING.md
Tim Düsterhus [Thu, 3 Jan 2013 12:46:39 +0000 (13:46 +0100)]
Fix comment of FileUtil::downloadFileFromHttp()
Marcel Werk [Thu, 3 Jan 2013 00:34:32 +0000 (01:34 +0100)]
Merge branch 'master' of github.com:WoltLab/WCF
Marcel Werk [Thu, 3 Jan 2013 00:34:19 +0000 (01:34 +0100)]
Added CSS for nested category lists
Marcel Werk [Thu, 3 Jan 2013 00:34:06 +0000 (01:34 +0100)]
Minor style improvements
Marcel Werk [Wed, 2 Jan 2013 23:38:51 +0000 (00:38 +0100)]
Added missing pointer class
Marcel Werk [Wed, 2 Jan 2013 23:38:34 +0000 (00:38 +0100)]
Changed input type
Alexander Ebert [Wed, 2 Jan 2013 21:37:55 +0000 (13:37 -0800)]
Merge pull request #1071 from MeinAccount/jsToggle/AJAXContent
WCF.Action.Toggle on inserted content
Magnus Kühn [Wed, 2 Jan 2013 20:22:06 +0000 (21:22 +0100)]
Added support for a confirm message
Magnus Kühn [Wed, 2 Jan 2013 18:45:27 +0000 (19:45 +0100)]
Fixed WCF.Action.Toggle
Magnus Kühn [Wed, 2 Jan 2013 18:44:19 +0000 (19:44 +0100)]
Merge branch 'master' into jsToggle/AJAXContent
Magnus Kühn [Wed, 2 Jan 2013 18:32:06 +0000 (19:32 +0100)]
Fixed WCF.Action.Toggle and implemented changes
Alexander Ebert [Wed, 2 Jan 2013 18:09:53 +0000 (19:09 +0100)]
Hide style chooser unless two or more styles are given
Fixes #895
Alexander Ebert [Wed, 2 Jan 2013 18:04:43 +0000 (19:04 +0100)]
Ignoring optionals if already installed
Fixes #1065
Alexander Ebert [Wed, 2 Jan 2013 17:48:27 +0000 (18:48 +0100)]
Fixed landing page after package (un-)installation
Fixes #1070
Alexander Ebert [Wed, 2 Jan 2013 14:28:03 +0000 (15:28 +0100)]
Merge branch 'master' of github.com:WoltLab/WCF
Alexander Ebert [Wed, 2 Jan 2013 14:27:38 +0000 (15:27 +0100)]
Using latest version of com.woltlab.wcf.acp.style
Matthias Schmidt [Wed, 2 Jan 2013 13:34:11 +0000 (14:34 +0100)]
Removes unused method Package::getDependencies()
Magnus Kühn [Wed, 2 Jan 2013 13:31:58 +0000 (14:31 +0100)]
Changed WCF.Action.Toggle to work with inserted content
Matthias Schmidt [Wed, 2 Jan 2013 13:29:13 +0000 (14:29 +0100)]
Fixes Package::getDependentPackages()
Also optimizes Package:: getRequiredPackages()
Matthias Schmidt [Wed, 2 Jan 2013 10:09:59 +0000 (11:09 +0100)]
Removes divs to avoid margin problems
Alexander Ebert [Wed, 2 Jan 2013 01:48:11 +0000 (02:48 +0100)]
Removed unsupported parameter 'loadActiveOptions'
Fixes #1013
Alexander Ebert [Wed, 2 Jan 2013 01:44:07 +0000 (02:44 +0100)]
AbstractDatabaseObjectAction now returns action name
Closes #1026
Alexander Ebert [Wed, 2 Jan 2013 01:29:39 +0000 (02:29 +0100)]
Disallowed application uninstall if not within WCF ACP
Fixes #1067
Alexander Ebert [Wed, 2 Jan 2013 01:26:21 +0000 (02:26 +0100)]
Fixed menu item handling for landing page
Fixes #1066
Marcel Werk [Wed, 2 Jan 2013 01:18:59 +0000 (02:18 +0100)]
Removed obsolete reset buttons
Alexander Ebert [Wed, 2 Jan 2013 00:01:31 +0000 (01:01 +0100)]
Merged com.woltlab.wcf.acp.style
Alexander Ebert [Tue, 1 Jan 2013 23:48:03 +0000 (00:48 +0100)]
Merged com.woltlab.wcf.acp.language
Tim Düsterhus [Tue, 1 Jan 2013 23:02:29 +0000 (00:02 +0100)]
Revert "Merge remote branch 'acp.style/master'"
This reverts commit
845907323978d1e5a5d499c4ca1224c8e6529af7, reversing
changes made to
61d1f05a01c0bb5c54a366392c5213fcd5ad175e.
Tim Düsterhus [Tue, 1 Jan 2013 23:02:09 +0000 (00:02 +0100)]
Revert "Merge remote branch 'acp.language/master'"
This reverts commit
9265d52d1e4030c3928145017ddbc3e221549f98, reversing
changes made to
845907323978d1e5a5d499c4ca1224c8e6529af7.
Tim Düsterhus [Tue, 1 Jan 2013 22:55:05 +0000 (23:55 +0100)]
Merge remote branch 'acp.language/master'
Conflicts:
.gitignore
.travis.yml
acpMenu.xml
language/de.xml
package.xml
userGroupOption.xml
Tim Düsterhus [Tue, 1 Jan 2013 22:49:20 +0000 (23:49 +0100)]
Merge remote branch 'acp.style/master'
Conflicts:
.travis.yml
Alexander Ebert [Tue, 1 Jan 2013 21:05:50 +0000 (22:05 +0100)]
Renamed PackageListDetailed -> PackageList
Alexander Ebert [Tue, 1 Jan 2013 21:01:32 +0000 (22:01 +0100)]
Removed PackageListPage, will be replace with "old" list
Alexander Ebert [Tue, 1 Jan 2013 16:49:18 +0000 (17:49 +0100)]
Merge branch 'master' of github.com:WoltLab/WCF
Alexander Ebert [Tue, 1 Jan 2013 16:49:03 +0000 (17:49 +0100)]
Fixed landing page and handled infinite loops
Fixes #1063
Matthias Schmidt [Tue, 1 Jan 2013 16:18:37 +0000 (17:18 +0100)]
Fixes bug in ACPTemplatesFileHandler
Matthias Schmidt [Tue, 1 Jan 2013 16:16:32 +0000 (17:16 +0100)]
Fixes bug in StylePackageInstallationPlugin if default style is uninstalled
Matthias Schmidt [Tue, 1 Jan 2013 15:17:21 +0000 (16:17 +0100)]
Removes double code
Matthias Schmidt [Tue, 1 Jan 2013 15:14:27 +0000 (16:14 +0100)]
Fixes ACL JavaScript code
Matthias Schmidt [Tue, 1 Jan 2013 08:28:20 +0000 (09:28 +0100)]
Adds missing newline at file end
Matthias Schmidt [Tue, 1 Jan 2013 08:15:56 +0000 (09:15 +0100)]
Adds IPermissionObject
Matthias Schmidt [Mon, 31 Dec 2012 22:42:26 +0000 (23:42 +0100)]
Adds ICategoryType::getApplication() to fix links
Matthias Schmidt [Mon, 31 Dec 2012 22:12:54 +0000 (23:12 +0100)]
Fixes typo
Matthias Schmidt [Mon, 31 Dec 2012 22:12:02 +0000 (23:12 +0100)]
Fixes Package::isRequired()
Alexander Ebert [Mon, 31 Dec 2012 21:39:31 +0000 (22:39 +0100)]
Fixed TabMenu after login
Matthias Schmidt [Mon, 31 Dec 2012 21:18:36 +0000 (22:18 +0100)]
Removes obsolete checks
Matthias Schmidt [Mon, 31 Dec 2012 19:41:26 +0000 (20:41 +0100)]
Removes unused parameter
Matthias Schmidt [Mon, 31 Dec 2012 19:30:51 +0000 (20:30 +0100)]
Removes $usePackageDependencies from ACLHandler
Matthias Schmidt [Mon, 31 Dec 2012 18:51:28 +0000 (19:51 +0100)]
Merge branch 'master' of github.com:WoltLab/WCF
Matthias Schmidt [Mon, 31 Dec 2012 18:48:43 +0000 (19:48 +0100)]
Changes language items for ACL options/option categories
Like in any other language item, the object type is now used, not the package.
Matthias Schmidt [Mon, 31 Dec 2012 17:40:58 +0000 (18:40 +0100)]
Adds missing template variable