summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* [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
|\
| * 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_tokenVincent Petry2015-11-061-0/+1
* | | [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::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 #20135Joas Schilling2015-11-052-2/+17
| |/
* | Merge pull request #20271 from owncloud/fix-18701Thomas Müller2015-11-062-20/+149
|\ \
| * | integration testsArthur Schiwon2015-11-041-0/+118
| * | LDAP: attempt to connect to backup server again, if main server is not availa...Arthur Schiwon2015-11-031-20/+31
* | | [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
* | | 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 settingMorris Jobke2015-11-041-0/+5
* | | [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
|\ \ \
| * | | 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 setEncryptHomeStoragePhil Davis2015-11-031-1/+1
| |/
* / [tx-robot] updated from transifexJenkins for ownCloud2015-11-0444-40/+176
|/
* Merge pull request #20223 from owncloud/fix-apply-webdav-tagsThomas Müller2015-11-031-1/+1
|\
| * Fix TagList namespace in property mapVincent Petry2015-11-021-1/+1
* | fix external storage wording detail, ref #19858Jan-Christoph Borchardt2015-11-031-1/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2015-11-034-0/+8
* | Merge branch 'master' into fix-20151blizzz2015-11-0236-12/+187
|\|
| * Merge pull request #20192 from owncloud/fix-20090Thomas Müller2015-11-022-0/+12
| |\
| | * if a user that is flag as deleted shows up again, remove that flag. Fixes #20090Arthur Schiwon2015-10-302-0/+12
| * | Merge pull request #20219 from owncloud/issue-19707-scrollto-in-trashibnThomas Müller2015-11-021-1/+3
| |\ \
| | * | Fix scrollto= parameter in trashbin viewJoas Schilling2015-11-021-1/+3
| * | | Merge pull request #20181 from owncloud/files-fixdownloadspinnerThomas Müller2015-11-024-3/+101
| |\ \ \ | | |/ / | |/| |
| | * | Fix file action download spinnerVincent Petry2015-10-304-3/+101
| * | | [tx-robot] updated from transifexJenkins for ownCloud2015-11-028-8/+18
| * | | [tx-robot] updated from transifexJenkins for ownCloud2015-11-0110-0/+38
| * | | [tx-robot] updated from transifexJenkins for ownCloud2015-10-3112-0/+14
| * | | Merge pull request #19940 from owncloud/ldap-server-wizard-tooltipThomas Müller2015-10-311-0/+1
| |\ \ \ | | |_|/ | |/| |
| | * | add tooltip to ldap server wizardHendrik Leppelsack2015-10-291-0/+1
* | | | add method to count users by loginname and use it for diagnose test, fixes #2...Arthur Schiwon2015-10-305-3/+167
|/ / /
* | | Merge pull request #20175 from owncloud/login-arrowThomas Müller2015-10-302-5/+0
|\ \ \