summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #13952 from owncloud/fix_migrationFrank Karlitschek2015-02-061-5/+1
|\
| * 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 124cmeh2015-02-061-1/+1
* | Merge pull request #13942 from cmeh/patch-2Thomas Müller2015-02-061-1/+1
|\ \
| * | Update installation.phpcmeh2015-02-061-1/+1
| |/
* | Merge pull request #13932 from owncloud/revert-sabredav-etag-masterThomas Müller2015-02-063-20/+15
|\ \ | |/ |/|
| * Revert "adding OC-ETag header"Vincent Petry2015-02-053-20/+15
* | [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 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 - 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.0Lukas Reschke2015-02-051-0/+8
|/ / /
* | | [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 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"Clark Tomlinson2015-02-041-1/+1
|/ / /
* | | Merge pull request #13892 from owncloud/disable-autocompleteClark Tomlinson2015-02-041-1/+1
|\ \ \
| * | | Disable autocomplete for SMTP PasswordLukas Reschke2015-02-041-1/+1
|/ / /
* | | 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 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 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
|\ \ \ | |_|/ |/| |
| * | 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 nowVincent Petry2015-01-301-0/+22
* | | Merge pull request #13837 from owncloud/endless-redirectThomas Müller2015-02-031-0/+1
|\ \ \
| * | | Add callCheck to testremote.phpLukas Reschke2015-02-021-0/+1
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-0336-88/+220
|/ / /
* | | Merge pull request #13822 from owncloud/include-core-version-in-js-version-tagThomas Müller2015-02-021-2/+4
|\ \ \ | |_|/ |/| |
| * | include core version into js/css version tag - fixes #13702Thomas Müller2015-02-021-2/+4
* | | Merge pull request #13817 from owncloud/core-apps-dependenciesMorris Jobke2015-02-023-4/+7
|\ \ \
| * | | add libs which have no version numberThomas Müller2015-02-021-4/+1
| * | | encryption requires openssl and user_ldap requires ldap :speak_no_evil:Thomas Müller2015-02-022-0/+6
* | | | Merge pull request #13811 from owncloud/default-to-nullLukas Reschke2015-02-022-29/+39
|\ \ \ \ | |_|/ / |/| | |
| * | | Mock l10n in the setupLukas Reschke2015-02-011-26/+23
| * | | Add unit tests for empty tokenLukas Reschke2015-02-012-3/+16
| * | | Default to `null` for lostpasswordLukas Reschke2015-02-011-1/+1
* | | | Merge pull request #13790 from owncloud/fix-subadmin-groupThomas Müller2015-02-025-66/+657
|\ \ \ \
| * | | | Consistent variable namingLukas Reschke2015-01-301-10/+9
| * | | | Switch to a factory and add unit testsLukas Reschke2015-01-304-58/+443