summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* enable testRewindjknockaert2015-04-241-14/+14
|
* Update encryption.phpjknockaert2015-04-241-1/+2
|
* Update encryption.phpjknockaert2015-04-241-14/+14
|
* disable r+ testjknockaert2015-04-241-14/+14
|
* fixed namejknockaert2015-04-241-1/+1
|
* add two testsjknockaert2015-04-241-0/+30
| | | testRewind tests reading and writing after rewind on an encrypted stream; testWriteWriteRead tests r+ mode
* Update encryption.phpjknockaert2015-04-241-8/+8
|
* fix encryption header errorjknockaert2015-04-241-13/+16
| | | When moving back the pointer to position 0 (using stream_seek), the pointer on the encrypted stream will be moved to the position immediately after the header. Reading the header again (invoked by stream_read) will cause an error, writing the header again (invoked by stream_write) will corrupt the file. Reading/writing the header should therefore happen when opening the file rather than upon read or write. Note that a side-effect of this PR is that empty files will still get an encryption header; I think that is OK, but it is different from how it was originally implemented.
* Merge pull request #15839 from owncloud/enc_fix_moving_shared_filesJoas Schilling2015-04-2410-75/+399
|\ | | | | [encryption] fix moving files to a shared folder
| * Add test "operation on keys failed"Joas Schilling2015-04-241-7/+10
| |
| * Deduplicate data provider and fix method visibilityJoas Schilling2015-04-242-19/+15
| |
| * Use public interfaces for type hintingJoas Schilling2015-04-242-13/+13
| |
| * only update share keys if the file was encryptedBjoern Schiessle2015-04-244-6/+25
| |
| * update share keys if file gets copiedBjoern Schiessle2015-04-232-19/+70
| |
| * update share keys if a file is moved to a shared folderBjoern Schiessle2015-04-238-46/+301
| |
* | Merge pull request #15838 from owncloud/code-checker-to-ignore-testsJoas Schilling2015-04-241-1/+1
|\ \ | | | | | | Ignore test folders when checking the code for compliance
| * | Ignore test folders when checking the code for complianceThomas Müller2015-04-231-1/+1
| | |
* | | Merge pull request #15855 from owncloud/teardownaftercommandLukas Reschke2015-04-241-0/+1
|\ \ \ | | | | | | | | Tear down FS after running trash expire
| * | | Tear down FS after running trash expireVincent Petry2015-04-241-0/+1
| | | |
* | | | Merge pull request #15835 from owncloud/delete-permission-iconJan-Christoph Borchardt2015-04-245-5/+62
|\ \ \ \ | |/ / / |/| | | Show hint if there is no delete permission
| * | | Show hint if there is no delete permissionMorris Jobke2015-04-235-5/+62
| | |/ | |/| | | | | | | | | | | | | * add class .no-permission which shows the default delete icon * fixes #15172 * add unit test for no permission and for delete permission
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-04-246-6/+6
| | |
* | | Merge pull request #15846 from owncloud/fix-missing-loading-indicatorLukas Reschke2015-04-231-0/+2
|\ \ \ | | | | | | | | Add missing loading indicator for enabled apps
| * | | Add missing loading indicator for enabled appsMorris Jobke2015-04-231-0/+2
| | |/ | |/| | | | | | | | | | | | | | | | * happened when an app gets activated, because the new appended HTML doesn't contain the loading image * fixes #15806
* | | Merge pull request #15826 from owncloud/issue-15804-occ-user-delete-exceptionblizzz2015-04-238-20/+262
|\ \ \ | |/ / |/| | Issue 15804 occ user delete exception
| * | Fix file namesJoas Schilling2015-04-232-0/+0
| | |
| * | Add tests for occ user:lastseenJoas Schilling2015-04-231-0/+105
| | |
| * | Unify the output of the user commands and use DIJoas Schilling2015-04-236-16/+40
| | |
| * | Add unit tests for occ user:deleteJoas Schilling2015-04-231-0/+106
| | |
| * | Check if the user exists before trying to delete himJoas Schilling2015-04-231-5/+12
| |/
* | Merge pull request #15814 from owncloud/public-reshare-webdavVincent Petry2015-04-234-139/+6
|\ \ | | | | | | Fix webdav access for public reshare
| * | fix subfolder reshares over webdavRobin Appelman2015-04-231-2/+2
| | |
| * | remove unneeded readonlycacheRobin Appelman2015-04-221-44/+0
| | |
| * | resolve reshares in public webdavRobin Appelman2015-04-221-3/+4
| | |
| * | use the permissions mask cache wrapper instead of the read only cacheRobin Appelman2015-04-222-94/+4
| | |
* | | Merge pull request #15828 from owncloud/smb-1.0.1Thomas Müller2015-04-235-17/+16
|\ \ \ | | | | | | | | update icewind/smb to 1.0.1
| * | | update icewind/smb to 1.0.1Robin Appelman2015-04-225-17/+16
| |/ /
* | | Merge pull request #15831 from owncloud/enc2-unittestcleanuptmpfileThomas Müller2015-04-231-0/+6
|\ \ \ | | | | | | | | Delete temp files after testing encryption stream wrapper
| * | | Delete temp files after testing encryption stream wrapperVincent Petry2015-04-231-0/+6
| | |/ | |/|
* | | Merge pull request #15617 from mmattel/getenv_system_check_and_warningThomas Müller2015-04-232-0/+13
|\ \ \ | | | | | | | | Checks if getenv returns proper system environment variable results
| * | | Checks if getenv returns proper system variable resultsroot2015-04-232-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated texts and changed the variable name to match the query Updated text + info which path for php config is used removed the term ownCloud and squashed the commits Updated text
* | | | Merge pull request #15830 from owncloud/enc2-ajaxstatuswhenloggedinThomas Müller2015-04-231-1/+1
|\ \ \ \ | |_|/ / |/| | | Only get encryption status when logged in
| * | | Only get encryption status when logged inVincent Petry2015-04-231-1/+1
|/ / / | | | | | | | | | This removes useless warnings in the logs.
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-04-2364-14/+366
| | |
* | | Merge pull request #15639 from rullzer/fix_15368Morris Jobke2015-04-232-2/+99
|\ \ \ | | | | | | | | Reset sharedialog values
| * | | Added unit testsRoeland Jago Douma2015-04-171-0/+94
| | | |
| * | | moved from html to $('html') to fix unit testsRoeland Jago Douma2015-04-171-2/+1
| | | |
| * | | Reset sharedialog valuesRoeland Jago Douma2015-04-171-0/+4
| | | |
* | | | 8.1.0 alpha 2v8.1.0alpha2Frank Karlitschek2015-04-151-2/+2
| | | |
* | | | Merge pull request #15805 from owncloud/fileslist-whitespaceMorris Jobke2015-04-221-3/+4
|\ \ \ \ | | | | | | | | | | add whitespace to bottom of files list to correctly show dropdowns
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-12 16:22:20 +0000