aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-01-1516-8/+160
* Merge pull request #13352 from owncloud/hhvm-array-keyRobin McCorkell2015-01-151-5/+6
|\
| * Do not use key() on array as the result depends on the internal array pointer.Andreas Fischer2015-01-151-5/+6
* | Merge pull request #13354 from owncloud/hhvm-redisMorris Jobke2015-01-151-0/+10
|\ \
| * | HHVM: Prevent E_WARNING messages by Redis test in console output.Andreas Fischer2015-01-141-0/+10
| |/
* | Merge pull request #13317 from owncloud/partfile-fileinfoThomas Müller2015-01-142-0/+45
|\ \
| * | Return valid fileinfo objects for part filesRobin Appelman2015-01-132-0/+45
* | | Merge pull request #13344 from owncloud/issue/13334-cleanup-tags-repairstepMorris Jobke2015-01-143-1/+260
|\ \ \
| * | | Add a repair step to clean up orphan tags and tag entriesJoas Schilling2015-01-143-1/+260
* | | | Merge pull request #13367 from owncloud/type-hint-server-method-from-requestMorris Jobke2015-01-141-1/+3
|\ \ \ \
| * | | | Add PHPDoc for magic property 'server'Lukas Reschke2015-01-141-1/+3
* | | | | Merge pull request #13350 from owncloud/autoload-translationsMorris Jobke2015-01-149-11/+4
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | ignore coreBernhard Posselt2015-01-141-1/+4
| * | | | move check into addTranslation methodBernhard Posselt2015-01-141-11/+1
| * | | | dont load core scritpsBernhard Posselt2015-01-141-1/+3
| * | | | Remove unneeded addTranslations() callsVincent Petry2015-01-148-11/+0
| * | | | only load translsations for appsBernhard Posselt2015-01-141-1/+3
| * | | | make translation lookup faster (O(n) -> O(1))Bernhard Posselt2015-01-141-2/+2
| * | | | autoload app's js translationsBernhard Posselt2015-01-141-0/+7
* | | | | Merge pull request #13351 from owncloud/check-for-existenceLukas Reschke2015-01-141-2/+2
|\ \ \ \ \
| * | | | | Check for existence of $_GET keysLukas Reschke2015-01-141-2/+2
* | | | | | Merge pull request #13349 from owncloud/kill-deprecated-code-sharingThomas Müller2015-01-143-50/+51
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | remove deprecated code - fixes #13119Thomas Müller2015-01-143-50/+51
| | |_|_|/ | |/| | |
* | | | | Merge pull request #13348 from owncloud/fix-app-required-oc-version-checkMorris Jobke2015-01-143-4/+59
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Check new and old ways of required oC version for app compatibilityJoas Schilling2015-01-143-4/+59
* | | | | Merge pull request #13345 from owncloud/increase-files-external-versionsMorris Jobke2015-01-142-2/+5
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Increase files_externals oC required version and its own versionJoas Schilling2015-01-142-2/+5
| | |/ / | |/| |
* | | | Merge pull request #13341 from owncloud/update-readversionfromtemplateMorris Jobke2015-01-142-5/+9
|\ \ \ \ | |_|/ / |/| | |
| * | | Read version and product name from update templateVincent Petry2015-01-142-5/+9
| |/ /
* | | Merge pull request #13332 from oparoz/fix-download-buttonThomas Müller2015-01-141-1/+6
|\ \ \
| * | | Download the current public folder onlyOlivier Paroz2015-01-141-1/+6
* | | | Merge pull request #13286 from owncloud/sharing_upgradeBjörn Schießle2015-01-144-1/+131
|\ \ \ \
| * | | | set accept to 1 (=true) for all server-to-server shares on update, at this po...Bjoern Schiessle2015-01-134-1/+131
* | | | | Merge pull request #13288 from owncloud/enc_fix_public_downloadLukas Reschke2015-01-143-25/+14
|\ \ \ \ \
| * | | | | if we download a public shared file we need to retrieve the user from the pathBjoern Schiessle2015-01-133-25/+14
| |/ / / /
* | | | | Merge pull request #13335 from owncloud/disable-rememberme-files-externalThomas Müller2015-01-141-0/+1
|\ \ \ \ \
| * | | | | The files_external app might need the password so autologin must be disabledJoas Schilling2015-01-141-0/+1
| | |_|/ / | |/| | |
* | | | | Merge pull request #13311 from owncloud/fix_restore_keysBjörn Schießle2015-01-145-42/+145
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | adapt decrypt all and restore/delete key backups to the new folder structure ...Bjoern Schiessle2015-01-135-42/+145
* | | | | Merge pull request #13325 from owncloud/kill-strip-slashesMorris Jobke2015-01-145-9/+8
|\ \ \ \ \
| * | | | | Get rid of `stripslashes()`Lukas Reschke2015-01-135-9/+8
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-14176-12/+452
| |_|_|/ / |/| | | |
* | | | | Merge pull request #13320 from owncloud/fix-php-doc-for-files-viewMorris Jobke2015-01-131-1/+11
|\ \ \ \ \
| * | | | | drop unused parameterMorris Jobke2015-01-131-2/+1
| * | | | | Fix annotations in file viewLukas Reschke2015-01-131-0/+11
| |/ / / /
* | | | | Merge pull request #13318 from owncloud/fix-annotationMorris Jobke2015-01-131-3/+3
|\ \ \ \ \
| * | | | | Fix PHP doc and enforce typeLukas Reschke2015-01-131-3/+3
| |/ / / /
* | | | | Merge pull request #13316 from owncloud/drop-dead-codeMorris Jobke2015-01-131-4/+0
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | drop dead code - ref #13301Morris Jobke2015-01-131-4/+0
|/ / / /
* | | | Merge pull request #13217 from owncloud/make-basic-auth-work-againBernhard Posselt2015-01-131-13/+15
|\ \ \ \