summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add internal fileid to webdav responseVincent Petry2015-11-183-3/+22
* Merge pull request #20540 from owncloud/fix-format-call-in-loggerThomas Müller2015-11-181-2/+5
|\
| * fixes #20538Thomas Müller2015-11-161-2/+5
* | Merge pull request #20494 from owncloud/storage-forbidden-exceptionThomas Müller2015-11-1812-5/+270
|\ \
| * | Allow storage wrappers to through a forbidden exception with retry informationJoas Schilling2015-11-1712-5/+270
* | | 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
* | | | Merge pull request #20551 from owncloud/notification-fix-testsThomas Müller2015-11-184-21/+62
|\ \ \ \
| * | | | Add tests for the "return $this" and fix it on the new methodJoas Schilling2015-11-174-21/+62
| | |/ / | |/| |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-11-186-0/+8
* | | | Merge pull request #20188 from owncloud/webdav-exposeshareownerThomas Müller2015-11-175-0/+82
|\ \ \ \
| * | | | Add "owner-id" and "owner-display-name" Webdav propertiesVincent Petry2015-11-163-0/+68
| * | | | Add getOwner() method to FileInfo and Node APIVincent Petry2015-11-132-0/+14
* | | | | Merge pull request #20544 from owncloud/move-index-to-appframeworkThomas Müller2015-11-178-177/+511
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Move index.php from files to AppFrameworkLukas Reschke2015-11-168-177/+511
| | |/ / | |/| |
* | | | Merge pull request #20539 from owncloud/notification-api-adjustmentThomas Müller2015-11-176-141/+97
|\ \ \ \
| * | | | Remove the icon for nowJoas Schilling2015-11-166-141/+0
| * | | | Add "is primary action" to actionsJoas Schilling2015-11-164-0/+97
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-11-172-0/+4
| |/ / / |/| | |
* | | | 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 #20541 from owncloud/password_policy-is-not-experimantalThomas Müller2015-11-161-1/+2
|\ \ \ \
| * | | | password_policy is a shipped appThomas Müller2015-11-161-1/+2
| | |_|/ | |/| |
* | | | 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 #20465 from owncloud/forms.cssThomas Müller2015-11-163-242/+235
|\ \ \ \
| * | | | move form styles from styles.css to inputs.cssHendrik Leppelsack2015-11-133-242/+235
* | | | | Merge pull request #20532 from owncloud/ocs-allow-v2Thomas Müller2015-11-161-2/+4
|\ \ \ \ \
| * | | | | Allow creating OCS v2 links in JSJoas Schilling2015-11-161-2/+4
| | |_|/ / | |/| | |
* | | | | Merge pull request #20447 from owncloud/heading-stylesThomas Müller2015-11-163-8/+7
|\ \ \ \ \
| * | | | | standardize sizes for headingsJan-Christoph Borchardt2015-11-163-8/+7
| |/ / / /
* | | | | Merge pull request #20356 from owncloud/share2.0_getShareThomas Müller2015-11-167-44/+418
|\ \ \ \ \
| * | | | | [Share2.0] OCS Share API getShare uses new codeRoeland Jago Douma2015-11-167-44/+418
| | |_|/ / | |/| | |
* | | | | 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 #20522 from owncloud/update-strengthifyThomas Müller2015-11-165-36/+39
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Update strengthify to 0.4.2Morris Jobke2015-11-165-36/+39
| | |_|/ | |/| |
* | | | 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
| |/ / /
* | | | Merge pull request #20463 from owncloud/sharing-api-integration-tests-adding-...Thomas Müller2015-11-162-12/+256
|\ \ \ \
| * | | | Modified test to PUT only 1 parameter with each updateSergio Bertolin2015-11-121-4/+86
| * | | | Added a test including all the fields of the share update and checking outputSergio Bertolin2015-11-112-3/+86
| * | | | Added a test and logic for checking answer of public sharesSergio Bertolin2015-11-112-9/+88
* | | | | Merge pull request #20510 from owncloud/avatar_unittest_fixThomas Müller2015-11-161-59/+40
|\ \ \ \ \
| * | | | | [Avatar] No need to setup FS for avatar testsRoeland Jago Douma2015-11-141-59/+40
| | |_|/ / | |/| | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-11-162-0/+2
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-11-1520-14/+38
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-11-1430-0/+44
| |_|/ / |/| | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-11-13284-594/+312
|/ / /