Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | triger the propagator from the command line scanner | Robin Appelman | 2016-04-25 | 2 | -0/+40 |
* | Merge pull request #24052 from owncloud/fix-ldap-cache-race-conditions | Thomas Müller | 2016-04-25 | 6 | -48/+32 |
|\ | |||||
| * | Fix LDAP race conditions | Morris Jobke | 2016-04-20 | 6 | -48/+32 |
* | | Merge pull request #24248 from owncloud/d--j-master | Thomas Müller | 2016-04-25 | 5 | -10/+34 |
|\ \ | |||||
| * \ | Merge branch 'master' of https://github.com/d--j/core into d--j-master | Thomas Müller | 2016-04-25 | 5 | -10/+34 |
| |\ \ | |||||
| | * | | Call private cache methods only for `OC\Files\Cache\Cache` | Daniel Jagszent | 2016-04-15 | 5 | -10/+34 |
* | | | | Merge pull request #24247 from owncloud/weits-patch-1 | Thomas Müller | 2016-04-25 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Merge branch 'patch-1' of https://github.com/weits/core into weits-patch-1 | Thomas Müller | 2016-04-25 | 1 | -1/+1 |
|/| | | | |||||
| * | | | solves problem with moving files via WebDAV | Petr Svoboda | 2016-04-19 | 1 | -1/+1 |
* | | | | Merge pull request #24205 from owncloud/scanner-locking | Thomas Müller | 2016-04-25 | 1 | -0/+2 |
|\ \ \ \ | |||||
| * | | | | add locks in the scanner to prevent multiple scanners running on the same files | Robin Appelman | 2016-04-25 | 1 | -0/+2 |
* | | | | | Merge pull request #24240 from owncloud/issue-24233-add-missing-use-statement | Thomas Müller | 2016-04-25 | 1 | -0/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Add missing use statement | Joas Schilling | 2016-04-25 | 1 | -0/+1 |
* | | | | | | Merge pull request #24231 from owncloud/updater_psr4 | Thomas Müller | 2016-04-25 | 1 | -0/+0 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Move \OC\Updater to PSR-4 | Roeland Jago Douma | 2016-04-25 | 1 | -0/+0 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge pull request #24230 from owncloud/you-form-of-activities | Lukas Reschke | 2016-04-25 | 1 | -0/+35 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Translate the current user with "You ..." | Joas Schilling | 2016-04-25 | 1 | -0/+35 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge pull request #24214 from owncloud/fix-ldap-connection-unbind-on-login | Vincent Petry | 2016-04-25 | 2 | -11/+3 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | on clone Connection, do not take over the existing LDAP resource | Arthur Schiwon | 2016-04-22 | 2 | -11/+3 |
* | | | | | | Merge pull request #24073 from owncloud/move_federated_sharing_settings_to_app | Björn Schießle | 2016-04-25 | 31 | -53/+263 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | move federated sharing settings to the federatedfilesharing app | Björn Schießle | 2016-04-22 | 31 | -53/+263 |
* | | | | | | Merge pull request #24226 from owncloud/files_psr4 | Thomas Müller | 2016-04-25 | 65 | -0/+0 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Move \OC\Files to PSR-4 | Roeland Jago Douma | 2016-04-24 | 65 | -0/+0 |
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-04-25 | 10 | -4/+10 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #24213 from owncloud/systemtag_psr4 | Lukas Reschke | 2016-04-24 | 4 | -0/+0 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Move \OC\SystemTag to PSR-4 | Roeland Jago Douma | 2016-04-22 | 4 | -0/+0 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-04-24 | 54 | -90/+268 |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-04-23 | 24 | -48/+136 |
|/ / / / / | |||||
* | | | | | Merge pull request #24177 from owncloud/deprecate-update.php | Thomas Müller | 2016-04-22 | 1 | -0/+18 |
|\ \ \ \ \ | |||||
| * | | | | | Deprecate appinfo/update.php - RepairSteps within info.xml are to be used | Thomas Müller | 2016-04-22 | 1 | -0/+18 |
* | | | | | | Merge pull request #24210 from owncloud/because-some-people-do-not-think | Thomas Müller | 2016-04-22 | 1 | -0/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add link to security page | Lukas Reschke | 2016-04-22 | 1 | -0/+2 |
* | | | | | | | Merge pull request #24209 from owncloud/encryption_psr4 | Thomas Müller | 2016-04-22 | 16 | -0/+0 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Move \OC\Encryption to PSR-4 | Roeland Jago Douma | 2016-04-22 | 16 | -0/+0 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #24187 from owncloud/fs-initmountpoint-rethrowifusernotfou... | Thomas Müller | 2016-04-22 | 2 | -2/+24 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Mark $usersSetup only if user was found in initMountPoints | Vincent Petry | 2016-04-22 | 2 | -2/+24 |
* | | | | | | Merge pull request #24200 from owncloud/appframework_psr4 | Thomas Müller | 2016-04-22 | 28 | -27/+25 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix inconsistent nameing of AppFramework | Roeland Jago Douma | 2016-04-22 | 10 | -22/+20 |
| * | | | | | | Move \OC\AppFramework to PSR-4 | Roeland Jago Douma | 2016-04-22 | 23 | -5/+5 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge pull request #24201 from owncloud/no-web-updater-for-ldap-and-shibboleth | Thomas Müller | 2016-04-22 | 1 | -4/+8 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Disable web updater if ldap or shibboleth are installed - refs https://github... | Thomas Müller | 2016-04-22 | 1 | -4/+8 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #24124 from owncloud/encryped-size-progation | Thomas Müller | 2016-04-22 | 4 | -15/+79 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | dont do optimized size propagation for encrypted files | Robin Appelman | 2016-04-21 | 2 | -1/+11 |
| * | | | | | Add unit tests for shared size propagation with encryption | Robin Appelman | 2016-04-21 | 2 | -14/+68 |
* | | | | | | Merge pull request #23918 from owncloud/cruds-for-federated-shares | Björn Schießle | 2016-04-22 | 8 | -78/+136 |
|\ \ \ \ \ \ | |||||
| * | | | | | | always share with same default permissions, no special handling for remote sh... | Björn Schießle | 2016-04-20 | 1 | -15/+11 |
| * | | | | | | if share-permissions exists we use this information as indicator to check if ... | Björn Schießle | 2016-04-20 | 1 | -0/+3 |
| * | | | | | | ask for share-permissions on propfind | Björn Schießle | 2016-04-20 | 2 | -1/+18 |
| * | | | | | | return correct share permissions on propfind | Björn Schießle | 2016-04-18 | 3 | -40/+88 |
| * | | | | | | set correct permissions in shareinfo | Björn Schießle | 2016-04-18 | 1 | -3/+11 |