summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Update author informationLukas Reschke2016-03-01273-123/+597
* 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
|\ \
| * | Fix Scrutinizer issuesLukas Reschke2016-02-292-0/+3
| * | Add autodiscovery support to server-to-server sharingLukas Reschke2016-02-2615-36/+456
* | | 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 #17451 from owncloud/apps-disablebrokenappafterenableThomas Müller2016-03-012-28/+78
|\ \ \ \
| * | | | Disable app that bricks the server after enablingVincent Petry2016-02-292-28/+78
* | | | | Merge pull request #22700 from owncloud/only_1_linkshareThomas Müller2016-03-013-0/+41
|\ \ \ \ \
| * | | | | Intergration testsRoeland Jago Douma2016-03-012-0/+32
| * | | | | 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-018-3/+499
|\ \ \ \ \ \
| * | | | | | Hides nodes from listing that the user has no access toLukas Reschke2016-02-298-3/+499
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #22613 from owncloud/quota-changedavreturnvaluewhennoquotasetThomas Müller2016-03-019-22/+157
|\ \ \ \ \ \
| * | | | | | Return -3 for unlimited quotaVincent Petry2016-02-299-22/+157
* | | | | | | Merge pull request #22667 from owncloud/scrollbarThomas Müller2016-03-011-1/+2
|\ \ \ \ \ \ \
| * | | | | | | make scrollbar less obnoxious: tad narrower, rounded cornersJan-Christoph Borchardt2016-02-261-1/+2
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #22677 from owncloud/allow-to-overwrite-single-l10n-string...Thomas Müller2016-03-013-8/+39
|\ \ \ \ \ \ \
| * | | | | | | Improved JS L10N bundle merging + testsVincent Petry2016-02-292-3/+9
| * | | | | | | Allow to overwrite a single language string via the theme folderJoas Schilling2016-02-262-8/+33
* | | | | | | | Merge pull request #22691 from owncloud/distributions-are-gone-insane-nobody-...Thomas Müller2016-03-011-0/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Fix wordingLukas Reschke2016-02-291-1/+1
| * | | | | | | Add question from where ownCloud was enabledLukas Reschke2016-02-271-0/+2
* | | | | | | | Merge pull request #22722 from owncloud/fix-personal-pageThomas Müller2016-03-012-2/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | fix personal page layout for LDAP users, fix #22272Jan-Christoph Borchardt2016-02-292-2/+4
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge pull request #22725 from owncloud/app-bannersThomas Müller2016-03-013-163/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | compress app banners on personal pageJan-Christoph Borchardt2016-02-293-163/+3
* | | | | | | | | Merge pull request #22727 from owncloud/decrypt_all_master_keyThomas Müller2016-03-013-27/+46
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | make decrypt all work with the master keyBjoern Schiessle2016-02-293-27/+46
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #22733 from owncloud/size-propagation-new-fileThomas Müller2016-03-011-1/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fix size propagation for new filesRobin Appelman2016-02-291-1/+5
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge pull request #22736 from owncloud/propagation-ignore-encryptionThomas Müller2016-03-012-0/+68
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | ignore encryption keys for propagationRobin Appelman2016-02-292-0/+68
| |/ / / / / / / /
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-26 00:37:15 +0000