summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Expand)AuthorAgeFilesLines
* Delete OCS ID from DB if none is specifiedLukas Reschke2015-07-021-0/+2
* Merge pull request #17266 from owncloud/stable8.1-backport-17224Thomas Müller2015-07-011-15/+29
|\
| * Avoid namespace clashThomas Müller2015-07-011-5/+4
| * Adding exception handling for ServerNotAvailableException - refs #17192Thomas Müller2015-07-011-18/+33
* | Use UTF-8 mode for preg_split and preg_replaceLukas Reschke2015-07-011-2/+3
|/
* Merge pull request #17256 from owncloud/locking-disablecallbackwrapperwhendis...Vincent Petry2015-06-301-1/+4
|\
| * Do not set callback wrapper when locking is disabledVincent Petry2015-06-301-1/+4
* | Merge pull request #17225 from owncloud/fix_12106Björn Schießle2015-06-301-3/+19
|\ \
| * | if it is a mount point we need to get the path from the mount managerBjoern Schiessle2015-06-301-3/+19
* | | Merge pull request #17251 from owncloud/issue-17247-filesize-stat-failed-for-...Vincent Petry2015-06-301-2/+6
|\ \ \
| * | | Perform the filesize only when the file existsJoas Schilling2015-06-301-2/+6
| | |/ | |/|
* | | Merge pull request #17189 from owncloud/files-straypartfilesonexceptionMorris Jobke2015-06-302-32/+69
|\ \ \ | |/ / |/| |
| * | Unlock first path on rename if second path is lockedVincent Petry2015-06-291-1/+6
| * | Cleanup part file after upload exceptionVincent Petry2015-06-291-31/+63
* | | Merge pull request #17249 from owncloud/file-cache-is-a-icacheJoas Schilling2015-06-301-1/+4
|\ \ \
| * | | Fixing "ImportController::__construct() must implement interface OCP\\ICache,...Thomas Müller2015-06-291-1/+4
| |/ /
* / / Fix class name conflictVincent Petry2015-06-291-3/+2
|/ /
* | Merge pull request #17231 from owncloud/add-missing-version-fieldMorris Jobke2015-06-291-4/+4
|\ \
| * | Typehint $targetVersionLukas Reschke2015-06-291-4/+4
* | | Merge pull request #17229 from owncloud/maintenance-plugin-testJoas Schilling2015-06-291-3/+17
|\ \ \ | |/ / |/| |
| * | Fixing ctor calls and ctor itself to not break usage in calendar and contacts...Thomas Müller2015-06-291-1/+1
| * | Unit tests added for MaintenancePluginThomas Müller2015-06-291-3/+17
* | | Merge pull request #17222 from owncloud/issue-17101-send-oc-version-to-app-storeLukas Reschke2015-06-293-14/+27
|\ \ \ | |/ / |/| |
| * | Send OC version to appstore so it can reply with the right linksJoas Schilling2015-06-293-14/+27
| |/
* | Merge pull request #17030 from owncloud/lock-posthooksJoas Schilling2015-06-292-21/+21
|\ \
| * | Remove test-specific method to make Bjoern and Joas happyVincent Petry2015-06-261-9/+0
| * | Keep shared locks in post hooksVincent Petry2015-06-253-21/+30
* | | Merge pull request #17226 from owncloud/webdav-add-message-on-maintenanceMorris Jobke2015-06-291-11/+13
|\ \ \
| * | | In case of maintenance we should add a message to the exceptionThomas Müller2015-06-291-11/+13
* | | | Merge pull request #17050 from owncloud/request-status-from-ocsLukas Reschke2015-06-291-0/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Request approved state for disabled apps with ocsidLukas Reschke2015-06-191-0/+1
* | | | Use new updater URL + add unit testsLukas Reschke2015-06-281-13/+22
| |_|/ |/| |
* | | Fix indentationLukas Reschke2015-06-271-15/+15
* | | Add missing annotations for parametersLukas Reschke2015-06-274-26/+36
* | | Merge pull request #17163 from owncloud/update-licensesLukas Reschke2015-06-27103-84/+177
|\ \ \
| * | | update license headers and authorsMorris Jobke2015-06-25103-84/+177
| | |/ | |/|
* | | Merge pull request #17206 from oparoz/bpg-media-typeRoeland Douma2015-06-271-0/+1
|\ \ \
| * | | Adding BPG media typeOlivier Paroz2015-06-261-0/+1
* | | | Merge pull request #17071 from owncloud/share-get-users-non-existingVincent Petry2015-06-261-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | fix getUsersSharingFile with lockingRobin Appelman2015-06-261-2/+2
* | | | Merge pull request #17191 from owncloud/issue-17188-group-share-part-fileThomas Müller2015-06-261-2/+6
|\ \ \ \
| * | | | Correctly check if the real file exists, otherwise try the part fileJoas Schilling2015-06-261-2/+6
* | | | | Merge pull request #17008 from owncloud/fix-17006Björn Schießle2015-06-262-23/+69
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Use \OC\HintException and translate the hintJoas Schilling2015-06-223-34/+9
| * | | | Merge spliteUserRemote with fixRemoteUrlInShareWithJoas Schilling2015-06-222-25/+44
| * | | | make sure that we split username and server address at the first '@' from the...Bjoern Schiessle2015-06-223-1/+53
* | | | | Merge pull request #17009 from owncloud/lock-downloadfileThomas Müller2015-06-261-6/+21
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Enable x-sendfile only if we do not lock the file systemThomas Müller2015-06-221-4/+8
| * | | | Lock file before downloadVincent Petry2015-06-181-2/+13
* | | | | Merge pull request #17165 from owncloud/federated_cloud_sharing_search_addres...Thomas Müller2015-06-261-3/+12
|\ \ \ \ \ | |_|_|/ / |/| | | |