summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | Fix the syntax and methods in the sampleJoas Schilling2016-04-251-3/+4
| * | | | | | | | Allow automatic dependency injection for OCP\Mail\MailerJoas Schilling2016-04-251-0/+4
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #24244 from owncloud/mount-uniqueVincent Petry2016-04-252-2/+22
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | add testRobin Appelman2016-04-251-0/+11
| * | | | | | | don't get the config for the same mount multiple timesRobin Appelman2016-04-251-2/+11
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #24052 from owncloud/fix-ldap-cache-race-conditionsThomas Müller2016-04-256-48/+32
|\ \ \ \ \ \ \
| * | | | | | | Fix LDAP race conditionsMorris Jobke2016-04-206-48/+32
* | | | | | | | Merge pull request #24248 from owncloud/d--j-masterThomas Müller2016-04-255-10/+34
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/d--j/core into d--j-masterThomas Müller2016-04-255-10/+34
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Call private cache methods only for `OC\Files\Cache\Cache`Daniel Jagszent2016-04-155-10/+34
* | | | | | | | | | Merge pull request #24247 from owncloud/weits-patch-1Thomas Müller2016-04-251-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Merge branch 'patch-1' of https://github.com/weits/core into weits-patch-1Thomas Müller2016-04-251-1/+1
|/| | | | | | | | |
| * | | | | | | | | solves problem with moving files via WebDAVPetr Svoboda2016-04-191-1/+1
* | | | | | | | | | Merge pull request #24205 from owncloud/scanner-lockingThomas Müller2016-04-251-0/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | add locks in the scanner to prevent multiple scanners running on the same filesRobin Appelman2016-04-251-0/+2
* | | | | | | | | | | Merge pull request #24240 from owncloud/issue-24233-add-missing-use-statementThomas Müller2016-04-251-0/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add missing use statementJoas Schilling2016-04-251-0/+1
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #24231 from owncloud/updater_psr4Thomas Müller2016-04-251-0/+0
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Move \OC\Updater to PSR-4Roeland Jago Douma2016-04-251-0/+0
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #24230 from owncloud/you-form-of-activitiesLukas Reschke2016-04-251-0/+35
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
| * | | | | | | | | | Translate the current user with "You ..."Joas Schilling2016-04-251-0/+35
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #24214 from owncloud/fix-ldap-connection-unbind-on-loginVincent Petry2016-04-252-11/+3
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | on clone Connection, do not take over the existing LDAP resourceArthur Schiwon2016-04-222-11/+3
* | | | | | | | | | Merge pull request #24073 from owncloud/move_federated_sharing_settings_to_appBjörn Schießle2016-04-2531-53/+263
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | move federated sharing settings to the federatedfilesharing appBjörn Schießle2016-04-2231-53/+263
* | | | | | | | | | Merge pull request #24226 from owncloud/files_psr4Thomas Müller2016-04-2565-0/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Move \OC\Files to PSR-4Roeland Jago Douma2016-04-2465-0/+0
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* / | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-04-2510-4/+10
|/ / / / / / / / /
* | | | | | | | | Merge pull request #24213 from owncloud/systemtag_psr4Lukas Reschke2016-04-244-0/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Move \OC\SystemTag to PSR-4Roeland Jago Douma2016-04-224-0/+0
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-04-2454-90/+268
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-04-2324-48/+136
|/ / / / / / / /
* | | | | | | | Merge pull request #24177 from owncloud/deprecate-update.phpThomas Müller2016-04-221-0/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | Deprecate appinfo/update.php - RepairSteps within info.xml are to be usedThomas Müller2016-04-221-0/+18
* | | | | | | | | Merge pull request #24210 from owncloud/because-some-people-do-not-thinkThomas Müller2016-04-221-0/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add link to security pageLukas Reschke2016-04-221-0/+2
* | | | | | | | | | Merge pull request #24209 from owncloud/encryption_psr4Thomas Müller2016-04-2216-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Move \OC\Encryption to PSR-4Roeland Jago Douma2016-04-2216-0/+0
|/ / / / / / / / /
* | | | | | | | | Merge pull request #24187 from owncloud/fs-initmountpoint-rethrowifusernotfou...Thomas Müller2016-04-222-2/+24
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Mark $usersSetup only if user was found in initMountPointsVincent Petry2016-04-222-2/+24
* | | | | | | | | Merge pull request #24200 from owncloud/appframework_psr4Thomas Müller2016-04-2228-27/+25
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix inconsistent nameing of AppFrameworkRoeland Jago Douma2016-04-2210-22/+20
| * | | | | | | | | Move \OC\AppFramework to PSR-4Roeland Jago Douma2016-04-2223-5/+5
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #24201 from owncloud/no-web-updater-for-ldap-and-shibbolethThomas Müller2016-04-221-4/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Disable web updater if ldap or shibboleth are installed - refs https://github...Thomas Müller2016-04-221-4/+8
|/ / / / / / / / /
* | | | | | | | | Merge pull request #24124 from owncloud/encryped-size-progationThomas Müller2016-04-224-15/+79
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | dont do optimized size propagation for encrypted filesRobin Appelman2016-04-212-1/+11
| * | | | | | | | Add unit tests for shared size propagation with encryptionRobin Appelman2016-04-212-14/+68
* | | | | | | | | Merge pull request #23918 from owncloud/cruds-for-federated-sharesBjörn Schießle2016-04-228-78/+136
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | always share with same default permissions, no special handling for remote sh...Björn Schießle2016-04-201-15/+11