Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add internal fileid to webdav response | Vincent Petry | 2015-11-18 | 3 | -3/+22 |
* | Merge pull request #20540 from owncloud/fix-format-call-in-logger | Thomas Müller | 2015-11-18 | 1 | -2/+5 |
|\ | |||||
| * | fixes #20538 | Thomas Müller | 2015-11-16 | 1 | -2/+5 |
* | | Merge pull request #20494 from owncloud/storage-forbidden-exception | Thomas Müller | 2015-11-18 | 12 | -5/+270 |
|\ \ | |||||
| * | | Allow storage wrappers to through a forbidden exception with retry information | Joas Schilling | 2015-11-17 | 12 | -5/+270 |
* | | | Merge pull request #20546 from owncloud/provision_api_fix | Thomas Müller | 2015-11-18 | 2 | -10/+3 |
|\ \ \ | |||||
| * | | | Return empty list if group does not have subadmins | Roeland Jago Douma | 2015-11-16 | 2 | -10/+3 |
* | | | | Merge pull request #20551 from owncloud/notification-fix-tests | Thomas Müller | 2015-11-18 | 4 | -21/+62 |
|\ \ \ \ | |||||
| * | | | | Add tests for the "return $this" and fix it on the new method | Joas Schilling | 2015-11-17 | 4 | -21/+62 |
| | |/ / | |/| | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-18 | 6 | -0/+8 |
* | | | | Merge pull request #20188 from owncloud/webdav-exposeshareowner | Thomas Müller | 2015-11-17 | 5 | -0/+82 |
|\ \ \ \ | |||||
| * | | | | Add "owner-id" and "owner-display-name" Webdav properties | Vincent Petry | 2015-11-16 | 3 | -0/+68 |
| * | | | | Add getOwner() method to FileInfo and Node API | Vincent Petry | 2015-11-13 | 2 | -0/+14 |
* | | | | | Merge pull request #20544 from owncloud/move-index-to-appframework | Thomas Müller | 2015-11-17 | 8 | -177/+511 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Move index.php from files to AppFramework | Lukas Reschke | 2015-11-16 | 8 | -177/+511 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #20539 from owncloud/notification-api-adjustment | Thomas Müller | 2015-11-17 | 6 | -141/+97 |
|\ \ \ \ | |||||
| * | | | | Remove the icon for now | Joas Schilling | 2015-11-16 | 6 | -141/+0 |
| * | | | | Add "is primary action" to actions | Joas Schilling | 2015-11-16 | 4 | -0/+97 |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-17 | 2 | -0/+4 |
| |/ / / |/| | | | |||||
* | | | | Merge pull request #20292 from owncloud/provisioning_api_group_unittest | Thomas Müller | 2015-11-16 | 3 | -137/+277 |
|\ \ \ \ | |||||
| * | | | | Moved grouptest over to pure unit tests | Roeland Jago Douma | 2015-11-16 | 3 | -137/+277 |
| |/ / / | |||||
* | | | | Merge pull request #20541 from owncloud/password_policy-is-not-experimantal | Thomas Müller | 2015-11-16 | 1 | -1/+2 |
|\ \ \ \ | |||||
| * | | | | password_policy is a shipped app | Thomas Müller | 2015-11-16 | 1 | -1/+2 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #20534 from owncloud/sftp-parse-host | Robin Appelman | 2015-11-16 | 2 | -14/+62 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Fix parsing of sftp hosts when using ipv6 | Robin Appelman | 2015-11-16 | 2 | -14/+62 |
* | | | | Merge pull request #20465 from owncloud/forms.css | Thomas Müller | 2015-11-16 | 3 | -242/+235 |
|\ \ \ \ | |||||
| * | | | | move form styles from styles.css to inputs.css | Hendrik Leppelsack | 2015-11-13 | 3 | -242/+235 |
* | | | | | Merge pull request #20532 from owncloud/ocs-allow-v2 | Thomas Müller | 2015-11-16 | 1 | -2/+4 |
|\ \ \ \ \ | |||||
| * | | | | | Allow creating OCS v2 links in JS | Joas Schilling | 2015-11-16 | 1 | -2/+4 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #20447 from owncloud/heading-styles | Thomas Müller | 2015-11-16 | 3 | -8/+7 |
|\ \ \ \ \ | |||||
| * | | | | | standardize sizes for headings | Jan-Christoph Borchardt | 2015-11-16 | 3 | -8/+7 |
| |/ / / / | |||||
* | | | | | Merge pull request #20356 from owncloud/share2.0_getShare | Thomas Müller | 2015-11-16 | 7 | -44/+418 |
|\ \ \ \ \ | |||||
| * | | | | | [Share2.0] OCS Share API getShare uses new code | Roeland Jago Douma | 2015-11-16 | 7 | -44/+418 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #18605 from owncloud/api-adduser-for-subadmins | Thomas Müller | 2015-11-16 | 3 | -8/+420 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Added unit test for new functionality | Roeland Jago Douma | 2015-11-12 | 2 | -7/+347 |
| * | | | | enable api addUser for subadmins | michag86 | 2015-11-12 | 3 | -8/+80 |
* | | | | | Merge pull request #20522 from owncloud/update-strengthify | Thomas Müller | 2015-11-16 | 5 | -36/+39 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Update strengthify to 0.4.2 | Morris Jobke | 2015-11-16 | 5 | -36/+39 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #20505 from owncloud/fakelocking-for-mac | Thomas Müller | 2015-11-16 | 7 | -5/+386 |
|\ \ \ \ | |||||
| * | | | | Add fake locker plugin for WebDAVFS | Lukas Reschke | 2015-11-13 | 7 | -5/+386 |
| |/ / / | |||||
* | | | | Merge pull request #20463 from owncloud/sharing-api-integration-tests-adding-... | Thomas Müller | 2015-11-16 | 2 | -12/+256 |
|\ \ \ \ | |||||
| * | | | | Modified test to PUT only 1 parameter with each update | Sergio Bertolin | 2015-11-12 | 1 | -4/+86 |
| * | | | | Added a test including all the fields of the share update and checking output | Sergio Bertolin | 2015-11-11 | 2 | -3/+86 |
| * | | | | Added a test and logic for checking answer of public shares | Sergio Bertolin | 2015-11-11 | 2 | -9/+88 |
* | | | | | Merge pull request #20510 from owncloud/avatar_unittest_fix | Thomas Müller | 2015-11-16 | 1 | -59/+40 |
|\ \ \ \ \ | |||||
| * | | | | | [Avatar] No need to setup FS for avatar tests | Roeland Jago Douma | 2015-11-14 | 1 | -59/+40 |
| | |_|/ / | |/| | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-16 | 2 | -0/+2 |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-15 | 20 | -14/+38 |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-14 | 30 | -0/+44 |
| |_|/ / |/| | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-13 | 284 | -594/+312 |
|/ / / |