aboutsummaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #10522 from owncloud/removeLoadAppScriptblizzz2014-08-216-4/+84
|\
| * 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 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
|\ \ \
| * | | 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
|\ \ \ \ | |/ / / |/| | |
| * | | move to public namespaceMorris Jobke2014-08-192-2/+2
| * | | Fix STORAGE_* constants usage by moving those constants into \OC\Files\Filesy...Stephan Peijnik2014-08-192-2/+2
* | | | Merge pull request #10423 from owncloud/urlencode_s3_copyobject_copysourceJörn Friedrich Dreyer2014-08-201-2/+3
|\ \ \ \ | |_|/ / |/| | |
| * | | 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 #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
|\ \ \
| * | | 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, getUser should always return false during public u...Bjoern Schiessle2014-08-181-1/+3
| | |/ | |/|
* | | Merge pull request #10492 from owncloud/hidesharesectionswhendisabledMorris Jobke2014-08-191-14/+18
|\ \ \
| * | | 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
|\ \ \ | |/ / |/| |
| * | 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
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-1816-1/+20
* | | Merge pull request #10407 from owncloud/rm-obsolete-japaneseLukas Reschke2014-08-178-330/+0
|\ \ \
| * | | remove obsolete japanese lang codeVolkan Gezer2014-08-138-330/+0
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-1716-2/+91
* | | | Merge pull request #10276 from owncloud/skip-webdavputLukas Reschke2014-08-161-1/+1
|\ \ \ \
| * | | | login as user1 before performing a testBjoern Schiessle2014-08-151-1/+1
* | | | | Merge pull request #10447 from owncloud/share-foldericonfixMorris Jobke2014-08-161-16/+6
|\ \ \ \ \
| * | | | | Fixed folder icon update routine when share owner existsVincent Petry2014-08-151-16/+6
| |/ / / /
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-1619-1/+108
* | | | | Merge pull request #10449 from owncloud/share-clientsidesortnoservercallLukas Reschke2014-08-152-5/+23
|\ \ \ \ \
| * | | | | Client side sort for sharing overviewVincent Petry2014-08-152-5/+23
| |/ / / /
* / / / / ssl capitalVolkan Gezer2014-08-151-1/+1
|/ / / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-154-9/+9
* | | | Merge pull request #10374 from ogasser/compare_upload_limit_against_biggest_fileJan-Christoph Borchardt2014-08-141-4/+7
|\ \ \ \
| * | | | Compare upload limit against biggest fileOliver Gasser2014-08-121-4/+7