Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #22699 from owncloud/checksum_int_test | Thomas Müller | 2016-03-01 | 2 | -2/+20 |
|\ | | | | | Checksum intergration tests and fixes | ||||
| * | Save some calls to refreshInfo during upload | Vincent Petry | 2016-03-01 | 1 | -4/+5 |
| | | |||||
| * | Fix unit tests | Roeland Jago Douma | 2016-03-01 | 1 | -5/+7 |
| | | |||||
| * | Checksums on chunked files | Roeland Jago Douma | 2016-03-01 | 1 | -0/+8 |
| | | | | | | | | | | We should also store checksums on chunked files. We do not checksum individual chunks but only the final file. | ||||
| * | Remove checksum on upload of non checksumed file | Roeland Jago Douma | 2016-03-01 | 2 | -1/+8 |
| | | | | | | | | | | | | | | When we overwrite a checksumed file with a file without a checksum we should remove the checksum from the server. This is done by setting the column to empty. | ||||
* | | Merge pull request #22686 from owncloud/cleanup_remote_address_books | Thomas Müller | 2016-03-01 | 18 | -39/+155 |
|\ \ | |/ |/| | remove remote address book if access was revoked | ||||
| * | increase version number | Bjoern Schiessle | 2016-03-01 | 1 | -1/+1 |
| | | |||||
| * | Handle null case | Thomas Müller | 2016-03-01 | 1 | -2/+5 |
| | | |||||
| * | fix doc-block | Bjoern Schiessle | 2016-02-29 | 1 | -0/+1 |
| | | |||||
| * | remove synced remote address book if the remote server revoked access to his ↵ | Bjoern Schiessle | 2016-02-29 | 7 | -7/+39 |
| | | | | | | | | system address book | ||||
| * | remove remote address book if the admin removes the server from the trusted ↵ | Bjoern Schiessle | 2016-02-29 | 9 | -18/+97 |
| | | | | | | | | servers list | ||||
| * | reuse the url_hash instead of calculating a new hash for the address book | Bjoern Schiessle | 2016-02-26 | 5 | -13/+14 |
| | | |||||
* | | Merge pull request #22681 from owncloud/add-autodiscovery-for-ocs | Thomas Müller | 2016-03-01 | 12 | -24/+435 |
|\ \ | | | | | | | Add autodiscovery support to server-to-server sharing implementation | ||||
| * | | Fix Scrutinizer issues | Lukas Reschke | 2016-02-29 | 2 | -0/+3 |
| | | | |||||
| * | | Add autodiscovery support to server-to-server sharing | Lukas Reschke | 2016-02-26 | 12 | -24/+433 |
| | | | | | | | | | | | | Adds autodiscovery support to server-to-server sharing as specified in the specification. If no discovery data is found it is using the fallback ownCloud endpoints for legacy support. | ||||
* | | | Merge pull request #22728 from owncloud/external-share-testremote | Thomas Müller | 2016-03-01 | 4 | -28/+65 |
|\ \ \ | | | | | | | | | use ocs discover endpoint to test remote | ||||
| * | | | Only use scanner if remote is an ownCloud | Lukas Reschke | 2016-03-01 | 1 | -1/+17 |
| | | | | |||||
| * | | | /shareinfo is not required | Lukas Reschke | 2016-03-01 | 2 | -0/+8 |
| | | | | |||||
| * | | | Fix tests | Lukas Reschke | 2016-03-01 | 1 | -20/+14 |
| | | | | |||||
| * | | | Add missing trailing slash | Lukas Reschke | 2016-03-01 | 2 | -3/+3 |
| | | | | |||||
| * | | | use ocs discover endpoint to test remote | Robin Appelman | 2016-03-01 | 2 | -8/+27 |
| | | | | |||||
* | | | | Merge pull request #22700 from owncloud/only_1_linkshare | Thomas Müller | 2016-03-01 | 1 | -0/+9 |
|\ \ \ \ | | | | | | | | | | | For now only allow 1 link share per file/folder | ||||
| * | | | | For now only allow 1 link share per file/folder | Roeland Jago Douma | 2016-03-01 | 1 | -0/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #22692 This is a temp fix util we get #22327 We just block it in the OCS Share API since we have 1 endpoint now anyway. | ||||
* | | | | | Merge pull request #22731 from owncloud/hide-nodes-from-listening | Thomas Müller | 2016-03-01 | 3 | -3/+76 |
|\ \ \ \ \ | | | | | | | | | | | | | Hides nodes from listing that the user has no access to | ||||
| * | | | | | Hides nodes from listing that the user has no access to | Lukas Reschke | 2016-02-29 | 3 | -3/+76 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #22613 from owncloud/quota-changedavreturnvaluewhennoquotaset | Thomas Müller | 2016-03-01 | 3 | -4/+46 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Don't return quota when none set | ||||
| * | | | | Return -3 for unlimited quota | Vincent Petry | 2016-02-29 | 3 | -4/+46 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Returns -3 for unlimited quota in Webdav response. Also adjusted personal page to show unlimited quota when set. | ||||
* | | | | | Merge pull request #22727 from owncloud/decrypt_all_master_key | Thomas Müller | 2016-03-01 | 3 | -27/+46 |
|\ \ \ \ \ | | | | | | | | | | | | | make decrypt all work with the master key | ||||
| * | | | | | make decrypt all work with the master key | Bjoern Schiessle | 2016-02-29 | 3 | -27/+46 |
| |/ / / / | |||||
* | | | | | Merge pull request #22740 from owncloud/fix_resare_updates | Thomas Müller | 2016-03-01 | 2 | -0/+20 |
|\ \ \ \ \ | | | | | | | | | | | | | Check correct permissions when resharing | ||||
| * | | | | | Check correct permissions when resharing | Roeland Jago Douma | 2016-02-29 | 2 | -0/+20 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #22675 Since we only get a share id we do not know the path for the sharer. Now if we edit a share we start searching for shares for that user of that node. And deduce the permissions that way. * Intergration test added * Fix unit tests | ||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-03-01 | 10 | -2/+74 |
| | | | | | |||||
* | | | | | Merge pull request #22707 from owncloud/use-our-public-api | Thomas Müller | 2016-03-01 | 4 | -36/+37 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Use IQueryBuilder::PARAM_* instead of \PDO::PARAM_* | ||||
| * | | | | Use IQueryBuilder::PARAM_* instead of \PDO::PARAM_* | Joas Schilling | 2016-02-29 | 4 | -36/+37 |
| | | | | | |||||
* | | | | | Merge pull request #22623 from owncloud/docker-logs-on-swift-external | Thomas Müller | 2016-02-29 | 1 | -0/+2 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Print docker logs to the console fro debugging | ||||
| * | | | | Print docker logs to the console fro debugging | Thomas Müller | 2016-02-24 | 1 | -0/+2 |
| | | | | | |||||
* | | | | | Merge pull request #22662 from owncloud/comments-count | Thomas Müller | 2016-02-29 | 2 | -5/+3 |
|\ \ \ \ \ | |_|/ / / |/| | | | | remove comments count because it is not that relevant to show directly | ||||
| * | | | | remove comments count because it is not that relevant to show directly | Jan-Christoph Borchardt | 2016-02-25 | 2 | -5/+3 |
| | |/ / | |/| | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-02-29 | 8 | -0/+12 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-02-28 | 32 | -18/+224 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-02-27 | 14 | -0/+38 |
| |_|/ |/| | | |||||
* | | | Merge pull request #22671 from owncloud/issue-22670 | Thomas Müller | 2016-02-26 | 2 | -26/+26 |
|\ \ \ | | | | | | | | | Move the tag filter at the end for now | ||||
| * | | | Move the tag filter at the end for now | Joas Schilling | 2016-02-26 | 2 | -26/+26 |
| | | | | |||||
* | | | | Merge pull request #22640 from owncloud/fix_22587 | Thomas Müller | 2016-02-26 | 2 | -0/+129 |
|\ \ \ \ | | | | | | | | | | | Remove delete permissions for read-only federated reshares | ||||
| * | | | | Remove delete permissions for read-only federated reshares | Roeland Jago Douma | 2016-02-25 | 2 | -0/+129 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An incomming federated share is just a mount point. Therefor if we request the permissions on the mountpoint DELETE permissions will be returned (among others). Since we can always remove a mountpoint, update a mount point. However now when trying to reshare we will try to reshare with DELETE permissions. Which is false. This PR removes the delete permissions if it is a shared storage. Basically a quick hack. Fixes #22587 | ||||
* | | | | | Merge pull request #22608 from owncloud/collaborative-tags | Thomas Müller | 2016-02-26 | 2 | -3/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | Rename system tags app to collaborative tags | ||||
| * | | | | | Rename system tags app to collaborative tags | Joas Schilling | 2016-02-26 | 2 | -3/+4 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #22461 from owncloud/fix_6773 | Thomas Müller | 2016-02-26 | 13 | -63/+150 |
|\ \ \ \ \ | |/ / / / |/| | | | | Allow theming of actions | ||||
| * | | | | Fix favorite icon unit test for icon image | Vincent Petry | 2016-02-25 | 1 | -2/+4 |
| | | | | | |||||
| * | | | | Make more action icons themable + style fixes | Vincent Petry | 2016-02-25 | 5 | -22/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Action icons now appear properly in public link page. More actions are now CSS icons. |