aboutsummaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* [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,000
| * changed 1.000 to 1,000sylvain2015-11-121-1/+1
| | | | | | The string "More than 1,000 directory entries available." would mean only 1 entry, in english it should be 1,000 . Found it while translating
* | Merge pull request #20460 from owncloud/file-handling-wordingThomas Müller2015-11-121-4/+2
|\ \ | | | | | | fix layout and wording for file handling admin setting
| * | fix layout and wording for file handling admin settingJan-Christoph Borchardt2015-11-111-4/+2
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-11-122-0/+4
| |/ |/|
* | [tx-robot] updated from transifexJenkins for ownCloud2015-11-1114-10/+108
| |
* | Merge pull request #20124 from owncloud/postscriptum-20093C. Montero Luque2015-11-102-4/+4
|\ \ | |/ |/| remove uselessly used parameter, read all user attributes also when l…
| * remove uselessly used parameter, read all user attributes also when looking ↵Arthur Schiwon2015-11-062-4/+4
| | | | | | | | up users in groups
* | Merge pull request #20195 from owncloud/add-caldavtesterThomas Müller2015-11-104-0/+1075
|\ \ | | | | | | Add CalDAVTester to travis
| * | Add CalDAVTester to travisThomas Müller2015-11-104-0/+1075
| | |
* | | Merge pull request #20224 from owncloud/fileinfo-ownerRobin Appelman2015-11-101-0/+16
|\ \ \ | | | | | | | | Add getOwner to FileInfo
| * | | Add tests for FileInfo ownerRobin Appelman2015-11-101-0/+16
| |/ /
* | | Merge pull request #20431 from owncloud/carddav-enforce-displaynameThomas Müller2015-11-102-1/+8
|\ \ \ | | | | | | | | When creating addressbooks, make sure the displayname is set
| * | | When creating addressbooks, make sure the displayname is setArthur Schiwon2015-11-102-1/+8
| | | |
* | | | Merge pull request #20422 from owncloud/fix-20421-masterThomas Müller2015-11-101-0/+3
|\ \ \ \ | |/ / / |/| | | Ensure the user folder exists
| * | | Ensure the user folder existsThomas Müller2015-11-101-0/+3
| |/ /
* | | Merge pull request #20415 from owncloud/fix-addressbook-home-setThomas Müller2015-11-101-0/+2
|\ \ \ | |/ / |/| | Adding CardDAV plugin to provide addressbook-home-set property
| * | Adding CardDAV plugin to provide addressbook-home-set propertyThomas Müller2015-11-101-0/+2
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-11-102-0/+2
|/ /
* | Merge pull request #20333 from owncloud/fix-18956Thomas Müller2015-11-107-12/+26
|\ \ | | | | | | [LDAP Wizard] make all the buttons beautiful
| * | make all the buttons beautifulArthur Schiwon2015-11-057-12/+26
| | |
* | | Register DAVACL plugin to provide current-user-principalThomas Müller2015-11-091-0/+2
| | |
* | | Merge pull request #20360 from owncloud/extstorage-gdrive-forceapprovalThomas Müller2015-11-091-0/+1
|\ \ \ | | | | | | | | Force approval in GDrive oauth to get refresh_token
| * | | Force approval in GDrive oauth to get refresh_tokenVincent Petry2015-11-061-0/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | Forcing the approval of app permissions makes sure that the GDrive API will always return a refresh_token. In the case of apps that were already authorized for the current user/domain, the API doesn't return the refresh_token which causes expiration issues.
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-11-092-0/+2
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-11-0810-60/+66
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-11-072-0/+2
| | |
* | | adding individual phpunit.xml and bootstrap.phpThomas Müller2015-11-062-0/+38
| | |
* | | Adding occ command to create an addressbookThomas Müller2015-11-062-0/+60
| | |
* | | Introducing CardDAV into coreThomas Müller2015-11-0622-23/+958
|/ /
* | Merge pull request #20358 from owncloud/extstorage-properlythrowexceptionThomas Müller2015-11-061-1/+1
|\ \ | | | | | | Properly throw exception in OC_Mount_Config::getBackendStatus
| * | Properly throw exception in OC_Mount_Config::getBackendStatusVincent Petry2015-11-061-1/+1
| | |
* | | Merge pull request #20340 from owncloud/fix-ocs-error-codeThomas Müller2015-11-062-2/+17
|\ \ \ | |/ / |/| | Revert OCS error code change from #20135
| * | Revert OCS error code change from #20135Joas Schilling2015-11-052-2/+17
| |/
* | Merge pull request #20271 from owncloud/fix-18701Thomas Müller2015-11-062-20/+149
|\ \ | | | | | | LDAP: attempt to connect to backup server again, if main server is no…
| * | integration testsArthur Schiwon2015-11-041-0/+118
| | |
| * | LDAP: attempt to connect to backup server again, if main server is not ↵Arthur Schiwon2015-11-031-20/+31
| | | | | | | | | | | | available. Fixes #18701
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-11-064-0/+10
| | |
* | | Use the old code for remote shares for nowRoeland Jago Douma2015-11-051-0/+8
| | |
* | | The new sharing code now handles deletionRoeland Jago Douma2015-11-053-3/+196
| | | | | | | | | | | | OCS -> ShareManager -> DefaultShareProvider
* | | Prepare OCS Share endpointRoeland Jago Douma2015-11-052-5/+70
| |/ |/|
* | Merge pull request #20301 from owncloud/fix-files_external-empty-user-mountingThomas Müller2015-11-051-0/+5
|\ \ | | | | | | [files_external] fix empty user mounts setting
| * | [files_external] fix empty user mounts settingMorris Jobke2015-11-041-0/+5
| | | | | | | | | | | | | | | * fixes #19858 * if no backend is allowed to be mounted also the user mount setting should be disabled
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-11-0528-26/+152
| | |
* | | Merge pull request #20053 from owncloud/getfileinfo-lockingThomas Müller2015-11-041-26/+26
|\ \ \ | | | | | | | | Don't lock if we're only reading cache metadata
| * | | Split checkUpdateRobin Appelman2015-11-031-26/+26
| | |/ | |/|
* | | add port to host only, if an URL is used instead of a plain hostnameArthur Schiwon2015-11-041-3/+7
| |/ |/|
* | Merge pull request #20272 from owncloud/phil-davis-setEncryptHomeStorageThomas Müller2015-11-041-1/+1
|\ \ | | | | | | Correct the description of function setEncryptHomeStorage
| * | Correct the description of function setEncryptHomeStoragePhil Davis2015-11-031-1/+1
| |/