summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Do not check storage availability for getOwnerVincent Petry2015-12-091-1/+0
| | | | | Because the owner is always known thanks to the file cache and other places, we don't need the remote storage to be actually available.
* Merge pull request #21076 from ↵Thomas Müller2015-12-091-4/+6
|\ | | | | | | | | owncloud/occ-shall-not-fail-hard-in-maintenance-mode Don't load commands of apps when in maintenance mode
| * Don't load commands of apps when in maintenance mode - fixes #20939Thomas Müller2015-12-091-4/+6
|/
* Merge pull request #21060 from owncloud/support-for-read-only-config-dirThomas Müller2015-12-091-7/+9
|\ | | | | Add support for read only config dir
| * Add support for read only config dirLukas Reschke2015-12-091-7/+9
| | | | | | | | | | | | | | | | | | | | We already support the `config_is_read_only` for the config file itself. However not for the whole directory (which is a bug). This unifies the check in the checkServer routine with the one in base.php. Now one can enable a read only config folder so that ownCloud is not allowed to overwrite it's own source code. To test this set the whole config folder to read only, clear your session, refresh, see it fails, add the new code, refresh, see it works. Also verify that setup still works fine. (obviously setup does not work with a read only config Also verify that setup still works fine. (obviously setup does not work with a read only config)) Fixes https://github.com/owncloud/core/issues/14455
* | Merge pull request #21019 from owncloud/occ-get-apppathThomas Müller2015-12-092-0/+63
|\ \ | | | | | | Add occ command to get app path
| * | Add occ command to get app pathVictor Dubiniuk2015-12-092-0/+63
| | |
* | | Merge pull request #20989 from owncloud/fix_20769Thomas Müller2015-12-091-0/+41
|\ \ \ | | | | | | | | Update parent when moving share into recieved share
| * | | Update parent when moving share into recieved shareRoeland Jago Douma2015-12-071-0/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #20769 When I receive a share and move a share of myself into that share (which is allowed currently) I effectively hand over ownership of the files I move. So we need to update the share I move to have as a parent the share I move it into. Else our mounting system gets confused.
* | | | Merge pull request #21059 from owncloud/remove-deaed-code-mount-configThomas Müller2015-12-091-52/+6
|\ \ \ \ | | | | | | | | | | Remove dead code
| * | | | Remove dead codeLukas Reschke2015-12-091-52/+6
| | | | | | | | | | | | | | | | | | | | Silences two other security warnings, also I cleaned up the PHPDoc a little bit.
* | | | | Merge pull request #21068 from owncloud/fix-exit-code-autotest-externalThomas Müller2015-12-093-3/+9
|\ \ \ \ \ | | | | | | | | | | | | Fix exit code autotest external
| * | | | | Use default timeout on connection testThomas Müller2015-12-091-1/+1
| | | | | |
| * | | | | remove deprecated strict settingThomas Müller2015-12-091-1/+0
| | | | | |
| * | | | | script shall exit with error in case the start file has issues - fixes #20798Thomas Müller2015-12-091-1/+8
| | |_|/ / | |/| | |
* | | | | Merge pull request #21061 from owncloud/fix-oracle-last-insert-id-testThomas Müller2015-12-092-11/+39
|\ \ \ \ \ | | | | | | | | | | | | Fix the last insert id test by changing to an autoincremen…
| * | | | | Do not quote the table name for lastInsertId()Joas Schilling2015-12-091-6/+22
| | | | | |
| * | | | | Fix the last insert id test by changing to an autoincrement tableJoas Schilling2015-12-091-5/+17
| | |_|_|/ | |/| | |
* | | | | Merge pull request #21056 from owncloud/check-returnThomas Müller2015-12-092-3/+7
|\ \ \ \ \ | | | | | | | | | | | | Verify return type
| * | | | | Verify return typeLukas Reschke2015-12-092-3/+7
| | |_|/ / | |/| | | | | | | | | | | | | Can also be null. Silences another security warning...
* | | | | Merge pull request #21055 from owncloud/fix-php-docs-for-consoleThomas Müller2015-12-091-1/+10
|\ \ \ \ \ | | | | | | | | | | | | Fix PHPDoc and check if path does exists
| * | | | | Fix PHPDoc and check if path does existsLukas Reschke2015-12-091-1/+10
| |/ / / / | | | | | | | | | | | | | | | Mutes another security warning of some static scanners.
* | | | | Merge pull request #20995 from owncloud/fix-18734Thomas Müller2015-12-091-1/+5
|\ \ \ \ \ | |_|_|/ / |/| | | | ensure multiselect always receives an array when setting its value, f…
| * | | | ensure multiselect always receives an array when setting its value, fixes #18734Arthur Schiwon2015-12-071-1/+5
| | |_|/ | |/| |
* | | | Merge pull request #21064 from owncloud/fix-occ-install-on-os-xThomas Müller2015-12-091-1/+6
|\ \ \ \ | | | | | | | | | | Allow occ install on OS X - same behaviour as web setup
| * | | | Allow occ install on OS X - same behaviour as web setupMorris Jobke2015-12-091-1/+6
|/ / / /
* | | | Merge pull request #21003 from owncloud/personal-mount-mountidThomas Müller2015-12-092-4/+54
|\ \ \ \ | | | | | | | | | | Dont set the string storage id to the numeric storage id for personal mounts
| * | | | Add testsRobin Appelman2015-12-081-0/+50
| | | | |
| * | | | Dont set the string storage id to the numeric storage id for personal mountsRobin Appelman2015-12-071-4/+4
| | | | |
* | | | | Merge pull request #21005 from owncloud/verify_password_before_unshareThomas Müller2015-12-091-0/+5
|\ \ \ \ \ | | | | | | | | | | | | The ajax code path unshares a link share when updating the password
| * | | | | The ajax code path unshares a link share when updating the passwordRoeland Jago Douma2015-12-071-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to not mess up existing shares if the password gets verified we should first fire this validation.
* | | | | | Merge pull request #21038 from owncloud/share-computesharepermissions-notstoreThomas Müller2015-12-0910-31/+76
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix (re)share permission checks in a few code paths
| * | | | | | Add explicit check for groups excluded from sharingVincent Petry2015-12-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since isSharable() doesn't do the check for groups excluded from sharing, adding an explicit check in the sharing code.
| * | | | | | Fix more unit tests to pass a mock storage instead of null to FileInfoVincent Petry2015-12-084-21/+53
| | | | | | |
| * | | | | | Add reshare permission checksVincent Petry2015-12-083-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added in isSharable() in incoming remote share. Added in isSharable() in regular incoming share. Added in FileInfo to make sure the proper attributes are returned to the clients.
| * | | | | | Compute share permissions in the viewVincent Petry2015-12-083-8/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The share permissions are now computed in the View/FileInfo instead of storing them directly/permanently on the storage
* | | | | | | Merge pull request #21043 from owncloud/add-php-docThomas Müller2015-12-091-0/+2
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | Add type description
| * | | | | | Add type descriptionLukas Reschke2015-12-081-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows IDEs and static code analyzers. Would have saved me some minutes today :)
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-12-0930-8/+204
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge pull request #21037 from owncloud/fix-irritating-ldap-log-entryThomas Müller2015-12-081-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | passing an empty base in this diagnosis call will not result in LDAP…
| * | | | | passing an empty base in this diagnosis call will not result in LDAP errorsArthur Schiwon2015-12-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Neither in "Invalid DN syntax" nor in "Object not found"
* | | | | | Merge pull request #21018 from owncloud/scrutinizer-patch-1Thomas Müller2015-12-087-16/+66
|\ \ \ \ \ \ | | | | | | | | | | | | | | Scrutinizer Auto-Fixes
| * | | | | | More fixes to the docsJoas Schilling2015-12-083-6/+20
| | | | | | |
| * | | | | | Scrutinizer Auto-FixesScrutinizer Auto-Fixer2015-12-077-10/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
* | | | | | | Merge pull request #21031 from owncloud/sanitize-findAppInDirectoriesThomas Müller2015-12-081-1/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Sanitize the appId passed to `findAppInDirectories`
| * | | | | | | Sanitize the appId passed to `findAppInDirectories`Lukas Reschke2015-12-081-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Would have prevented quite some security bugs in the past. Nice hardening for now.
* | | | | | | | Merge pull request #21030 from owncloud/querybuilder-new-featuresThomas Müller2015-12-084-7/+177
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Querybuilder new features
| * | | | | | | | Add a method to the get "to use" table and column nameJoas Schilling2015-12-084-3/+59
| | | | | | | | |
| * | | | | | | | Add select distinct to the query builderJoas Schilling2015-12-083-4/+70
| | | | | | | | |
| * | | | | | | | Allow getting the last insert id without much hassleJoas Schilling2015-12-083-0/+48
| | | | | | | | |