Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #14785 from ↵ | Thomas Müller | 2015-03-12 | 1 | -2/+0 |
|\ | | | | | | | | | owncloud/issue/14733-active-class-missing-for-admin-navigation-entry Do not overwrite the active menu entry of the navigation | ||||
| * | Do not overwrite the active menu entry of the navigation | Joas Schilling | 2015-03-11 | 1 | -2/+0 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-12 | 10 | -16/+16 |
| | | |||||
* | | Merge pull request #14773 from owncloud/allow-iframes-from-self-in-share-view | Lukas Reschke | 2015-03-11 | 2 | -1/+11 |
|\ \ | | | | | | | Allow iframes from same domain in share view | ||||
| * | | Allow iframes from same domain in share view | Lukas Reschke | 2015-03-10 | 2 | -1/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | This is required because the PDF Viewer itself is embedded using an iframe from the same domain. The default policy is blocking this. Going on further, we have to come up with a solution in the future how to handle previews by applications, one example might be that they call their own endpoint and not the generic share page to allow applications to have full control over how to display previews. Anyways, to test this behaviour use a decent newer browser (such as Chrome 41) and share a PDF file, obviously the PDF viewer needs to be enabled as well. Without this patch publicly shared PDF files should not get previewed and an error is thrown. (if it isn't then your browser is probably not obeying our Content-Security-Policy and you might consider switching to another one ;)) | ||||
* | | | Adding a more meaningful message for sabre dav exception - fixes #14516 | Thomas Müller | 2015-03-11 | 2 | -2/+2 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-11 | 120 | -422/+120 |
| | | | |||||
* | | | Merge pull request #14640 from owncloud/rescanversionsonlyonce | Thomas Müller | 2015-03-11 | 1 | -3/+13 |
|\ \ \ | |_|/ |/| | | Only rescan versions once in trashbin | ||||
| * | | Only rescan versions once in trashbin | Vincent Petry | 2015-03-02 | 1 | -3/+13 |
| | | | | | | | | | | | | | | | Whenever versions need to be rescanned, only do it once per PHP request. Happens whenever multiple files need to be expired. | ||||
* | | | Merge pull request #14346 from owncloud/storage-based-path-validation | Lukas Reschke | 2015-03-10 | 5 | -63/+20 |
|\ \ \ | |_|/ |/| | | adding storage specific filename verification | ||||
| * | | fixing js unit tests | Thomas Müller | 2015-03-09 | 3 | -31/+0 |
| | | | |||||
| * | | adding storage specific filename verification - refs #13640 | Thomas Müller | 2015-03-09 | 3 | -39/+27 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-10 | 4 | -0/+8 |
| | | | |||||
* | | | Merge pull request #14720 from owncloud/fix-shareetagpropagation | Morris Jobke | 2015-03-09 | 2 | -0/+112 |
|\ \ \ | |/ / |/| | | Fix size propagation over shared storage boundary | ||||
| * | | Add unit test for size propagation across share boundaries | Vincent Petry | 2015-03-09 | 1 | -0/+90 |
| | | | |||||
| * | | Fix size propagation over shared storage boundary | Vincent Petry | 2015-03-05 | 1 | -0/+22 |
| | | | |||||
* | | | Merge pull request #14706 from owncloud/ldap-reset-paged-search-on-null-limit | Morris Jobke | 2015-03-09 | 1 | -0/+11 |
|\ \ \ | | | | | | | | | LDAP: set up paged search even if limit is 0 | ||||
| * | | | set up paged search when limit is 0 | Arthur Schiwon | 2015-03-05 | 1 | -0/+11 |
| |/ / | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-09 | 10 | -22/+24 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-08 | 2 | -2/+6 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-07 | 2 | -2/+2 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-06 | 4 | -0/+4 |
|/ / | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-05 | 8 | -14/+16 |
| | | |||||
* | | Merge pull request #14672 from Crote/master | Morris Jobke | 2015-03-04 | 1 | -3/+10 |
|\ \ | | | | | | | Add --show-password option to ldap:show-config | ||||
| * | | Add --show-password option to ldap:show-config | Laurens Post | 2015-03-04 | 1 | -3/+10 |
| | | | |||||
* | | | Merge pull request #14690 from owncloud/trash-deletelink-unittest | Vincent Petry | 2015-03-04 | 1 | -0/+22 |
|\ \ \ | | | | | | | | | Add unit test for selection overlay actions in trashbin | ||||
| * | | | Add unit test for selection overlay actions in trashbin | Vincent Petry | 2015-03-04 | 1 | -0/+22 |
| | | | | |||||
* | | | | Merge pull request #14675 from owncloud/files-external-smb-windows | Thomas Müller | 2015-03-04 | 4 | -42/+136 |
|\ \ \ \ | |/ / / |/| | | | adding a windows smb config for testing to ci | ||||
| * | | | Fix slash normalization error in AmazonS3Migration unit test | Robin McCorkell | 2015-03-04 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | Since aa821ecc00f11b6382f6e033db18445d9e51d6b9 leading and trailing slashes are trimmed in the file cache paths | ||||
| * | | | Use dummy storages instead of real storages in files_external unit tests | Robin McCorkell | 2015-03-03 | 1 | -39/+81 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were using the SMB and SFTP backends, which since Icewind's new SMB library results in an actual attempted connection just by constructing the storage. This commit replaces all references to real storages (except when necessary) with a dummy storage class. | ||||
| * | | | adding a windows smb config for testing | Thomas Müller | 2015-03-03 | 2 | -0/+52 |
| |/ / | |||||
* / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-04 | 122 | -680/+20 |
|/ / | |||||
* | | Merge pull request #14652 from owncloud/kill-download-from-url | Vincent Petry | 2015-03-03 | 3 | -164/+13 |
|\ \ | | | | | | | Remove "Download from URL" feature | ||||
| * | | remove $content parameter | Thomas Müller | 2015-03-02 | 1 | -7/+4 |
| | | | |||||
| * | | Remove "Download from URL" feature | Lukas Reschke | 2015-03-02 | 3 | -163/+15 |
| | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/13326 | ||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-03 | 10 | -4/+10 |
|/ / | |||||
* | | Merge pull request #14573 from owncloud/enc-migrate-disable-updater | Vincent Petry | 2015-03-02 | 1 | -11/+17 |
|\ \ | |/ |/| | Disable the cache updater when doing the encryption migration | ||||
| * | Move keys instead of copy during encryption key migration | Vincent Petry | 2015-02-27 | 1 | -2/+2 |
| | | |||||
| * | Disable the cache updater when doing the encryption migration | Robin Appelman | 2015-02-27 | 1 | -9/+15 |
| | | |||||
* | | Merge pull request #14535 from owncloud/fix-files-external | Thomas Müller | 2015-03-02 | 1 | -0/+5 |
|\ \ | | | | | | | fix files external test run and add common-tests option | ||||
| * | | fix files external test run and add common-tests option | Morris Jobke | 2015-02-26 | 1 | -0/+5 |
| | | | |||||
* | | | Merge pull request #14570 from rullzer/ocs_sane_permissions | Morris Jobke | 2015-03-02 | 2 | -1/+79 |
|\ \ \ | | | | | | | | | Shares should have a least read permission | ||||
| * | | | Shares should have a least read permission | Roeland Jago Douma | 2015-03-01 | 2 | -1/+79 |
| | | | | | | | | | | | | | | | | | | | | * Throw 400 when a share is created or updated without read permissions * Added unit tests | ||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-02 | 6 | -8/+230 |
|/ / / | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-01 | 16 | -4/+74 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-02-28 | 12 | -6/+84 |
| |/ |/| | |||||
* | | Merge pull request #14530 from owncloud/revert-14403 | Thomas Müller | 2015-02-27 | 272 | -4976/+2589 |
|\ \ | | | | | | | Revert "Updating license headers" | ||||
| * | | Revert "Updating license headers" | Morris Jobke | 2015-02-26 | 272 | -4976/+2589 |
| |/ | | | | | | | This reverts commit 6a1a4880f0d556fb090f19a5019fec31916f5c36. | ||||
* | | Merge pull request #14561 from owncloud/fix-sftp | Thomas Müller | 2015-02-27 | 1 | -1/+4 |
|\ \ | | | | | | | apply suggestions from @atmoz to fix SFTP setup | ||||
| * | | apply suggestions from @atmoz to fix SFTP setup | Morris Jobke | 2015-02-26 | 1 | -1/+4 |
| | | |