Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Increase all versions on master which is now 9.1 | Joas Schilling | 2016-03-02 | 14 | -28/+28 |
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-03-02 | 12 | -6/+152 |
* | Merge pull request #22757 from owncloud/apply-license | C. Montero Luque | 2016-03-01 | 169 | -96/+436 |
|\ | |||||
| * | Add new apps | Lukas Reschke | 2016-03-01 | 8 | -4/+28 |
| * | Remove Scrutinizer Auto Fixer | Lukas Reschke | 2016-03-01 | 43 | -43/+0 |
| * | Map Maci | Lukas Reschke | 2016-03-01 | 11 | -0/+11 |
| * | Update author information | Lukas Reschke | 2016-03-01 | 130 | -50/+398 |
* | | Merge branch 'master' into part-file-root | C. Montero Luque | 2016-03-01 | 4 | -2/+16 |
|\ \ | |||||
| * \ | Merge pull request #22742 from owncloud/ceph-keystone-readiness | C. Montero Luque | 2016-03-01 | 4 | -2/+16 |
| |\ \ | | |/ | |/| | |||||
| | * | Use readiness notification socket to be absolutely sure this works | Robin McCorkell | 2016-02-29 | 4 | -2/+16 |
* | | | allow putting the part file in the view root | Robin Appelman | 2016-03-01 | 2 | -4/+69 |
|/ / | |||||
* | | Merge pull request #22699 from owncloud/checksum_int_test | Thomas Müller | 2016-03-01 | 2 | -2/+20 |
|\ \ | |||||
| * | | 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 |
| * | | Remove checksum on upload of non checksumed file | Roeland Jago Douma | 2016-03-01 | 2 | -1/+8 |
* | | | Merge pull request #22686 from owncloud/cleanup_remote_address_books | Thomas Müller | 2016-03-01 | 18 | -39/+155 |
|\ \ \ | |/ / |/| | | |||||
| * | | 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 |
| * | | remove remote address book if the admin removes the server from the trusted s... | Bjoern Schiessle | 2016-02-29 | 9 | -18/+97 |
| * | | 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 |
|\ \ \ | |||||
| * | | | 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 |
* | | | | Merge pull request #22728 from owncloud/external-share-testremote | Thomas Müller | 2016-03-01 | 4 | -28/+65 |
|\ \ \ \ | |||||
| * | | | | 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 | Roeland Jago Douma | 2016-03-01 | 1 | -0/+9 |
* | | | | | 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 | 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 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Return -3 for unlimited quota | Vincent Petry | 2016-02-29 | 3 | -4/+46 |
* | | | | | 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 | 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 | Roeland Jago Douma | 2016-02-29 | 2 | -0/+20 |
| |/ / / / | |||||
* | | | | | [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_* | 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 | 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 | Jan-Christoph Borchardt | 2016-02-25 | 2 | -5/+3 |
| | |/ / | |/| | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-02-29 | 8 | -0/+12 |