Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Check `mbstring.func_overload` only if the mb module is installed. | Lukas Reschke | 2015-05-04 | 1 | -2/+17 |
| | | | | Fixes https://github.com/owncloud/core/issues/14670 | ||||
* | Remove PHP 5.4 warning in checkSetup | Lukas Reschke | 2015-05-04 | 1 | -9/+0 |
| | | | | This is catched in index.php as older PHP versions will never execute the code path until there due to 5.4 syntax changes. | ||||
* | Merge pull request #16042 from owncloud/fix-output-buffering | Thomas Müller | 2015-05-04 | 1 | -1/+0 |
|\ | | | | | Remove hard-dependency on disabled output_buffering | ||||
| * | Remove hard-dependency on disabled output_buffering | Lukas Reschke | 2015-05-04 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | This removes the hard-dependency on output buffering as requested at https://github.com/owncloud/core/issues/16013 since a lot of distributions such as Debian and Ubuntu decided to use `4096` instead of the PHP recommended and documented default value of `off`. However, we still should encourage disabling this setting for improved performance and reliability thus the setting switches in `.user.ini` and `.htaccess` are remaining there. It is very likely that we in other cases also should disable the output buffering but aren't doing it everywhere and thus causing memory problems. Fixes https://github.com/owncloud/core/issues/16013 | ||||
* | | Merge pull request #16043 from owncloud/activity-288-log-entry-when-no-favorite | Lukas Reschke | 2015-05-04 | 1 | -0/+1 |
|\ \ | | | | | | | Fix undefined variable $tagId | ||||
| * | | Fix undefined variable $tagId | Joas Schilling | 2015-05-04 | 1 | -0/+1 |
| |/ | |||||
* | | Merge pull request #15772 from ↵ | Joas Schilling | 2015-05-04 | 1 | -7/+9 |
|\ \ | |/ |/| | | | | | owncloud/issue-15771-dont-restrict-permissions-for-share-owner Do not restrict permissions for the original owner | ||||
| * | Ignore "parent" shares when the sharee is the owner of the reshare-source | Joas Schilling | 2015-04-29 | 1 | -0/+2 |
| | | |||||
| * | Correctly select file cache values also when checking group shares | Joas Schilling | 2015-04-29 | 1 | -7/+7 |
| | | |||||
* | | Merge pull request #16020 from owncloud/set-charset-via-ini-set | Thomas Müller | 2015-05-04 | 1 | -0/+7 |
|\ \ | | | | | | | Try to set required ini values in base.php | ||||
| * | | Try to set required ini values in base.php | Lukas Reschke | 2015-05-03 | 1 | -0/+7 |
| | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/16006 | ||||
* | | | Merge pull request #15958 from owncloud/usage-of-public-log-interface | Thomas Müller | 2015-05-04 | 7 | -16/+23 |
|\ \ \ | |/ / |/| | | Use internally \OCP\ILogger instead of \OC\Log | ||||
| * | | Use internally \OCP\ILogger instead of \OC\Log | Morris Jobke | 2015-04-30 | 7 | -16/+23 |
| | | | | | | | | | | | | | | | | | | * this is the preparation for some upcoming logger related changes * also fixes an issue in the public interface where we request an internal class as parameter | ||||
* | | | Add proper versioning for doc URL | Lukas Reschke | 2015-05-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | As per 8.1 we have docs for minor versions as well so we need to link to `8.1` here instead to `8.0`. Fixes https://github.com/owncloud/core/issues/16002 | ||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-02 | 2 | -4/+4 |
| | | | |||||
* | | | Merge pull request #15937 from owncloud/file-locking | Thomas Müller | 2015-05-01 | 10 | -23/+588 |
|\ \ \ | | | | | | | | | Add memcache based shared/exclusive locking | ||||
| * | | | allow getting the path from the lockedexception | Robin Appelman | 2015-04-30 | 2 | -2/+23 |
| | | | | |||||
| * | | | use trait for cas polyfill for xcache | Robin Appelman | 2015-04-30 | 1 | -24/+2 |
| | | | | |||||
| * | | | add memcache based shared/exclusive locking | Robin Appelman | 2015-04-30 | 3 | -0/+158 |
| | | | | |||||
| * | | | add compare and swap to memcache | Robin Appelman | 2015-04-30 | 7 | -2/+132 |
| | | | | |||||
| * | | | extends memcache with add, inc and dec | Robin Appelman | 2015-04-30 | 6 | -22/+300 |
| | | | | |||||
* | | | | Merge pull request #15964 from owncloud/fix-l10n-string-warn | Thomas Müller | 2015-04-30 | 1 | -2/+0 |
|\ \ \ \ | | | | | | | | | | | Fix #15962 | ||||
| * | | | | fix #15962 | Bernhard Posselt | 2015-04-30 | 1 | -2/+0 |
| |/ / / | |||||
* / / / | use the preSetup hook to ensure the encryption wrapper is applied correctly | Robin Appelman | 2015-04-30 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #15949 from owncloud/l10n-string-json | Thomas Müller | 2015-04-30 | 1 | -1/+9 |
|\ \ \ | | | | | | | | | Implement json serialize for l10n string | ||||
| * | | | implement json serialize for l10n string | Bernhard Posselt | 2015-04-29 | 1 | -1/+9 |
| | | | | |||||
* | | | | Merge pull request #15946 from owncloud/auto-controller-resolve | Thomas Müller | 2015-04-30 | 1 | -0/+11 |
|\ \ \ \ | |_|/ / |/| | | | Make controller automatically assemblable | ||||
| * | | | add aliases to pascal case constructor paramters to make it possible to auto ↵ | Bernhard Posselt | 2015-04-29 | 1 | -0/+11 |
| |/ / | | | | | | | | | | assemble controllers | ||||
* / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-04-30 | 6 | -16/+18 |
|/ / | |||||
* | | Merge pull request #15596 from owncloud/issue/15589 | Morris Jobke | 2015-04-29 | 1 | -6/+9 |
|\ \ | | | | | | | Correctly generate the feedback URL for remote share | ||||
| * | | Fix scrutinizer complains and return type doc | Joas Schilling | 2015-04-28 | 1 | -4/+6 |
| | | | |||||
| * | | Correctly remove the protocol before prepeding it | Joas Schilling | 2015-04-28 | 1 | -0/+1 |
| | | | |||||
| * | | Correctly generate the feedback URL for remote share | Joas Schilling | 2015-04-28 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | The trailing slash was added in c78e3c4a7fa1d2f474ab58551e67a50e093f6ed8 to correctly generate the encryption keys | ||||
* | | | Merge pull request #15906 from rullzer/fix_15777 | Morris Jobke | 2015-04-29 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | Password set via OCS API should not be double escaped | ||||
| * | | Password set via OCS API should not be double escaped | Roeland Jago Douma | 2015-04-28 | 1 | -1/+1 |
| | | | |||||
* | | | Filter potential dangerous filenames for avatars | Lukas Reschke | 2015-04-28 | 2 | -4/+11 |
| |/ |/| | | | | | We don't want to have users misusing this API resulting in a potential file disclosure of "avatar.(jpg|png)" files. | ||||
* | | Merge pull request #14764 from owncloud/shared-etag-propagate | Morris Jobke | 2015-04-28 | 5 | -1/+37 |
|\ \ | | | | | | | Propagate etags across shared storages | ||||
| * | | triger propagation for webdav uploads | Robin Appelman | 2015-04-27 | 1 | -0/+1 |
| | | | | | | | | | | | | use post hooks for share etag propagator | ||||
| * | | fix propagation when renaming a directly reshared folder | Robin Appelman | 2015-04-27 | 1 | -0/+4 |
| | | | |||||
| * | | propagate etags for all user of a share | Robin Appelman | 2015-04-27 | 1 | -0/+12 |
| | | | |||||
| * | | Allow getting *all* share entries owned by a user | Robin Appelman | 2015-04-27 | 1 | -0/+12 |
| | | | |||||
| * | | Make the change propagator an emitter | Robin Appelman | 2015-04-27 | 2 | -1/+8 |
| | | | |||||
* | | | Merge pull request #15901 from owncloud/fix-share-docs | Morris Jobke | 2015-04-28 | 2 | -10/+24 |
|\ \ \ | |_|/ |/| | | fix several issues with doc blocks on share.php | ||||
| * | | fix several issues with doc blocks on share.php | Joas Schilling | 2015-04-28 | 2 | -10/+24 |
| | | | |||||
* | | | Fix return type of the getRootFolder() method | Joas Schilling | 2015-04-28 | 2 | -2/+2 |
|/ / | |||||
* | | Merge pull request #15890 from owncloud/fix-helper-docs | Thomas Müller | 2015-04-27 | 1 | -4/+5 |
|\ \ | | | | | | | Fix several type(hint) errors in private/helper.php | ||||
| * | | Fix several type(hint) errors in private/helper.php | Joas Schilling | 2015-04-27 | 1 | -4/+5 |
| | | | |||||
* | | | Merge pull request #15886 from owncloud/fix-15848-master | Thomas Müller | 2015-04-27 | 1 | -1/+4 |
|\ \ \ | | | | | | | | | Adjust isLocal() on encryption wrapper | ||||
| * | | | fixes #15848 | Thomas Müller | 2015-04-27 | 1 | -1/+4 |
| |/ / | |||||
* | | | Merge pull request #15860 from owncloud/enc_fallback_old_encryption | Thomas Müller | 2015-04-27 | 3 | -15/+38 |
|\ \ \ | |/ / |/| | | [encryption] handle encrypted files correctly which where encrypted with a old version of ownCloud (<=oc6) |