summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Return -3 for unlimited quotaVincent Petry2016-02-293-4/+46
* | | | | 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 #22740 from owncloud/fix_resare_updatesThomas Müller2016-03-012-0/+20
|\ \ \ \ \
| * | | | | Check correct permissions when resharingRoeland Jago Douma2016-02-292-0/+20
| |/ / / /
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-0110-2/+74
* | | | | Merge pull request #22707 from owncloud/use-our-public-apiThomas Müller2016-03-014-36/+37
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Use IQueryBuilder::PARAM_* instead of \PDO::PARAM_*Joas Schilling2016-02-294-36/+37
* | | | | Merge pull request #22623 from owncloud/docker-logs-on-swift-externalThomas Müller2016-02-291-0/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Print docker logs to the console fro debuggingThomas Müller2016-02-241-0/+2
* | | | | Merge pull request #22662 from owncloud/comments-countThomas Müller2016-02-292-5/+3
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | remove comments count because it is not that relevant to show directlyJan-Christoph Borchardt2016-02-252-5/+3
| | |/ / | |/| |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-02-298-0/+12
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-02-2832-18/+224
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-02-2714-0/+38
| |_|/ |/| |
* | | Merge pull request #22671 from owncloud/issue-22670Thomas Müller2016-02-262-26/+26
|\ \ \
| * | | Move the tag filter at the end for nowJoas Schilling2016-02-262-26/+26
* | | | Merge pull request #22640 from owncloud/fix_22587Thomas Müller2016-02-262-0/+129
|\ \ \ \
| * | | | Remove delete permissions for read-only federated resharesRoeland Jago Douma2016-02-252-0/+129
* | | | | Merge pull request #22608 from owncloud/collaborative-tagsThomas Müller2016-02-262-3/+4
|\ \ \ \ \
| * | | | | Rename system tags app to collaborative tagsJoas Schilling2016-02-262-3/+4
| | |/ / / | |/| | |
* | | | | Merge pull request #22461 from owncloud/fix_6773Thomas Müller2016-02-2613-63/+150
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix favorite icon unit test for icon imageVincent Petry2016-02-251-2/+4
| * | | | Make more action icons themable + style fixesVincent Petry2016-02-255-22/+24