Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Do not check storage availability for getOwner | Vincent Petry | 2015-12-09 | 1 | -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üller | 2015-12-09 | 1 | -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 #20939 | Thomas Müller | 2015-12-09 | 1 | -4/+6 |
|/ | |||||
* | Merge pull request #21060 from owncloud/support-for-read-only-config-dir | Thomas Müller | 2015-12-09 | 1 | -7/+9 |
|\ | | | | | Add support for read only config dir | ||||
| * | Add support for read only config dir | Lukas Reschke | 2015-12-09 | 1 | -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-apppath | Thomas Müller | 2015-12-09 | 2 | -0/+63 |
|\ \ | | | | | | | Add occ command to get app path | ||||
| * | | Add occ command to get app path | Victor Dubiniuk | 2015-12-09 | 2 | -0/+63 |
| | | | |||||
* | | | Merge pull request #20989 from owncloud/fix_20769 | Thomas Müller | 2015-12-09 | 1 | -0/+41 |
|\ \ \ | | | | | | | | | Update parent when moving share into recieved share | ||||
| * | | | Update parent when moving share into recieved share | Roeland Jago Douma | 2015-12-07 | 1 | -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-config | Thomas Müller | 2015-12-09 | 1 | -52/+6 |
|\ \ \ \ | | | | | | | | | | | Remove dead code | ||||
| * | | | | Remove dead code | Lukas Reschke | 2015-12-09 | 1 | -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-external | Thomas Müller | 2015-12-09 | 3 | -3/+9 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix exit code autotest external | ||||
| * | | | | | Use default timeout on connection test | Thomas Müller | 2015-12-09 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | remove deprecated strict setting | Thomas Müller | 2015-12-09 | 1 | -1/+0 |
| | | | | | | |||||
| * | | | | | script shall exit with error in case the start file has issues - fixes #20798 | Thomas Müller | 2015-12-09 | 1 | -1/+8 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #21061 from owncloud/fix-oracle-last-insert-id-test | Thomas Müller | 2015-12-09 | 2 | -11/+39 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix the last insert id test by changing to an autoincremen… | ||||
| * | | | | | Do not quote the table name for lastInsertId() | Joas Schilling | 2015-12-09 | 1 | -6/+22 |
| | | | | | | |||||
| * | | | | | Fix the last insert id test by changing to an autoincrement table | Joas Schilling | 2015-12-09 | 1 | -5/+17 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #21056 from owncloud/check-return | Thomas Müller | 2015-12-09 | 2 | -3/+7 |
|\ \ \ \ \ | | | | | | | | | | | | | Verify return type | ||||
| * | | | | | Verify return type | Lukas Reschke | 2015-12-09 | 2 | -3/+7 |
| | |_|/ / | |/| | | | | | | | | | | | | | Can also be null. Silences another security warning... | ||||
* | | | | | Merge pull request #21055 from owncloud/fix-php-docs-for-console | Thomas Müller | 2015-12-09 | 1 | -1/+10 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix PHPDoc and check if path does exists | ||||
| * | | | | | Fix PHPDoc and check if path does exists | Lukas Reschke | 2015-12-09 | 1 | -1/+10 |
| |/ / / / | | | | | | | | | | | | | | | | Mutes another security warning of some static scanners. | ||||
* | | | | | Merge pull request #20995 from owncloud/fix-18734 | Thomas Müller | 2015-12-09 | 1 | -1/+5 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | ensure multiselect always receives an array when setting its value, f… | ||||
| * | | | | ensure multiselect always receives an array when setting its value, fixes #18734 | Arthur Schiwon | 2015-12-07 | 1 | -1/+5 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #21064 from owncloud/fix-occ-install-on-os-x | Thomas Müller | 2015-12-09 | 1 | -1/+6 |
|\ \ \ \ | | | | | | | | | | | Allow occ install on OS X - same behaviour as web setup | ||||
| * | | | | Allow occ install on OS X - same behaviour as web setup | Morris Jobke | 2015-12-09 | 1 | -1/+6 |
|/ / / / | |||||
* | | | | Merge pull request #21003 from owncloud/personal-mount-mountid | Thomas Müller | 2015-12-09 | 2 | -4/+54 |
|\ \ \ \ | | | | | | | | | | | Dont set the string storage id to the numeric storage id for personal mounts | ||||
| * | | | | Add tests | Robin Appelman | 2015-12-08 | 1 | -0/+50 |
| | | | | | |||||
| * | | | | Dont set the string storage id to the numeric storage id for personal mounts | Robin Appelman | 2015-12-07 | 1 | -4/+4 |
| | | | | | |||||
* | | | | | Merge pull request #21005 from owncloud/verify_password_before_unshare | Thomas Müller | 2015-12-09 | 1 | -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 password | Roeland Jago Douma | 2015-12-07 | 1 | -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-notstore | Thomas Müller | 2015-12-09 | 10 | -31/+76 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix (re)share permission checks in a few code paths | ||||
| * | | | | | | Add explicit check for groups excluded from sharing | Vincent Petry | 2015-12-08 | 1 | -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 FileInfo | Vincent Petry | 2015-12-08 | 4 | -21/+53 |
| | | | | | | | |||||
| * | | | | | | Add reshare permission checks | Vincent Petry | 2015-12-08 | 3 | -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 view | Vincent Petry | 2015-12-08 | 3 | -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-doc | Thomas Müller | 2015-12-09 | 1 | -0/+2 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | Add type description | ||||
| * | | | | | | Add type description | Lukas Reschke | 2015-12-08 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows IDEs and static code analyzers. Would have saved me some minutes today :) | ||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-12-09 | 30 | -8/+204 |
| |_|_|_|_|/ |/| | | | | | |||||
* | | | | | | Merge pull request #21037 from owncloud/fix-irritating-ldap-log-entry | Thomas Müller | 2015-12-08 | 1 | -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 errors | Arthur Schiwon | 2015-12-08 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Neither in "Invalid DN syntax" nor in "Object not found" | ||||
* | | | | | | Merge pull request #21018 from owncloud/scrutinizer-patch-1 | Thomas Müller | 2015-12-08 | 7 | -16/+66 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Scrutinizer Auto-Fixes | ||||
| * | | | | | | More fixes to the docs | Joas Schilling | 2015-12-08 | 3 | -6/+20 |
| | | | | | | | |||||
| * | | | | | | Scrutinizer Auto-Fixes | Scrutinizer Auto-Fixer | 2015-12-07 | 7 | -10/+46 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com | ||||
* | | | | | | | Merge pull request #21031 from owncloud/sanitize-findAppInDirectories | Thomas Müller | 2015-12-08 | 1 | -1/+5 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Sanitize the appId passed to `findAppInDirectories` | ||||
| * | | | | | | | Sanitize the appId passed to `findAppInDirectories` | Lukas Reschke | 2015-12-08 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Would have prevented quite some security bugs in the past. Nice hardening for now. | ||||
* | | | | | | | | Merge pull request #21030 from owncloud/querybuilder-new-features | Thomas Müller | 2015-12-08 | 4 | -7/+177 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Querybuilder new features | ||||
| * | | | | | | | | Add a method to the get "to use" table and column name | Joas Schilling | 2015-12-08 | 4 | -3/+59 |
| | | | | | | | | | |||||
| * | | | | | | | | Add select distinct to the query builder | Joas Schilling | 2015-12-08 | 3 | -4/+70 |
| | | | | | | | | | |||||
| * | | | | | | | | Allow getting the last insert id without much hassle | Joas Schilling | 2015-12-08 | 3 | -0/+48 |
| | | | | | | | | |