Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix ctor | Thomas Müller | 2016-01-14 | 1 | -1/+4 |
| | |||||
* | Unit tests for updateUser and deleteUser | Thomas Müller | 2016-01-14 | 1 | -1/+35 |
| | |||||
* | Add test for ensureSystemAddressBookExists | Thomas Müller | 2016-01-14 | 1 | -0/+11 |
| | |||||
* | Start updating system addressbook | Thomas Müller | 2016-01-14 | 6 | -77/+199 |
| | |||||
* | Merge pull request #21679 from owncloud/bump-sabre-3.0.7 | Thomas Müller | 2016-01-14 | 1 | -7/+7 |
|\ | | | | | [3rdparty] Bump sabre to 3.0.7 (PHP7 support) | ||||
| * | Fix carddav unit tests | Roeland Jago Douma | 2016-01-13 | 1 | -7/+7 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-01-14 | 8 | -2/+46 |
| | | |||||
* | | Merge pull request #21692 from owncloud/external-add-global | Thomas Müller | 2016-01-13 | 1 | -2/+2 |
|\ \ | | | | | | | Fix adding global applicable when removing all other applicables | ||||
| * | | Fix adding global applicable when removing all other applicables | Robin Appelman | 2016-01-13 | 1 | -2/+2 |
| |/ | |||||
* | | [Share 2.0] Use full share id (providerId:shareId) | Roeland Jago Douma | 2016-01-13 | 2 | -15/+36 |
| | | | | | | | | | | | | | | | | | | | | | | | | Now that we support multiple managers we communicate shares to the outside as 'providerId:shareId'. This makes sures that id's are unique when references from the OCS API. However, since we do not want to break the OCS API v1 we need to somewhat hack around this. When we switch to OCS API v2 (which we should when we support more custom providers). We will change the id to always be the fullShareId. | ||||
* | | [Share 2.0] Add share provider factory | Roeland Jago Douma | 2016-01-13 | 1 | -27/+1 |
| | | | | | | | | | | | | | | * Add providers * Add share manager to server container * Use share manager from server container * Properly get the share manager | ||||
* | | [Share 2.0] Allow registering of share providers | Roeland Jago Douma | 2016-01-13 | 1 | -12/+24 |
| | | | | | | | | * Properly register the default share provider | ||||
* | | Fixed issue #21452 | Erik Pellikka | 2016-01-13 | 1 | -1/+7 |
|/ | | | | | | | | removed whitespace removed whitespace Changed it based on PVince81's suggestion | ||||
* | Fix mock call to download | Roeland Jago Douma | 2016-01-13 | 1 | -1/+1 |
| | | | | We can only mock public and protected functions in phpunit. | ||||
* | Add missing dispatcher | Thomas Müller | 2016-01-13 | 1 | -0/+1 |
| | |||||
* | Merge pull request #21662 from owncloud/external-list-non-admin | Thomas Müller | 2016-01-13 | 1 | -0/+11 |
|\ | | | | | Allow non admins to list their own mounts | ||||
| * | Allow non admins to list their own mounts | Robin Appelman | 2016-01-12 | 1 | -0/+11 |
| | | |||||
* | | Merge pull request #21655 from owncloud/remove-listener-plugin | Thomas Müller | 2016-01-13 | 6 | -82/+0 |
|\ \ | | | | | | | Remove the listener dav plugin | ||||
| * | | Remove the listener plugin | Joas Schilling | 2016-01-13 | 6 | -82/+0 |
| | | | |||||
* | | | Merge pull request #21392 from owncloud/files_external-import | Thomas Müller | 2016-01-13 | 4 | -0/+287 |
|\ \ \ | | | | | | | | | Add import command for files external | ||||
| * | | | Add import command for files external | Robin Appelman | 2016-01-11 | 4 | -0/+287 |
| | | | | |||||
* | | | | Merge pull request #21612 from owncloud/fix_21598 | Thomas Müller | 2016-01-13 | 2 | -16/+69 |
|\ \ \ \ | | | | | | | | | | | fix public link sharing if the master key is enabled | ||||
| * | | | | only use master key ID if a user is logged in. Otherwise keep the public ↵ | Björn Schießle | 2016-01-11 | 2 | -16/+69 |
| |/ / / | | | | | | | | | | | | | link share key | ||||
* | | | | Merge pull request #21615 from owncloud/shared-islocal | Thomas Müller | 2016-01-13 | 1 | -0/+7 |
|\ \ \ \ | | | | | | | | | | | implement isLocal for shared storage | ||||
| * | | | | implement isLocal for shared storage | Robin Appelman | 2016-01-11 | 1 | -0/+7 |
| |/ / / | |||||
* | | | | Merge pull request #21620 from owncloud/fix-wrong-classname-in-phpdoc | Thomas Müller | 2016-01-13 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | fix wrong class name in phpdoc | ||||
| * | | | | fix wrong class name in phpdoc | blizzz | 2016-01-11 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #21648 from owncloud/smb-statcache-cap | Thomas Müller | 2016-01-13 | 1 | -1/+8 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | cap the number of entries we cache in smb's statcache | ||||
| * | | | | cap the number of entries we cache in smb's statcache | Robin Appelman | 2016-01-12 | 1 | -1/+8 |
| | | | | | |||||
* | | | | | Merge pull request #21663 from owncloud/occ-external-mountpoint | Thomas Müller | 2016-01-13 | 1 | -2/+10 |
|\ \ \ \ \ | | | | | | | | | | | | | allow setting mountpoint with occ files_external:config | ||||
| * | | | | | allow setting mountpoint with occ files_external:config | Robin Appelman | 2016-01-12 | 1 | -2/+10 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #21653 from owncloud/update-license-headers-2016 | Thomas Müller | 2016-01-13 | 525 | -754/+1669 |
|\ \ \ \ \ | | | | | | | | | | | | | Update license headers 2016 | ||||
| * | | | | | Happy new year! | Thomas Müller | 2016-01-12 | 525 | -754/+1669 |
| | | | | | | |||||
* | | | | | | Merge pull request #20948 from owncloud/fed-sync-contacts | Thomas Müller | 2016-01-13 | 18 | -29/+568 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Syncing system addressbooks across federated ownClouds | ||||
| * | | | | | | Reuse backend as provided by the app container | Thomas Müller | 2016-01-12 | 1 | -9/+3 |
| | | | | | | | |||||
| * | | | | | | Fix ctor call | Thomas Müller | 2016-01-12 | 3 | -4/+0 |
| | | | | | | | |||||
| * | | | | | | fix doc-block | Björn Schießle | 2016-01-12 | 1 | -7/+1 |
| | | | | | | | |||||
| * | | | | | | create urls in a way that sabredav handles it correctly | Björn Schießle | 2016-01-12 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Catch exceptions during sync | Thomas Müller | 2016-01-12 | 2 | -7/+8 |
| | | | | | | | |||||
| * | | | | | | federation has to be of type filesystem so that we load this app for webdav ↵ | Thomas Müller | 2016-01-12 | 2 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | requests | ||||
| * | | | | | | Inject DbHandler .... | Thomas Müller | 2016-01-12 | 2 | -9/+10 |
| | | | | | | | |||||
| * | | | | | | md5 -> sha1 | Thomas Müller | 2016-01-12 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Address comments | Thomas Müller | 2016-01-12 | 3 | -7/+11 |
| | | | | | | | |||||
| * | | | | | | Adding unit tests for the sync service | Thomas Müller | 2016-01-12 | 2 | -1/+94 |
| | | | | | | | |||||
| * | | | | | | Adding tests and adjust PHPDoc | Thomas Müller | 2016-01-12 | 6 | -13/+120 |
| | | | | | | | |||||
| * | | | | | | Fix registration of sync command | Thomas Müller | 2016-01-12 | 1 | -4/+1 |
| | | | | | | | |||||
| * | | | | | | Decouple federation and dav app | Thomas Müller | 2016-01-12 | 10 | -26/+271 |
| | | | | | | | |||||
| * | | | | | | Use EventDispatcher to allow additional setup of auth backends - move ↵ | Thomas Müller | 2016-01-12 | 3 | -2/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | federation auth to federation app | ||||
| * | | | | | | Allow trusted servers to authenticate | Thomas Müller | 2016-01-12 | 4 | -3/+85 |
| |/ / / / / | |||||
* | / / / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-01-13 | 8 | -2/+28 |
| |/ / / / |/| | | | |