summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-11-208-10/+16
* Merge pull request #20611 from owncloud/files-newmenuremovetextfileThomas Müller2015-11-192-34/+59
|\
| * Remove "Text file" entry in the "+" menuVincent Petry2015-11-192-34/+59
* | Adding an existing sharee is idempotentThomas Müller2015-11-192-10/+30
* | Implement CSRF protectionThomas Müller2015-11-193-1/+26
* | Addressbook sharing added based on a simplified approach which is based on ca...Thomas Müller2015-11-1910-5/+605
|/
* Merge pull request #20537 from owncloud/add-internal-locking-to-new-webdav-en...Thomas Müller2015-11-193-15/+10
|\
| * Add internal locking plugin - fixes #20502Thomas Müller2015-11-163-15/+10
* | Merge pull request #20594 from owncloud/use-proper-variableThomas Müller2015-11-191-1/+1
|\ \
| * | Use proper variableLukas Reschke2015-11-181-1/+1
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-11-192-0/+4
|/ /
* | Merge pull request #20584 from owncloud/fileinfo-owner-external-shareRobin Appelman2015-11-181-1/+6
|\ \
| * | Implement getOwner for external share storageRobin Appelman2015-11-181-1/+6
* | | Merge pull request #20371 from owncloud/add-caldav-2Thomas Müller2015-11-188-7/+1988
|\ \ \ | |/ / |/| |
| * | Use uri as displaynameThomas Müller2015-11-162-20/+13
| * | components was not written to the databaseThomas Müller2015-11-162-0/+5
| * | Add occ command to create a new calendarThomas Müller2015-11-162-0/+54
| * | Add scheduling backendThomas Müller2015-11-162-4/+68
| * | Fix OracleThomas Müller2015-11-161-1/+1
| * | Introducing CalDAV into coreThomas Müller2015-11-166-7/+1872
* | | Add internal fileid to webdav responseVincent Petry2015-11-183-3/+22
* | | Merge pull request #20494 from owncloud/storage-forbidden-exceptionThomas Müller2015-11-188-5/+206
|\ \ \
| * | | Allow storage wrappers to through a forbidden exception with retry informationJoas Schilling2015-11-178-5/+206
* | | | Merge pull request #20546 from owncloud/provision_api_fixThomas Müller2015-11-182-10/+3
|\ \ \ \
| * | | | Return empty list if group does not have subadminsRoeland Jago Douma2015-11-162-10/+3
| |/ / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-11-184-0/+6
* | | | Merge pull request #20188 from owncloud/webdav-exposeshareownerThomas Müller2015-11-173-0/+68
|\ \ \ \
| * | | | Add "owner-id" and "owner-display-name" Webdav propertiesVincent Petry2015-11-163-0/+68
* | | | | Move index.php from files to AppFrameworkLukas Reschke2015-11-165-164/+482
| |/ / / |/| | |
* | | | Merge pull request #20292 from owncloud/provisioning_api_group_unittestThomas Müller2015-11-163-137/+277
|\ \ \ \
| * | | | Moved grouptest over to pure unit testsRoeland Jago Douma2015-11-163-137/+277
* | | | | Merge pull request #20534 from owncloud/sftp-parse-hostRobin Appelman2015-11-162-14/+62
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fix parsing of sftp hosts when using ipv6Robin Appelman2015-11-162-14/+62
| |/ / /
* | | | Merge pull request #20447 from owncloud/heading-stylesThomas Müller2015-11-161-3/+1
|\ \ \ \
| * | | | standardize sizes for headingsJan-Christoph Borchardt2015-11-161-3/+1
| |/ / /
* | | | Merge pull request #20356 from owncloud/share2.0_getShareThomas Müller2015-11-163-26/+347
|\ \ \ \
| * | | | [Share2.0] OCS Share API getShare uses new codeRoeland Jago Douma2015-11-163-26/+347
| |/ / /
* | | | Merge pull request #18605 from owncloud/api-adduser-for-subadminsThomas Müller2015-11-163-8/+420
|\ \ \ \ | |/ / / |/| | |
| * | | Added unit test for new functionalityRoeland Jago Douma2015-11-122-7/+347
| * | | enable api addUser for subadminsmichag862015-11-123-8/+80
* | | | Merge pull request #20505 from owncloud/fakelocking-for-macThomas Müller2015-11-167-5/+386
|\ \ \ \ | |_|_|/ |/| | |
| * | | Add fake locker plugin for WebDAVFSLukas Reschke2015-11-137-5/+386
| | |/ | |/|
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-11-162-0/+2
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-11-1514-14/+32
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-11-1420-0/+34
|/ /
* / [tx-robot] updated from transifexJenkins for ownCloud2015-11-13196-452/+256
|/
* Merge pull request #20469 from seal20/seal20-fix-one-string-in-user_ldapThomas Müller2015-11-121-1/+1
|\
| * changed 1.000 to 1,000sylvain2015-11-121-1/+1
* | Merge pull request #20460 from owncloud/file-handling-wordingThomas Müller2015-11-121-4/+2
|\ \
| * | fix layout and wording for file handling admin settingJan-Christoph Borchardt2015-11-111-4/+2