Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #14954 from owncloud/cache-image-path | Robin McCorkell | 2015-03-17 | 1 | -1/+1 |
|\ | | | | | Cache \OC\URLGenerator::imagePath | ||||
| * | Cache \OC\URLGenerator::imagePath | Lukas Reschke | 2015-03-17 | 1 | -1/+1 |
| | | | | | | | | \OC\URLGenerator::imagePath is a really expensive operation due to all the I/O handling and can really benefit from caching. | ||||
* | | add whitespace to prevent file deletion when wanting to scroll | Jan-Christoph Borchardt | 2015-03-17 | 1 | -1/+1 |
| | | |||||
* | | Use a closure for the files app entry and deprecate old methods | Joas Schilling | 2015-03-17 | 1 | -17/+22 |
|/ | |||||
* | Fix PHPDoc and Co. | Lukas Reschke | 2015-03-17 | 1 | -4/+12 |
| | | | | Ref https://github.com/owncloud/core/pull/14929#discussion_r26501240 | ||||
* | Merge pull request #14929 from owncloud/s2s-scanner-warnings | Vincent Petry | 2015-03-17 | 1 | -1/+1 |
|\ | | | | | Fix scanFile signature warnings | ||||
| * | Fix scanFile signature warnings | Vincent Petry | 2015-03-16 | 1 | -1/+1 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-17 | 10 | -4/+14 |
| | | |||||
* | | Merge pull request #14877 from owncloud/smb-constructor-noconnect | Vincent Petry | 2015-03-16 | 8 | -23/+81 |
|\ \ | |/ |/| | Wait with getting the timezone from the smb server until we need it | ||||
| * | Wait with getting the timezone from the smb server until we need it | Robin Appelman | 2015-03-13 | 8 | -23/+81 |
| | | |||||
* | | Merge pull request #14133 from rullzer/fix_10600 | Thomas Müller | 2015-03-16 | 1 | -7/+7 |
|\ \ | | | | | | | Always display max upload size in admin panel | ||||
| * | | Always display max upload size in admin panel | Roeland Jago Douma | 2015-02-13 | 1 | -7/+7 |
| | | | |||||
* | | | Merge pull request #14644 from owncloud/trash-expire-command | Thomas Müller | 2015-03-16 | 3 | -25/+84 |
|\ \ \ | | | | | | | | | Expire files from the trash in the background | ||||
| * | | | don't rely on \OCP\User::getUser() - it is not set properly in case of async ↵ | Thomas Müller | 2015-03-10 | 1 | -10/+8 |
| | | | | | | | | | | | | | | | | operations | ||||
| * | | | tearDown the filesystem right before setting it up again | Thomas Müller | 2015-03-10 | 1 | -0/+1 |
| | | | | |||||
| * | | | Expire files from the trash in the background | Robin Appelman | 2015-03-02 | 3 | -15/+75 |
| | | | | |||||
* | | | | Merge pull request #14848 from owncloud/kill-curl-fallback-master | Thomas Müller | 2015-03-16 | 4 | -20/+4 |
|\ \ \ \ | | | | | | | | | | | drop any fallback code related to curl | ||||
| * | | | | drop any fallback code related to curl - refs ↵ | Thomas Müller | 2015-03-12 | 4 | -20/+4 |
| | |_|/ | |/| | | | | | | | | | | https://github.com/owncloud/core/pull/14838#issuecomment-78586447 | ||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-16 | 4 | -0/+4 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-15 | 2 | -6/+6 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-14 | 2 | -0/+2 |
| | | | | |||||
* | | | | support paged results against 389ds. | Arthur Schiwon | 2015-03-12 | 1 | -3/+6 |
|/ / / | |||||
* | | | 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 |