aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Merge pull request #21076 from owncloud/occ-shall-not-fail-hard-in-maintenanc...Thomas Müller2015-12-091-4/+6
|\ \ \ \ | |/ / / |/| | |
| * | | 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 dirLukas Reschke2015-12-091-7/+9
* | | | Merge pull request #21019 from owncloud/occ-get-apppathThomas Müller2015-12-092-0/+63
|\ \ \ \
| * | | | 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 shareRoeland Jago Douma2015-12-071-0/+41
| | |_|_|/ | |/| | |
* | | | | Merge pull request #21059 from owncloud/remove-deaed-code-mount-configThomas Müller2015-12-091-52/+6
|\ \ \ \ \
| * | | | | Remove dead codeLukas Reschke2015-12-091-52/+6
* | | | | | Merge pull request #21068 from owncloud/fix-exit-code-autotest-externalThomas Müller2015-12-093-3/+9
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | 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
|\ \ \ \ \
| * | | | | 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 typeLukas Reschke2015-12-092-3/+7
| | |_|/ / | |/| | |
* | | | | Merge pull request #21055 from owncloud/fix-php-docs-for-consoleThomas Müller2015-12-091-1/+10
|\ \ \ \ \
| * | | | | Fix PHPDoc and check if path does existsLukas Reschke2015-12-091-1/+10
| |/ / / /
* | | | | Merge pull request #20995 from owncloud/fix-18734Thomas Müller2015-12-091-1/+5
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | 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 setupMorris Jobke2015-12-091-1/+6
|/ / / /
* | | | Merge pull request #21003 from owncloud/personal-mount-mountidThomas Müller2015-12-092-4/+54
|\ \ \ \
| * | | | 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 passwordRoeland Jago Douma2015-12-071-0/+5
* | | | | | Merge pull request #21038 from owncloud/share-computesharepermissions-notstoreThomas Müller2015-12-0910-31/+76
|\ \ \ \ \ \
| * | | | | | Add explicit check for groups excluded from sharingVincent Petry2015-12-081-1/+1
| * | | | | | 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
| * | | | | | Compute share permissions in the viewVincent Petry2015-12-083-8/+13
* | | | | | | Merge pull request #21043 from owncloud/add-php-docThomas Müller2015-12-091-0/+2
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Add type descriptionLukas Reschke2015-12-081-0/+2
* | | | | | | [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 errorsArthur Schiwon2015-12-081-1/+1
* | | | | | Merge pull request #21018 from owncloud/scrutinizer-patch-1Thomas Müller2015-12-087-16/+66
|\ \ \ \ \ \
| * | | | | | More fixes to the docsJoas Schilling2015-12-083-6/+20
| * | | | | | Scrutinizer Auto-FixesScrutinizer Auto-Fixer2015-12-077-10/+46
* | | | | | | Merge pull request #21031 from owncloud/sanitize-findAppInDirectoriesThomas Müller2015-12-081-1/+5
|\ \ \ \ \ \ \
| * | | | | | | Sanitize the appId passed to `findAppInDirectories`Lukas Reschke2015-12-081-1/+5
* | | | | | | | Merge pull request #21030 from owncloud/querybuilder-new-featuresThomas Müller2015-12-084-7/+177
|\ \ \ \ \ \ \ \
| * | | | | | | | 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
* | | | | | | | | Merge pull request #20786 from owncloud/systemtags-davThomas Müller2015-12-0820-8/+1888
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |