summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* Fix ctorThomas Müller2016-01-141-1/+4
|
* Unit tests for updateUser and deleteUserThomas Müller2016-01-141-1/+35
|
* Add test for ensureSystemAddressBookExistsThomas Müller2016-01-141-0/+11
|
* Start updating system addressbookThomas Müller2016-01-146-77/+199
|
* Merge pull request #21679 from owncloud/bump-sabre-3.0.7Thomas Müller2016-01-141-7/+7
|\ | | | | [3rdparty] Bump sabre to 3.0.7 (PHP7 support)
| * Fix carddav unit testsRoeland Jago Douma2016-01-131-7/+7
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2016-01-148-2/+46
| |
* | Merge pull request #21692 from owncloud/external-add-globalThomas Müller2016-01-131-2/+2
|\ \ | | | | | | Fix adding global applicable when removing all other applicables
| * | Fix adding global applicable when removing all other applicablesRobin Appelman2016-01-131-2/+2
| |/
* | [Share 2.0] Use full share id (providerId:shareId)Roeland Jago Douma2016-01-132-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 factoryRoeland Jago Douma2016-01-131-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 providersRoeland Jago Douma2016-01-131-12/+24
| | | | | | | | * Properly register the default share provider
* | Fixed issue #21452Erik Pellikka2016-01-131-1/+7
|/ | | | | | | | removed whitespace removed whitespace Changed it based on PVince81's suggestion
* Fix mock call to downloadRoeland Jago Douma2016-01-131-1/+1
| | | | We can only mock public and protected functions in phpunit.
* Add missing dispatcherThomas Müller2016-01-131-0/+1
|
* Merge pull request #21662 from owncloud/external-list-non-adminThomas Müller2016-01-131-0/+11
|\ | | | | Allow non admins to list their own mounts
| * Allow non admins to list their own mountsRobin Appelman2016-01-121-0/+11
| |
* | Merge pull request #21655 from owncloud/remove-listener-pluginThomas Müller2016-01-136-82/+0
|\ \ | | | | | | Remove the listener dav plugin
| * | Remove the listener pluginJoas Schilling2016-01-136-82/+0
| | |
* | | Merge pull request #21392 from owncloud/files_external-importThomas Müller2016-01-134-0/+287
|\ \ \ | | | | | | | | Add import command for files external
| * | | Add import command for files externalRobin Appelman2016-01-114-0/+287
| | | |
* | | | Merge pull request #21612 from owncloud/fix_21598Thomas Müller2016-01-132-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ßle2016-01-112-16/+69
| |/ / / | | | | | | | | | | | | link share key
* | | | Merge pull request #21615 from owncloud/shared-islocalThomas Müller2016-01-131-0/+7
|\ \ \ \ | | | | | | | | | | implement isLocal for shared storage
| * | | | implement isLocal for shared storageRobin Appelman2016-01-111-0/+7
| |/ / /
* | | | Merge pull request #21620 from owncloud/fix-wrong-classname-in-phpdocThomas Müller2016-01-131-1/+1
|\ \ \ \ | | | | | | | | | | fix wrong class name in phpdoc
| * | | | fix wrong class name in phpdocblizzz2016-01-111-1/+1
| | | | |
* | | | | Merge pull request #21648 from owncloud/smb-statcache-capThomas Müller2016-01-131-1/+8
|\ \ \ \ \ | |_|_|/ / |/| | | | cap the number of entries we cache in smb's statcache
| * | | | cap the number of entries we cache in smb's statcacheRobin Appelman2016-01-121-1/+8
| | | | |
* | | | | Merge pull request #21663 from owncloud/occ-external-mountpointThomas Müller2016-01-131-2/+10
|\ \ \ \ \ | | | | | | | | | | | | allow setting mountpoint with occ files_external:config
| * | | | | allow setting mountpoint with occ files_external:configRobin Appelman2016-01-121-2/+10
| | |_|_|/ | |/| | |
* | | | | Merge pull request #21653 from owncloud/update-license-headers-2016Thomas Müller2016-01-13525-754/+1669
|\ \ \ \ \ | | | | | | | | | | | | Update license headers 2016
| * | | | | Happy new year!Thomas Müller2016-01-12525-754/+1669
| | | | | |
* | | | | | Merge pull request #20948 from owncloud/fed-sync-contactsThomas Müller2016-01-1318-29/+568
|\ \ \ \ \ \ | | | | | | | | | | | | | | Syncing system addressbooks across federated ownClouds
| * | | | | | Reuse backend as provided by the app containerThomas Müller2016-01-121-9/+3
| | | | | | |
| * | | | | | Fix ctor callThomas Müller2016-01-123-4/+0
| | | | | | |
| * | | | | | fix doc-blockBjörn Schießle2016-01-121-7/+1
| | | | | | |
| * | | | | | create urls in a way that sabredav handles it correctlyBjörn Schießle2016-01-121-2/+2
| | | | | | |
| * | | | | | Catch exceptions during syncThomas Müller2016-01-122-7/+8
| | | | | | |
| * | | | | | federation has to be of type filesystem so that we load this app for webdav ↵Thomas Müller2016-01-122-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | requests
| * | | | | | Inject DbHandler ....Thomas Müller2016-01-122-9/+10
| | | | | | |
| * | | | | | md5 -> sha1Thomas Müller2016-01-121-1/+1
| | | | | | |
| * | | | | | Address commentsThomas Müller2016-01-123-7/+11
| | | | | | |
| * | | | | | Adding unit tests for the sync serviceThomas Müller2016-01-122-1/+94
| | | | | | |
| * | | | | | Adding tests and adjust PHPDocThomas Müller2016-01-126-13/+120
| | | | | | |
| * | | | | | Fix registration of sync commandThomas Müller2016-01-121-4/+1
| | | | | | |
| * | | | | | Decouple federation and dav appThomas Müller2016-01-1210-26/+271
| | | | | | |
| * | | | | | Use EventDispatcher to allow additional setup of auth backends - move ↵Thomas Müller2016-01-123-2/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | federation auth to federation app
| * | | | | | Allow trusted servers to authenticateThomas Müller2016-01-124-3/+85
| |/ / / / /
* | / / / / [tx-robot] updated from transifexJenkins for ownCloud2016-01-138-2/+28
| |/ / / / |/| | | |