summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #22879 from owncloud/stable9-backport-use-clob-for-timezoneC. Montero Luque2016-03-042-3/+3
|\
| * [stable9] Use CLOB for timezoneLukas Reschke2016-03-042-3/+3
* | Merge pull request #22871 from owncloud/enable-federation-app-stable9C. Montero Luque2016-03-041-0/+1
|\ \
| * | Merge branch 'stable9' into enable-federation-app-stable9C. Montero Luque2016-03-041-1/+1
| |\|
| * | Automatically enabled federation appLukas Reschke2016-03-041-0/+1
* | | Merge pull request #22867 from owncloud/stable9-backport-22865C. Montero Luque2016-03-044-1/+60
|\ \ \
| * | | Run cleanup of expired DB file locks to background jobMorris Jobke2016-03-044-1/+60
| | |/ | |/|
* | | Merge pull request #22848 from owncloud/stable9-fileactions-downloadspinnerfixC. Montero Luque2016-03-043-10/+42
|\ \ \ | |/ / |/| |
| * | Fix download spinner to work with CSS stylesVincent Petry2016-03-043-10/+42
* | | Properly check path validity before deleting to trashVincent Petry2016-03-041-1/+1
| |/ |/|
* | Merge pull request #22858 from owncloud/stable9-release-channelThomas Müller2016-03-047-14/+219
|\ \
| * | Add release channel selection backLukas Reschke2016-03-047-14/+219
| |/
* | Properly set exception in FailedStorageVincent Petry2016-03-032-1/+7
* | allow availability recheck for external storagesRobin Appelman2016-03-031-1/+2
|/
* Keep "encryptedVersion" when calling `\OC\Files\View::copy`Lukas Reschke2016-03-031-10/+12
* Merge pull request #22757 from owncloud/apply-licenseC. Montero Luque2016-03-01169-96/+436
|\
| * Add new appsLukas Reschke2016-03-018-4/+28
| * Remove Scrutinizer Auto FixerLukas Reschke2016-03-0143-43/+0
| * Map MaciLukas Reschke2016-03-0111-0/+11
| * Update author informationLukas Reschke2016-03-01130-50/+398
* | Merge branch 'master' into part-file-rootC. Montero Luque2016-03-014-2/+16
|\ \
| * \ Merge pull request #22742 from owncloud/ceph-keystone-readinessC. Montero Luque2016-03-014-2/+16
| |\ \ | | |/ | |/|
| | * Use readiness notification socket to be absolutely sure this worksRobin McCorkell2016-02-294-2/+16
* | | allow putting the part file in the view rootRobin Appelman2016-03-012-4/+69
|/ /
* | Merge pull request #22699 from owncloud/checksum_int_testThomas Müller2016-03-012-2/+20
|\ \
| * | Save some calls to refreshInfo during uploadVincent Petry2016-03-011-4/+5
| * | Fix unit testsRoeland Jago Douma2016-03-011-5/+7
| * | Checksums on chunked filesRoeland Jago Douma2016-03-011-0/+8
| * | Remove checksum on upload of non checksumed fileRoeland Jago Douma2016-03-012-1/+8
* | | Merge pull request #22686 from owncloud/cleanup_remote_address_booksThomas Müller2016-03-0118-39/+155
|\ \ \ | |/ / |/| |
| * | increase version numberBjoern Schiessle2016-03-011-1/+1
| * | Handle null caseThomas Müller2016-03-011-2/+5
| * | fix doc-blockBjoern Schiessle2016-02-291-0/+1
| * | remove synced remote address book if the remote server revoked access to his ...Bjoern Schiessle2016-02-297-7/+39
| * | remove remote address book if the admin removes the server from the trusted s...Bjoern Schiessle2016-02-299-18/+97
| * | reuse the url_hash instead of calculating a new hash for the address bookBjoern Schiessle2016-02-265-13/+14
* | | Merge pull request #22681 from owncloud/add-autodiscovery-for-ocsThomas Müller2016-03-0112-24/+435
|\ \ \
| * | | Fix Scrutinizer issuesLukas Reschke2016-02-292-0/+3
| * | | Add autodiscovery support to server-to-server sharingLukas Reschke2016-02-2612-24/+433
* | | | Merge pull request #22728 from owncloud/external-share-testremoteThomas Müller2016-03-014-28/+65
|\ \ \ \
| * | | | Only use scanner if remote is an ownCloudLukas Reschke2016-03-011-1/+17
| * | | | /shareinfo is not requiredLukas Reschke2016-03-012-0/+8
| * | | | Fix testsLukas Reschke2016-03-011-20/+14
| * | | | Add missing trailing slashLukas Reschke2016-03-012-3/+3
| * | | | use ocs discover endpoint to test remoteRobin Appelman2016-03-012-8/+27
| | |_|/ | |/| |
* | | | Merge pull request #22700 from owncloud/only_1_linkshareThomas Müller2016-03-011-0/+9
|\ \ \ \
| * | | | For now only allow 1 link share per file/folderRoeland Jago Douma2016-03-011-0/+9
* | | | | Merge pull request #22731 from owncloud/hide-nodes-from-listeningThomas Müller2016-03-013-3/+76
|\ \ \ \ \
| * | | | | Hides nodes from listing that the user has no access toLukas Reschke2016-02-293-3/+76
| | |/ / / | |/| | |
* | | | | Merge pull request #22613 from owncloud/quota-changedavreturnvaluewhennoquotasetThomas Müller2016-03-013-4/+46
|\ \ \ \ \ | |_|/ / / |/| | | |