summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* [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
* | | | Merge pull request #12552 from szlwzl/masterThomas Müller2014-12-031-1/+1
|\ \ \ \
| * | | | adding @ sign between email address and domain name to make the syntax clearerSimon Whittaker2014-12-021-1/+1
| | |_|/ | |/| |
* | | | Merge pull request #12572 from owncloud/issue/12571-disabled-preview-logfloodLukas Reschke2014-12-031-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Stop flooding the log, when previews are disabledJoas Schilling2014-12-031-1/+1
* | | | Merge pull request #12553 from owncloud/default-iosidThomas Müller2014-12-031-0/+8
|\ \ \ \
| * | | | add missing public interface for iOS client app idMorris Jobke2014-12-021-0/+8
| | |/ / | |/| |
* | | | Merge pull request #12556 from owncloud/add-route-for-versionsThomas Müller2014-12-032-1/+3
|\ \ \ \
| * | | | Add route for download of versionsLukas Reschke2014-12-022-1/+3
* | | | | Merge pull request #12563 from owncloud/usermenu-remove-borderVolkan Gezer2014-12-031-2/+2
|\ \ \ \ \
| * | | | | remove border from user menu, adjust to apps menuJan-Christoph Borchardt2014-11-281-2/+2
* | | | | | Merge pull request #12565 from owncloud/config-sample-databasesVincent Petry2014-12-031-7/+13
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | add proper description what database is supported by CE and EEMorris Jobke2014-12-031-7/+13
* | | | | | Merge pull request #12554 from owncloud/versions-app-autoloadLukas Reschke2014-12-035-8/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Autoload exception from files_trashbinJoas Schilling2014-12-022-2/+0
| * | | | | Autoload lib files of versions appJoas Schilling2014-12-023-6/+0
| | |_|/ / | |/| | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-0324-88/+128
* | | | | Merge pull request #10881 from owncloud/touch-statcacheRobin Appelman2014-12-022-0/+2
|\ \ \ \ \
| * | | | | also clear statcache in mapped localRobin Appelman2014-12-021-0/+1
| * | | | | Clear statcache before getting the mtime from local storage backendsRobin Appelman2014-12-021-0/+1
| |/ / / /
* | | | | Merge pull request #12333 from owncloud/delete-selected-filesMorris Jobke2014-12-023-10/+42
|\ \ \ \ \
| * | | | | Add js unit testRobin Appelman2014-11-261-7/+27