summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | Merge branch 'master' into autoenable-federation-appC. Montero Luque2016-03-041-1/+1
| |\ \ \ \ \ \
| * | | | | | | Automatically enable "federation" appLukas Reschke2016-03-041-11/+12
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'master' into fix-db-locking-cleanupC. Montero Luque2016-03-0410-17/+229
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge pull request #22860 from owncloud/trashbin-checkpathC. Montero Luque2016-03-041-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Properly check path validity before deleting to trashVincent Petry2016-03-041-1/+1
| * | | | | | Merge pull request #22857 from owncloud/add-release-channel-selectionThomas Müller2016-03-047-14/+219
| |\ \ \ \ \ \
| | * | | | | | Add release channel selection backLukas Reschke2016-03-047-14/+219
| | | |_|/ / / | | |/| | | |
| * | | | | | Merge pull request #22816 from owncloud/external-unavailable-recheckThomas Müller2016-03-042-2/+9
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Properly set exception in FailedStorageVincent Petry2016-03-032-1/+7
| | * | | | | allow availability recheck for external storagesRobin Appelman2016-03-031-1/+2
* | | | | | | Run cleanup of expired DB file locks to background jobMorris Jobke2016-03-044-1/+60
|/ / / / / /
* | | | | | Merge pull request #22830 from owncloud/fix_dav_permissionsThomas Müller2016-03-042-3/+3
|\ \ \ \ \ \
| * | | | | | Rename and move permissions are set when a file is updatableRoeland Jago Douma2016-03-032-3/+3
* | | | | | | Fix download spinner to work with CSS stylesVincent Petry2016-03-043-10/+42
| |_|/ / / / |/| | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-0440-28/+212
|/ / / / /
* / / / / Keep "encryptedVersion" when calling `\OC\Files\View::copy`Lukas Reschke2016-03-031-10/+12
|/ / / /
* | | | Merge pull request #22778 from owncloud/fix-22770Thomas Müller2016-03-031-3/+3
|\ \ \ \
| * | | | untangle different user manager instances, fixes #22770Arthur Schiwon2016-03-021-3/+3
| | |_|/ | |/| |
* | | | Merge pull request #22784 from owncloud/files-newmenu-removebrowsercompleteThomas Müller2016-03-031-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Remove browser autocomplete in new file menuVincent Petry2016-03-021-1/+1
| |/ /
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-038-2/+22
* | | Translate strings of federation admin sectionJoas Schilling2016-03-021-4/+4
|/ /
* | Increase all versions on master which is now 9.1Joas Schilling2016-03-0214-28/+28
* | [tx-robot] updated from transifexJenkins for ownCloud2016-03-0212-6/+152
* | 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