Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Move OC\Core and OC\Settings to composer autoloader | Lukas Reschke | 2016-04-05 | 2 | -1/+3 |
| | |||||
* | load mobile styles last, fix #19596 | Jan-Christoph Borchardt | 2016-04-05 | 1 | -6/+6 |
| | |||||
* | Merge pull request #23677 from owncloud/db-schema-migration-feedback | Thomas Müller | 2016-04-05 | 3 | -15/+52 |
|\ | | | | | Show individual sql schema migration steps during upgrade - on web as… | ||||
| * | Fix verbose output of upgrade command - not progressbar in this case and the ↵ | Thomas Müller | 2016-04-04 | 1 | -3/+18 |
| | | | | | | | | schema migration test has one progressbar now for all tables - before we had one progressbar for each table | ||||
| * | Show individual sql schema migration steps during upgrade - on web as well ↵ | Thomas Müller | 2016-04-04 | 3 | -12/+34 |
| | | | | | | | | as on the command line | ||||
* | | Fix PHP memory leak in file_get_contents() | Morris Jobke | 2016-04-04 | 2 | -2/+9 |
| | | | | | | | | | | | | | | | | | | * ref https://bugs.php.net/bug.php?id=61961 * ref https://github.com/owncloud/core/issues/20261#issuecomment-180000256 * code is based on the proposal of @chriseqipe * fixes #20261 | ||||
* | | Merge pull request #23557 from owncloud/sabre-plugin-browser-error-page | Thomas Müller | 2016-04-04 | 2 | -1/+12 |
|\ \ | |/ |/| | In case of exception we return an html page in case the client is a b… | ||||
| * | Add magical regex to catch browsers | Lukas Reschke | 2016-03-24 | 1 | -0/+8 |
| | | |||||
| * | In case of exception we return an html page in case the client is a browser | Thomas Müller | 2016-03-24 | 1 | -1/+4 |
| | | |||||
* | | Add better messages for sometimes obscure exceptions | Bernhard Posselt | 2016-04-04 | 1 | -2/+27 |
| | | | | | | | | | | | | * add better messages for sometimes obscure exceptions * fix formatting | ||||
* | | Merge pull request #23722 from ↵ | Thomas Müller | 2016-04-04 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | owncloud/also-hide-password-for-private-key-password-update Also replace password in updatePrivateKeyPassword | ||||
| * | | Also replace password in updatePrivateKeyPassword | Lukas Reschke | 2016-04-01 | 1 | -1/+1 |
| | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/23717 | ||||
* | | | Merge pull request #23728 from owncloud/sanitize-more-data-for-config-report | Joas Schilling | 2016-04-04 | 1 | -1/+13 |
|\ \ \ | | | | | | | | | Sanitize more data in config report | ||||
| * | | | Sanitize more data in config report | Lukas Reschke | 2016-04-01 | 1 | -1/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This sanitizes the following keys as well: - `proxyuserpwd` - `shared_secret` of `log.condition` - `license-key` - `password` of `redis` | ||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-04-02 | 12 | -0/+24 |
|/ / / | |||||
* / / | Initialise the printcss array | Joas Schilling | 2016-04-01 | 1 | -0/+1 |
|/ / | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-04-01 | 2 | -0/+2 |
| | | |||||
* | | Merge pull request #23713 from owncloud/small_encryption_fix | Thomas Müller | 2016-03-31 | 1 | -0/+1 |
|\ \ | | | | | | | make sure that we always remove the file again from the cache after t… | ||||
| * | | make sure that we always remove the file again from the cache after the ↵ | Bjoern Schiessle | 2016-03-31 | 1 | -0/+1 |
| | | | | | | | | | | | | version was created | ||||
* | | | Merge pull request #23676 from owncloud/handle-null-return-getAppInfo | Morris Jobke | 2016-03-31 | 3 | -1/+19 |
|\ \ \ | | | | | | | | | Properly handle return values of OC_App::getAppInfo() | ||||
| * | | | Properly handle return values of OC_App::getAppInfo() | Morris Jobke | 2016-03-30 | 3 | -1/+19 |
| | | | | | | | | | | | | | | | | * fixes #23668 | ||||
* | | | | Merge pull request #16857 from owncloud/printStylesheets | C. Montero Luque | 2016-03-31 | 1 | -9/+39 |
|\ \ \ \ | |_|/ / |/| | | | Support for print stylesheets | ||||
| * | | | support print stylesheets | Hendrik Leppelsack | 2016-01-13 | 1 | -9/+39 |
| | | | | |||||
* | | | | Merge pull request #23445 from owncloud/enc_small_improvement | Frank Karlitschek | 2016-03-31 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | small performance improvement: no need to calculate the header size | ||||
| * | | | | no need to calculate the header size, if the first block contain a header we ↵ | Bjoern Schiessle | 2016-03-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | already know the size | ||||
* | | | | | Merge pull request #23707 from owncloud/make-sure-that-encrypted-version-is-set | Frank Karlitschek | 2016-03-31 | 1 | -2/+7 |
|\ \ \ \ \ | | | | | | | | | | | | | Make sure that the encrypted version is set | ||||
| * | | | | | Make sure that the encrypted version is set | Lukas Reschke | 2016-03-31 | 1 | -2/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code path called when using external storage with WebDAV is using `\OC\Files\Storage\Wrapper\Encryption::getMetaData` which did not contain the actual encrypted version inside the cache entry version. This lead to the following: 1. User uploaded a file 2. File is created and `\OC\Files\Storage\Wrapper\Encryption::getMetaData` is called. It has an empty `encryptedVersion` but sets `encrypted` to either `true` or `false`. 3. The call when updating the file cache will use the old version. | ||||
* | | | | | | Merge pull request #23675 from ↵ | Frank Karlitschek | 2016-03-31 | 6 | -62/+159 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/fix_encryption_versions_on_external_storages fix creation of versions of encrypted files on external storages | ||||
| * | | | | | | fix creation of versions of encrypted files on external storages | Bjoern Schiessle | 2016-03-31 | 6 | -62/+159 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in order to create a 1:1 copy of a file if a version gets created we need to store this information on copyBetweenStorage(). This allows us to by-pass the encryption wrapper if we read the source file. | ||||
* | | | | | | Merge pull request #23526 from owncloud/fix_23337 | Frank Karlitschek | 2016-03-31 | 8 | -2/+77 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Add setId and setProviderId to IShare interface | ||||
| * | | | | | Move OCP\Share over to PSR-4 | Roeland Jago Douma | 2016-03-30 | 7 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | Touching the code so moving it over to PSR-4 | ||||
| * | | | | | Add setId and setProviderID to the public interface | Roeland Jago Douma | 2016-03-30 | 3 | -2/+77 |
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | Fixes #23337 We only allow the id to be set once! | ||||
* / | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-03-31 | 4 | -2/+34 |
|/ / / / | |||||
* | | | | Merge pull request #23628 from owncloud/avatar-remove | Thomas Müller | 2016-03-30 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | only remove avatars from the folder we store them in | ||||
| * | | | | only remove avatars from the folder we store them in | Robin Appelman | 2016-03-30 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #23654 from owncloud/issue-23653-xcache-detection-fails | Thomas Müller | 2016-03-30 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | xcache.var_size with 64M should evaluate to isAvailable | ||||
| * | | | | | xcache.var_size with 64M should evaluate to isAvailable | Joas Schilling | 2016-03-30 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Non moveable mount points should always be UPDATE+DELETE shareable | Roeland Jago Douma | 2016-03-30 | 1 | -1/+13 |
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #23536 The new sharing code is much stricter in checking permissions. However for non moveable mounts the permissions UPDATE+DELETE are not reported on the mount point. This is just a quick fix. * Updated unit tests | ||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-03-30 | 2 | -0/+2 |
| | | | | | |||||
* | | | | | Merge pull request #23543 from owncloud/issue-23503-activity-emails-always-short | Thomas Müller | 2016-03-29 | 2 | -2/+31 |
|\ \ \ \ \ | |/ / / / |/| | | | | Fix activity emails always using the short translation | ||||
| * | | | | Allow the activity app to set the current user when sending emails | Joas Schilling | 2016-03-24 | 2 | -1/+29 |
| | | | | | |||||
| * | | | | We are only formatting an object when it's not null | Joas Schilling | 2016-03-24 | 1 | -1/+2 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-03-29 | 2 | -0/+2 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-03-28 | 4 | -0/+50 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-03-27 | 10 | -12/+48 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-03-26 | 4 | -0/+10 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-03-25 | 8 | -2/+22 |
| | | | | | |||||
* | | | | | Merge pull request #23545 from owncloud/issue-17144-lock-mount-point-on-removal | Thomas Müller | 2016-03-24 | 1 | -0/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | Lock the mountpoint while removing | ||||
| * | | | | | Lock the mountpoint while removing | Joas Schilling | 2016-03-24 | 1 | -0/+4 |
| | | | | | | |||||
* | | | | | | Merge pull request #23154 from owncloud/avatar-save-failure | Thomas Müller | 2016-03-24 | 3 | -6/+24 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | dont die when we cant save the resized avatar, log instead |