summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Use the mount config api for files_externalRobin Appelman2014-12-044-18/+48
* Add public api for mount configurationsRobin Appelman2014-12-0422-72/+298
* Merge pull request #12616 from owncloud/node-fileinfoMorris Jobke2014-12-047-74/+133
|\
| * make \OC\Files\Node\Node implement the FileInfo interfaceRobin Appelman2014-12-047-74/+133
* | Merge pull request #12607 from owncloud/this-is-an-awesome-dayClark Tomlinson2014-12-043-27/+3
|\ \
| * | PHP 5.4 is now required for masterLukas Reschke2014-12-043-27/+3
* | | Merge pull request #12596 from owncloud/remove-travis-tracesMorris Jobke2014-12-043-53/+1
|\ \ \
| * | | PHP < 5.4 is not supported anymore - see #12606Morris Jobke2014-12-041-8/+0
| * | | Remove last traces of travis integrationMorris Jobke2014-12-043-47/+3
* | | | Merge pull request #12609 from owncloud/remove-53-fixmeThomas Müller2014-12-041-18/+2
|\ \ \ \
| * | | | Remove workaround for 5.3Lukas Reschke2014-12-041-18/+2
| |/ / /
* | | | Merge pull request #12533 from owncloud/app-dependencies-php-versionThomas Müller2014-12-0411-15/+378
|\ \ \ \
| * | | | no nested xml tags on dependenciesThomas Müller2014-12-044-17/+13
| * | | | fix an issue where the types tag holds an empty stringThomas Müller2014-12-041-4/+8
| * | | | adding command dependencyThomas Müller2014-12-042-1/+17
| * | | | adjust dependency analyzer to use attributes properlyThomas Müller2014-12-042-18/+31
| * | | | switch to different parsing implementation to get xml attributes properly han...Thomas Müller2014-12-046-56/+75
| * | | | adding supported databasesThomas Müller2014-12-046-3/+72
| * | | | display missing dependencies in the apps management pageThomas Müller2014-12-042-0/+17
| * | | | introduce dependency analyzer to take care of app dependenciesThomas Müller2014-12-048-9/+227
| * | | | adding new dependency for php version in apps info.xmlThomas Müller2014-12-042-1/+9
| * | | | adding default key value pair for 'types'Thomas Müller2014-12-041-0/+3
| * | | | translate labels properlyThomas Müller2014-12-041-2/+2
| |/ / /
* | | | Merge pull request #12610 from owncloud/remove_php_version_checkBjörn Schießle2014-12-042-6/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | update error messageBjoern Schiessle2014-12-041-1/+1
| * | | OC8 and later requires PHP >= 5.4, so we can remove the check from the encryp...Bjoern Schiessle2014-12-041-5/+1
| |/ /
* | | Merge pull request #12522 from owncloud/bower-jstzMorris Jobke2014-12-0417-365/+675
|\ \ \ | |/ / |/| |
| * | move jstz to bower managementMorris Jobke2014-12-017-359/+409
| * | include lock files of bower to be able to use "bower install"Morris Jobke2014-12-0112-6/+266
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-046-2/+16
* | | Merge pull request #12581 from owncloud/fix_typoThomas Müller2014-12-031-1/+1
|\ \ \
| * | | fix typoBjoern Schiessle2014-12-031-1/+1
|/ / /
* | | Merge pull request #12544 from owncloud/fix-windows-unittestsThomas Müller2014-12-0321-35/+43
|\ \ \
| * | | Replace uniqid calls with $this->getUniqueID so tests pass again on windowsJoas Schilling2014-12-0321-35/+43
* | | | Merge pull request #12579 from owncloud/drop-files-external-testsThomas Müller2014-12-032-3/+1
|\ \ \ \
| * | | | drop files_external tests from autotest - they will be executed with autotest...Morris Jobke2014-12-032-3/+1
* | | | | Merge pull request #12542 from owncloud/update-autotestcmdJoas Schilling2014-12-031-17/+38
|\ \ \ \ \
| * | | | | Restore the development config after running the testsJoas Schilling2014-12-021-3/+17
| * | | | | Allow overwriting DATADIR completly so ramdisk can be usedJoas Schilling2014-12-021-5/+5
| * | | | | Allow passing a test file just like in autotest.shJoas Schilling2014-12-021-7/+7
| * | | | | Better manage the output when running autotest.cmdJoas Schilling2014-12-021-5/+12
| | |/ / / | |/| | |
* | | | | Merge pull request #12492 from owncloud/deprecate-passwordsaltLukas Reschke2014-12-031-0/+3
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Officially deprecated passwordsaltLukas Reschke2014-12-031-0/+3
* | | | | Merge pull request #12382 from owncloud/enc_reorganize_folders2Morris Jobke2014-12-0325-1674/+1172
|\ \ \ \ \
| * | | | | small fixesBjoern Schiessle2014-12-021-2/+2
| * | | | | delete old keys if file was moved to a different mount pointBjoern Schiessle2014-12-021-4/+10
| * | | | | upgrade to new folder structureBjoern Schiessle2014-12-0218-341/+483
| * | | | | change private/public key names for consistency reasonsBjoern Schiessle2014-11-2611-226/+202
| * | | | | harmonize copyright noticeBjoern Schiessle2014-11-267-18/+28
| * | | | | new folder structure for keysBjoern Schiessle2014-11-2615-1162/+526