summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2016-03-0464-36/+336
* Merge pull request #22796 from owncloud/fix-encryption-on-version-restoreThomas Müller2016-03-033-25/+61
|\
| * Keep "encryptedVersion" when calling `\OC\Files\View::copy`Lukas Reschke2016-03-033-25/+61
* | Merge pull request #22813 from owncloud/exclude-assets-folderLukas Reschke2016-03-031-2/+3
|\ \ | |/ |/|
| * Exclude the assets folder from integrity checkLukas Reschke2016-03-031-2/+3
|/
* 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
| |/
* | Merge pull request #22799 from owncloud/phil-davis-patch-1Thomas Müller2016-03-031-1/+1
|\ \
| * | Minor grammar in config.sample.phpPhil Davis2016-03-031-1/+1
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-0320-10/+52
|/ /
* | Merge pull request #22775 from owncloud/issue-22767-federation-fix-missing-tr...Thomas Müller2016-03-021-4/+4
|\ \
| * | Translate strings of federation admin sectionJoas Schilling2016-03-021-4/+4
| |/
* | Merge pull request #22776 from RealRancor/versions_config_sampleThomas Müller2016-03-021-0/+6
|\ \
| * | Add Versions app header to config.sample.phpRealRancor2016-03-021-0/+6
| |/
* / [tx-robot] updated from transifexJenkins for ownCloud2016-03-0212-0/+26
|/
* Merge pull request #22769 from owncloud/increase-version-for-9.1Thomas Müller2016-03-0215-31/+31
|\
| * Increase all versions on master which is now 9.1Joas Schilling2016-03-0215-31/+31
|/
* [tx-robot] updated from transifexJenkins for ownCloud2016-03-02130-124/+272
* Merge pull request #22757 from owncloud/apply-licenseC. Montero Luque2016-03-01316-201/+625
|\
| * Add new appsLukas Reschke2016-03-019-4/+33
| * Remove Scrutinizer Auto FixerLukas Reschke2016-03-0193-93/+3
| * Map MaciLukas Reschke2016-03-0115-3/+14
| * Update author informationLukas Reschke2016-03-01273-123/+597
* | Merge pull request #22756 from owncloud/exclude-custom-data-dirC. Montero Luque2016-03-011-2/+8
|\ \
| * \ Merge branch 'master' into exclude-custom-data-dirC. Montero Luque2016-03-0130-333/+510
| |\ \
| * | | Exclude custom data directory from integrity checkerLukas Reschke2016-03-011-2/+8
* | | | Merge pull request #22684 from owncloud/part-file-rootC. Montero Luque2016-03-013-4/+77
|\ \ \ \ | |_|/ / |/| | |
| * | | Merge branch 'master' into part-file-rootC. Montero Luque2016-03-017-292/+30
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #22742 from owncloud/ceph-keystone-readinessC. Montero Luque2016-03-017-292/+30
|\ \ \ \ | |_|_|/ |/| | |
| * | | local entrypoint.sh isn't needed - all fixes are upstreamMorris Jobke2016-03-012-276/+1
| * | | Use sockets for startup notification in primary storage testsMorris Jobke2016-03-012-14/+13
| * | | Use readiness notification socket to be absolutely sure this worksRobin McCorkell2016-02-294-2/+16
| | * | add config sampleRobin Appelman2016-03-011-0/+8
| | * | 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-015-2/+325
|\ \ \
| * | | 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
| * | | Checksum intergration testRoeland Jago Douma2016-03-013-0/+305
| | |/ | |/|
* | | 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-0115-36/+458
|\ \ \
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-17 16:55:59 +0000