summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* make encryption configurable for home storageBjoern Schiessle2015-10-2711-61/+247
|
* Merge pull request #20066 from owncloud/list-principaly-in-debug-modeThomas Müller2015-10-271-3/+8
|\ | | | | as soon as debug mode is enabled we allow listing of principals
| * as soon as debug mode is enabled we allow listing of principalsThomas Müller2015-10-261-3/+8
| |
* | Merge pull request #20076 from owncloud/fix_20069Thomas Müller2015-10-272-0/+17
|\ \ | | | | | | Verify the src exists in webdav MOVE
| * | Verify the src exists in webdav MOVERoeland Jago Douma2015-10-272-0/+17
| | | | | | | | | | | | * Unit test added
* | | Merge pull request #19824 from owncloud/ie9-share-donotsendplaceholderaspasswordThomas Müller2015-10-271-7/+12
|\ \ \ | |/ / |/| | [IE9] Don't send link share password placeholder
| * | [IE9] Don't send link share password placeholderVincent Petry2015-10-261-7/+12
| |/ | | | | | | | | | | | | | | | | When exiting the password field in the share dialog, IE9 would mistakenly think that the password has changed and would send the placeholder. This fix prevents changing the password whenever the placeholder is set as value.
* | [tx-robot] updated from transifexJenkins for ownCloud2015-10-2790-90/+216
| |
* | Merge pull request #19813 from owncloud/stay-on-apps-category-refreshThomas Müller2015-10-265-34/+206
|\ \ | |/ |/| Improve settings/apps page
| * Fix backwards and forward buttonJoas Schilling2015-10-261-1/+12
| |
| * Use speaking idsJoas Schilling2015-10-264-20/+61
| |
| * Fix backspace in search and empty content messageJoas Schilling2015-10-261-4/+9
| |
| * Add js tests for empty content pageJoas Schilling2015-10-261-4/+19
| |
| * Adjust js unit testsJoas Schilling2015-10-261-4/+43
| |
| * Display empty-content when there are no search resultsJoas Schilling2015-10-261-5/+13
| |
| * Clear search box for nowJoas Schilling2015-10-261-0/+1
| | | | | | | | Fix #15651
| * Allow searching by author name and app level as wellJoas Schilling2015-10-261-1/+30
| |
| * Stay on the same category when refreshing the page on the apps listJoas Schilling2015-10-264-8/+31
| |
* | Merge pull request #19837 from owncloud/always-enabled-appsThomas Müller2015-10-264-37/+68
|\ \ | | | | | | Store list of apps which cannot be disabled in shipped.json
| * | Fail hard if shipped.json is missingThomas Müller2015-10-261-9/+5
| | |
| * | Don't show apps which are always enabled in the app managerThomas Müller2015-10-263-9/+20
| | |
| * | Store list of apps which cannot be disabled in shipped.jsonThomas Müller2015-10-264-33/+57
| | |
* | | Merge pull request #20049 from owncloud/make-author-file-completeThomas Müller2015-10-26138-132/+340
|\ \ \ | | | | | | | | Generate author file by license.php build script
| * | | Update AUTHOR fileLukas Reschke2015-10-261-22/+177
| | | |
| * | | Update license headersLukas Reschke2015-10-26135-108/+141
| | | |
| * | | Update .mailmapLukas Reschke2015-10-261-1/+2
| | | |
| * | | Generate AUTHORS file from commitsLukas Reschke2015-10-261-1/+20
| | | |
* | | | Merge pull request #20046 from owncloud/share-clicklinkfocusThomas Müller2015-10-262-2/+26
|\ \ \ \ | |_|_|/ |/| | | Fix share link focus on click
| * | | Fix share link focus on clickVincent Petry2015-10-262-2/+26
| | | | | | | | | | | | | | | | Clicking on the link share must focus and select it
* | | | Merge pull request #19949 from owncloud/davng-personal-filesThomas Müller2015-10-267-1/+478
|\ \ \ \ | |_|/ / |/| | | Introduced the new webdav endpoint remote.php/dav holding the princip…
| * | | Adding required parameters of ctor of class AuthThomas Müller2015-10-261-1/+4
| | | |
| * | | Introduced the new webdav endpoint remote.php/dav holding the principals and ↵Thomas Müller2015-10-267-1/+475
|/ / / | | | | | | | | | the files collection
* | | Merge pull request #20010 from owncloud/add-tests-auth-pluginThomas Müller2015-10-263-21/+399
|\ \ \ | | | | | | | | Add tests for Sabre Auth plugin + make getCurrentUser compatible
| * | | Add tests for Sabre Auth plugin + make getCurrentUser compatibleLukas Reschke2015-10-233-21/+399
| | | |
* | | | Merge pull request #20037 from owncloud/phpseclib-dev-to-2.0.0Thomas Müller2015-10-261-0/+0
|\ \ \ \ | |_|/ / |/| | | Bump 3rdparty for phpseclib-2.0.0
| * | | Bump 3rdparty for phpseclib-2.0.0Roeland Jago Douma2015-10-261-0/+0
| | |/ | |/|
* | | Merge pull request #20031 from owncloud/remove-dead-codeThomas Müller2015-10-261-8/+7
|\ \ \ | | | | | | | | Remove dead code from autoloader
| * | | Remove dead codeLukas Reschke2015-10-251-8/+7
| | | | | | | | | | | | | | | | Those variables are never written to. Thus this is dead code which should be removed.
* | | | Merge pull request #19982 from owncloud/fix-link-sharing-regression-masterThomas Müller2015-10-265-18/+60
|\ \ \ \ | |_|/ / |/| | | Ensure the password is only hashed in case it's changed on the client…
| * | | Fix for broken ajax/share.php endpointRoeland Jago Douma2015-10-234-16/+47
| | | | | | | | | | | | | | | | | | | | Even more code mess :( All tests pass again. But I'm really not happy with this endpoint.
| * | | Ensure the password is only hashed in case it's changed on the client - ↵Thomas Müller2015-10-222-9/+20
| | | | | | | | | | | | | | | | fixes #19950
* | | | Merge pull request #20030 from owncloud/autoload-files-external-optimizeThomas Müller2015-10-263-1/+49
|\ \ \ \ | | | | | | | | | | Use optimized autoloader for files_external
| * | | | Use optimized autoloader for files_externalLukas Reschke2015-10-253-1/+49
| | |/ / | |/| |
* / | | [tx-robot] updated from transifexJenkins for ownCloud2015-10-2610-0/+184
|/ / /
* | | Merge pull request #20026 from owncloud/LukasReschke-patch-1Lukas Reschke2015-10-251-1/+1
|\ \ \ | | | | | | | | Add HackerOne page to CONTRIBUTING.md
| * | | Add HackerOne page to CONTRIBUTING.mdLukas Reschke2015-10-251-1/+1
|/ / /
* | | Merge pull request #20024 from owncloud/optimized-autoloaderLukas Reschke2015-10-251-0/+0
|\ \ \ | | | | | | | | Use optimized autoloader for 3rdparty
| * | | Use optimized autoloader for 3rdpartyLukas Reschke2015-10-251-0/+0
|/ / /
* | | Merge pull request #16957 from owncloud/throw-exception-if-file-does-not-existLukas Reschke2015-10-2514-54/+121
|\ \ \ | | | | | | | | Throw exception on `getPath` if file does not exist
| * | | Throw exception on `getPath` if file does not existLukas Reschke2015-10-2514-54/+121
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the `getPath` methods returned `NULL` in case when a file with the specified ID does not exist. This however mandates that developers are checking for the `NULL` case and if they do not the door for bugs with all kind of impact is widely opened. This is especially harmful if used in context with Views where the final result is limited based on the result of `getPath`, if `getPath` returns `NULL` PHP type juggles this to an empty string resulting in all possible kind of bugs. While one could argue that this is a misusage of the API the fact is that it is very often misused and an exception will trigger an immediate stop of execution as well as log this behaviour and show a pretty error page. I also adjusted some usages where I believe that we need to catch these errors, in most cases this is though simply an error that should hard-fail.