summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* fix wizard test, adjust to changed parameters of the tested method, ↵Arthur Schiwon2014-08-281-1/+1
| | | | introduced by 9caa354cfc1f73159f335646ca89be4db72b125e
* Port of #8623Arthur Schiwon2014-08-282-1/+79
| | | | | | | | | set result entry identifier earlier, i.e. before a continue for the same level can happen. otherwise will always get the same value and we end up in an infinite loop add unit test to make sure the infinite loop never comes back Conflicts: apps/user_ldap/tests/wizard.php
* [tx-robot] updated from transifexJenkins for ownCloud2014-08-2814-11/+25
|
* [tx-robot] updated from transifexJenkins for ownCloud2014-08-273-1/+3
|
* [tx-robot] updated from transifexJenkins for ownCloud2014-08-2614-11/+48
|
* Merge pull request #10421 from owncloud/share-external-deleteClark Tomlinson2014-08-251-1/+11
|\ | | | | Remove no longer existing files from the cache when scanning external storage
| * Remove no longer existing files from the cache when scanning external storageRobin Appelman2014-08-141-1/+11
| |
* | Merge pull request #10108 from owncloud/files_external-allowed-backendVincent Petry2014-08-251-6/+10
|\ \ | | | | | | Only load personal external storages for allowed backends
| * | Only load personal external storages for allowed backendsRobin Appelman2014-08-011-6/+10
| | |
* | | Merge pull request #10591 from owncloud/routes_for_files_externalVincent Petry2014-08-251-0/+17
|\ \ \ | | | | | | | | explicit routes for files_external
| * | | explicit routes for files_externalJörn Friedrich Dreyer2014-08-221-0/+17
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-254-1/+6
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-2410-4/+18
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-238-11/+25
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-225-3/+20
| | |
* | | Merge pull request #10522 from owncloud/removeLoadAppScriptblizzz2014-08-216-4/+84
|\ \ \ | | | | | | | | Remove loadAppScriptFile
| * | | Add routing to user_ldapLukas Reschke2014-08-191-0/+22
| | | |
| * | | Add routing to files_versionsLukas Reschke2014-08-191-0/+5
| | | |
| * | | Add routing to files_trashbinLukas Reschke2014-08-191-0/+9
| | | |
| * | | Add routing to files_encryptionLukas Reschke2014-08-191-0/+13
| | | |
| * | | Add routing to files_sharingLukas Reschke2014-08-191-4/+8
| | | |
| * | | Use proper routes for filesLukas Reschke2014-08-191-0/+27
| | | |
* | | | Merge pull request #10548 from owncloud/encryption-app-descriptionMorris Jobke2014-08-211-2/+2
|\ \ \ \ | | | | | | | | | | Better description to prevent people from misunderstanding the use case of encryption app
| * | | | Better description to prevent people from misunderstanding the use caseBernhard Posselt2014-08-211-2/+2
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-212-2/+2
| | | | |
* | | | | Merge pull request #10562 from Volker-E/masterClark Tomlinson2014-08-201-1/+1
|\ \ \ \ \ | | | | | | | | | | | | fixing #10561 & HTML structure
| * | | | | fix HTML structure by rmv. obsolete input end tagVolker E.2014-08-201-1/+1
| | | | | |
* | | | | | Merge pull request #10518 from owncloud/fix_storage_const_autoloadLukas Reschke2014-08-202-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix storage const autoload
| * | | | | move to public namespaceMorris Jobke2014-08-192-2/+2
| | | | | |
| * | | | | Fix STORAGE_* constants usage by moving those constants into ↵Stephan Peijnik2014-08-192-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | \OC\Files\Filesystem. As constants not defined within a class cannot be automatically found by the autoloader moving those constants into a class makes them accessible to code which uses them. Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>
* | | | | | Merge pull request #10423 from owncloud/urlencode_s3_copyobject_copysourceJörn Friedrich Dreyer2014-08-201-2/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | urlencode s3 copyObject() copysource
| * | | | | use S3Client::encodeKey(), fixes #8325Jörn Friedrich Dreyer2014-08-141-2/+3
| | |_|_|/ | |/| | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-2058-57/+12
| | | | |
* | | | | Merge pull request #10525 from owncloud/remove-download-messageClark Tomlinson2014-08-191-1/+0
|\ \ \ \ \ | | | | | | | | | | | | remove obsolete 'Download preparing' message for zip downloads, fix #3755
| * | | | | remove obsolete 'Download preparing' message for zip downloads, fix #3755Jan-Christoph Borchardt2014-08-191-1/+0
| | |/ / / | |/| | |
* / | | | fix multiselect bar offset on shared pageJan-Christoph Borchardt2014-08-191-1/+2
|/ / / /
* | | | Merge pull request #10425 from owncloud/set_default_share_folderBjörn Schießle2014-08-197-4/+118
|\ \ \ \ | | | | | | | | | | Set default share folder
| * | | | Fix copyrightLukas Reschke2014-08-181-1/+1
| | | | |
| * | | | fix broken unit testsBjoern Schiessle2014-08-181-3/+5
| | | | |
| * | | | update unit tests with configurable share folderBjoern Schiessle2014-08-183-0/+76
| | | | |
| * | | | make share folder configurableBjoern Schiessle2014-08-183-1/+37
| |/ / /
* | | | Merge pull request #10494 from owncloud/fix_upload_to_public_folderBjörn Schießle2014-08-191-1/+3
|\ \ \ \ | | | | | | | | | | set incognitoMode to true during upload to a public folder
| * | | | set incognitoMode to true, getUser should always return false during public ↵Bjoern Schiessle2014-08-181-1/+3
| | |/ / | |/| | | | | | | | | | upload
* | | | Merge pull request #10492 from owncloud/hidesharesectionswhendisabledMorris Jobke2014-08-191-14/+18
|\ \ \ \ | | | | | | | | | | Hide sharing sections in files app when sharing API is disabled
| * | | | Hide sharing sections in files app when sharing API is disabledVincent Petry2014-08-181-14/+18
| |/ / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-1917-4/+51
| | | |
* | | | Merge pull request #10340 from owncloud/fix-9887blizzz2014-08-186-2/+124
|\ \ \ \ | |/ / / |/| | | better check whether string resembles a DN, fixes #9887
| * | | unify testsArthur Schiwon2014-08-181-55/+36
| | | |
| * | | adjust login test to code changesArthur Schiwon2014-08-121-0/+5
| | | |
| * | | better check whether string resembles a DN, fixes #9887Arthur Schiwon2014-08-115-2/+138
| | | |