summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 8.0 finalv8.0.0Frank Karlitschek2015-02-061-2/+2
|
* Merge pull request #13960 from owncloud/revert-13692-capabilitiesLukas Reschke2015-02-073-280/+0
|\ | | | | Revert "Add OCS sharing info to capabilities"
| * Revert "Add OCS sharing info to capabilities"Lukas Reschke2015-02-073-280/+0
|/
* Merge pull request #13692 from rullzer/capabilitiesFrank Karlitschek2015-02-063-0/+280
|\ | | | | Add OCS sharing info to capabilities
| * Updated unit testsRoeland Jago Douma2015-02-061-43/+123
| |
| * Bit better formatting when using json outputRoeland Jago Douma2015-02-061-2/+4
| |
| * Updated sharing capabilitiesRoeland Jago Douma2015-02-061-9/+15
| | | | | | | | | | | | Moved to files_sharing Added more capabilities. Tried to order to capabilities more OO style
| * Split up unit testsRoeland Jago Douma2015-02-041-16/+24
| |
| * Added unit test to test getCapabilities for files_sharingRoeland Jago Douma2015-02-041-0/+113
| |
| * Converted getCapabilities to non static functionRoeland Jago Douma2015-02-041-7/+24
| |
| * Use single quotesRoeland Jago Douma2015-02-041-7/+7
| |
| * Only return capabilities if they are setRoeland Jago Douma2015-02-041-14/+8
| |
| * Added capabilities whether a server allows public linksRoeland Jago Douma2015-02-042-0/+60
| | | | | | | | | | | | This fixes #13673. It now lists link sharing, passwords enforced, and if public uploads are allowed.
* | Merge pull request #13954 from owncloud/fix-enc-mig-user-retrievalThomas Müller2015-02-062-7/+18
|\ \ | | | | | | Fix enc mig user retrieval
| * | always specify limit, except you do like questionable surprisesArthur Schiwon2015-02-062-7/+18
| | | | | | | | | | | | always specify limit, except you do like questionable surprises, part 2
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-0670-296/+420
| | |
* | | Merge pull request #13952 from owncloud/fix_migrationFrank Karlitschek2015-02-061-5/+1
|\ \ \ | | | | | | | | [encryption] don't check if we have a valid user during migration
| * | | don't check if we have a valid userBjoern Schiessle2015-02-061-5/+1
| |/ /
* / / Normalize before processingLukas Reschke2015-02-064-8/+51
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2015-02-0626-16/+70
| |
* | Merge pull request #13937 from cmeh/patch-1Thomas Müller2015-02-061-1/+1
|\ \ | | | | | | Coherent use of "SQLite" in lines 119 and 124
| * | Coherent use of "SQLite" in lines 119 and 124cmeh2015-02-061-1/+1
| | | | | | | | | Just a cosmetic detail, but very obvious when working on localisations.
* | | Merge pull request #13942 from cmeh/patch-2Thomas Müller2015-02-061-1/+1
|\ \ \ | | | | | | | | Coherent use of "SQLite" in lines 159 and 161
| * | | Update installation.phpcmeh2015-02-061-1/+1
| |/ / | | | | | | In line 161, "SQLite" has now the same capitalisation as in line 159.
* | | Merge pull request #13932 from owncloud/revert-sabredav-etag-masterThomas Müller2015-02-063-20/+15
|\ \ \ | |/ / |/| | Revert "adding OC-ETag header"
| * | Revert "adding OC-ETag header"Vincent Petry2015-02-053-20/+15
| | | | | | | | | | | | This reverts commit 96a931929ea837a40a7e9b836252587c949a8127.
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-06164-288/+398
| | |
* | | Merge pull request #13933 from owncloud/enhance-sqlite-warning-2Thomas Müller2015-02-052-2/+2
|\ \ \ | | | | | | | | Don't highly discourage
| * | | Don't highly discourageThomas Müller2015-02-052-2/+2
|/ / /
* | | Merge pull request #13907 from owncloud/enhance-sqlite-warningBernhard Posselt2015-02-052-3/+18
|\ \ \ | | | | | | | | enhance sqlite warning on admin page as well as during setup
| * | | enhance sqlite warning on admin page as well as during setup - fixes #13906Thomas Müller2015-02-042-3/+18
| | | |
* | | | Merge pull request #13918 from owncloud/add-warning-for-54Lukas Reschke2015-02-051-0/+8
|\ \ \ \ | | | | | | | | | | Show warning for PHP versions older than 5.4.0
| * | | | Show warning for PHP versions older than 5.4.0Lukas Reschke2015-02-051-0/+8
|/ / / / | | | | | | | | | | | | We can't check the PHP version in the installer since base.php already used 5.4 syntax. Thus for a better UX we show a simple warning instead of a fatal PHP error.
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-058-38/+134
| | | |
* | | | 8.0.0 RC2v8.0.0RC2Frank Karlitschek2015-02-041-2/+2
|/ / /
* | | Merge pull request #13897 from owncloud/fix-13644blizzz2015-02-041-1/+6
|\ \ \ | | | | | | | | fix user loading
| * | | fix user loadingArthur Schiwon2015-02-041-1/+6
| | |/ | |/|
* | | Merge pull request #13894 from owncloud/revert-13892-disable-autocompleteLukas Reschke2015-02-041-1/+1
|\ \ \ | | | | | | | | Revert "Disable autocomplete for SMTP Password"
| * | | Revert "Disable autocomplete for SMTP Password"Clark Tomlinson2015-02-041-1/+1
|/ / /
* | | Merge pull request #13892 from owncloud/disable-autocompleteClark Tomlinson2015-02-041-1/+1
|\ \ \ | | | | | | | | Disable autocomplete for SMTP Password
| * | | Disable autocomplete for SMTP PasswordLukas Reschke2015-02-041-1/+1
|/ / / | | | | | | | | | While really nearly no modern browser cares about it anymore too much it's still not wrong to have it here (and also stops some automated scanners reporting this...)
* | | Merge pull request #13881 from owncloud/upload_to_root_of_mountpointBjörn Schießle2015-02-042-0/+27
|\ \ \ | | | | | | | | detect root of mountpoint also if the trailing slash is missed
| * | | detect root of mountpoint also if the trailing slash is missedBjoern Schiessle2015-02-042-0/+27
| | |/ | |/|
* | | Merge pull request #13849 from owncloud/ldap-oc8-updateblizzz2015-02-042-49/+1
|\ \ \ | |_|/ |/| | no update routine needed from OC 7 to 8
| * | no update routine needed from OC 7 to 8Arthur Schiwon2015-02-032-49/+1
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-0426-32/+226
| | |
* | | Merge pull request #13843 from owncloud/fix-files-disabledThomas Müller2015-02-035-2/+65
|\ \ \ | |_|/ |/| | Fix disabled files app
| * | enabled disabled files app in repair stepMorris Jobke2015-02-034-2/+54
| | |
| * | Disallow disabling of files appMorris Jobke2015-02-033-2/+13
| | |
* | | Merge pull request #13791 from owncloud/extstorage-fixdavexceptionsThomas Müller2015-02-031-0/+22
|\ \ \ | |_|/ |/| | Fix DAV exceptions, some will still return false now