summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #15123 from owncloud/fix_14098blizzz2015-03-232-1/+15
|\
| * offset needs to be considered in computed limitArthur Schiwon2015-03-232-1/+15
* | Merge pull request #13941 from owncloud/fix-folder-upload-on-firefoxLukas Reschke2015-03-231-0/+9
|\ \
| * | Show message if upload of folder isn't allowedMorris Jobke2015-02-061-0/+9
* | | Merge pull request #15120 from owncloud/ldap-occ-fix-warningsMorris Jobke2015-03-234-10/+37
|\ \ \ | |_|/ |/| |
| * | fix PHP warnings when using occ with some LDAP commandsArthur Schiwon2015-03-234-10/+37
* | | Merge pull request #14383 from jknockaert/newbranchClark Tomlinson2015-03-231-130/+160
|\ \ \ | |/ / |/| |
| * | againjknockaert2015-02-191-36/+0
| * | try againjknockaert2015-02-191-0/+36
| |\ \
| | * \ Merge remote-tracking branch 'origin/master'jknockaert2015-02-195-4/+21
| | |\ \
| | | * | OC8 versionjknockaert2015-02-191-196/+170
| | | * | update enc streamjknockaert2014-12-171-136/+161
| | * | | backjknockaert2015-02-191-35/+34
| * | | | new tryjknockaert2015-02-191-130/+160
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-238-2/+18
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-2222-0/+52
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-214-0/+4
* | | | | Merge pull request #14857 from owncloud/preview-provider-registration-in-managerThomas Müller2015-03-203-4/+5
|\ \ \ \ \
| * | | | | Fix controller testJoas Schilling2015-03-161-0/+1
| * | | | | Move mimetype check from template to controllerJoas Schilling2015-03-162-4/+4
| * | | | | Use the PreviewManager where possibleJoas Schilling2015-03-161-2/+2
* | | | | | Merge pull request #11884 from owncloud/ext-appframeworkVincent Petry2015-03-2030-488/+4309
|\ \ \ \ \ \
| * | | | | | Introduce async status checkingRobin McCorkell2015-03-203-10/+9
| * | | | | | Fix PHPDoc in files_external, add missing tagVincent Petry2015-03-178-25/+77
| * | | | | | Fix storage priority in JS unit testVincent Petry2015-03-161-3/+6
| * | | | | | Fix PHPDoc for StoragesControllerVincent Petry2015-03-161-6/+9
| * | | | | | Generate storage config ids when missingVincent Petry2015-03-168-43/+317
| * | | | | | Fix mount config unit testsVincent Petry2015-03-132-26/+56
| * | | | | | Mount options for ext storage are now passed aroundVincent Petry2015-03-1313-6/+109
| * | | | | | Implement priority on client side in hidden inputRobin McCorkell2015-03-122-0/+15
| * | | | | | Use storage id + appframework for ext storage CRUDVincent Petry2015-03-1227-454/+3796
* | | | | | | Do not automatically add "update" permission to shared mountsVincent Petry2015-03-201-2/+1
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-2016-48/+58
* | | | | | | Merge pull request #14946 from owncloud/dropbox-root-fixThomas Müller2015-03-191-1/+6
|\ \ \ \ \ \ \
| * | | | | | | Fix root request path for DropboxVincent Petry2015-03-171-1/+6
* | | | | | | | Merge pull request #15025 from rullzer/ocs_respect_enforced_dateThomas Müller2015-03-191-0/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | Added unit testRoeland Jago Douma2015-03-191-0/+18
* | | | | | | | | Merge pull request #14537 from owncloud/oci-external-shareRobin Appelman2015-03-193-2/+144
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Do not make setupMounts() public just because of testingJoas Schilling2015-03-112-12/+12
| * | | | | | | | Add unit tests for external share manangerRobin Appelman2015-03-102-2/+144
| * | | | | | | | Fix external shares without password on oracleRobin Appelman2015-02-271-1/+1
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-1918-8/+24
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-1830-16/+72
* | | | | | | | | Merge pull request #14954 from owncloud/cache-image-pathRobin McCorkell2015-03-171-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Cache \OC\URLGenerator::imagePathLukas Reschke2015-03-171-1/+1
* | | | | | | | | | add whitespace to prevent file deletion when wanting to scrollJan-Christoph Borchardt2015-03-171-1/+1
* | | | | | | | | | Use a closure for the files app entry and deprecate old methodsJoas Schilling2015-03-171-17/+22
|/ / / / / / / / /
* | | | | | | | | Fix PHPDoc and Co.Lukas Reschke2015-03-171-4/+12
* | | | | | | | | Merge pull request #14929 from owncloud/s2s-scanner-warningsVincent Petry2015-03-171-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix scanFile signature warningsVincent Petry2015-03-161-1/+1
| | |_|_|/ / / / / | |/| | | | | | |