summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | Add unit testsLukas Reschke2015-01-304-19/+211
| * | | | Fix subadmin listing of groupLukas Reschke2015-01-301-6/+21
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-0220-44/+62
* | | | | Merge pull request #13810 from owncloud/tdomainThomas Müller2015-02-011-2/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | fix trusted domain localizationVolkan Gezer2015-02-011-2/+2
|/ / / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-0112-4/+28
* | | | Merge pull request #13797 from owncloud/fix_move_del_of_remote_sharesLukas Reschke2015-01-313-3/+3
|\ \ \ \
| * | | | no need to initialize the same view twiceBjoern Schiessle2015-01-301-1/+0
| * | | | get correct user for paths to the trash bin, needed for remote shares if the ...Bjoern Schiessle2015-01-302-2/+3
| | |_|/ | |/| |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-3160-178/+296
* | | | 8.0.0 RC1v8.0.0RC1Frank Karlitschek2015-01-281-2/+2
| |_|/ |/| |
* | | Merge pull request #13804 from owncloud/check-return-before-assuming-arrayJoas Schilling2015-01-301-8/+12
|\ \ \ | |_|/ |/| |
| * | Check whether return is an error case before using itJoas Schilling2015-01-301-8/+12
|/ /
* | Merge pull request #13508 from owncloud/failed-delete-cacheMorris Jobke2015-01-305-7/+72
|\ \ | |/ |/|
| * Dont do a cache rename if we cant delete the source fileRobin Appelman2015-01-292-3/+5
| * Make sure we delete the file when doing a cross storage trashbin moveRobin Appelman2015-01-291-0/+2
| * Detect failed deletes in the trashbinRobin Appelman2015-01-292-3/+41
| * Dont remove a file from cache if the delete operation failedRobin Appelman2015-01-292-1/+24
* | [tx-robot] updated from transifexJenkins for ownCloud2015-01-3092-106/+114
* | Merge pull request #13774 from owncloud/fix-exception-cssRobin McCorkell2015-01-291-0/+2
|\ \
| * | add CSS to exception page - fixes #13747Morris Jobke2015-01-291-0/+2
* | | Merge pull request #13772 from owncloud/closecursor-allconfigVincent Petry2015-01-291-0/+1
|\ \ \ | |/ / |/| |
| * | Close cursor after checking for existing config valuesVincent Petry2014-11-281-0/+1
* | | Merge pull request #13760 from owncloud/create_enc_key_for_remote_sharesMorris Jobke2015-01-293-66/+145
|\ \ \ | |/ / |/| |
| * | Fix intendationJoas Schilling2015-01-291-3/+3