summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Adding exception handling for ServerNotAvailableException - refs #17192Thomas Müller2015-06-301-18/+33
* 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
* | | | Merge pull request #17217 from owncloud/use-new-updater-urlThomas Müller2015-06-291-13/+22
|\ \ \ \ | |_|_|/ |/| | |
| * | | Use new updater URL + add unit testsLukas Reschke2015-06-281-13/+22
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-2912-4/+22
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-2812-0/+26
* | | 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-27145-97/+242
|\ \ \
| * | | update license headers and authorsMorris Jobke2015-06-25145-97/+242
* | | | Merge pull request #17206 from oparoz/bpg-media-typeRoeland Douma2015-06-271-0/+1
|\ \ \ \
| * | | | Adding BPG media typeOlivier Paroz2015-06-261-0/+1
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-272-0/+12
* | | | | 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-263-23/+70
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Use \OC\HintException and translate the hintJoas Schilling2015-06-224-34/+10
| * | | | | 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
|\ \ \ \ \ \
| * | | | | | ne need to check twice if $row['share_with'] is setBjoern Schiessle2015-06-251-1/+1
| * | | | | | show nice display name for remote shares if possibleBjoern Schiessle2015-06-251-2/+11
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-262-0/+2
| |_|_|/ / / |/| | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-252-0/+2
| |_|_|_|/ |/| | | |