summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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-068-0/+56
* | Merge pull request #19872 from owncloud/share2.0_sharemanagerThomas Müller2015-11-0513-5/+2232
|\ \
| * | Fix oracleRoeland Jago Douma2015-11-051-35/+119
| * | Add unshare hooksRoeland Jago Douma2015-11-054-103/+187
| * | 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-0512-106/+1469
| * | Prepare OCS Share endpointRoeland Jago Douma2015-11-052-5/+70
| * | Initial setup of shareing 2.0 sharemanager and shareRoeland Jago Douma2015-11-053-0/+623
* | | Merge pull request #20339 from owncloud/header-not-boldLukas Reschke2015-11-051-2/+2
|\ \ \ | |/ / |/| |
| * | do not bold header of update screenJan-Christoph Borchardt2015-11-051-2/+2
|/ /
* | Merge pull request #20273 from owncloud/sharing-api-adding-testsThomas Müller2015-11-052-0/+203
|\ \
| * \ Merge branch 'master' into sharing-api-adding-testsSergio Bertolín2015-11-0594-294/+686
| |\ \
| * | | Added changes in the verification of sharing get responsesSergio Bertolin2015-11-052-2/+37
| * | | added test for deleting a shareSergio Bertolin2015-11-042-1/+19
| * | | Added general function to create shares in preconditions.Sergio Bertolin2015-11-042-7/+97
| * | | enhancements to pre and post conditionsSergio Bertolin2015-11-031-0/+60
* | | | Merge pull request #20325 from owncloud/subadmin-handle-nullThomas Müller2015-11-052-6/+47
|\ \ \ \ | |_|/ / |/| | |
| * | | subadmin methods should not return any null user or groupArthur Schiwon2015-11-052-6/+47
* | | | 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
* | | | Merge pull request #20320 from owncloud/drop-file_mapThomas Müller2015-11-052-61/+1
|\ \ \ \
| * | | | Drop unused table file_mapMorris Jobke2015-11-053-62/+2
* | | | | Merge pull request #20321 from owncloud/drop-principal-tablesThomas Müller2015-11-052-1/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Drop unused tables principalgroups and principalsMorris Jobke2015-11-052-1/+3
|/ / / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-11-0532-28/+178
* | | | Merge pull request #20315 from owncloud/add-coverityThomas Müller2015-11-041-0/+1
|\ \ \ \
| * | | | Add coverity badgeLukas Reschke2015-11-041-0/+1
* | | | | Merge pull request #20053 from owncloud/getfileinfo-lockingThomas Müller2015-11-043-65/+88
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | mark path as checkedRobin Appelman2015-11-041-0/+1
| * | | | when a file is locked use old cache dataRobin Appelman2015-11-041-29/+37
| * | | | fix whitespaceRobin Appelman2015-11-041-2/+2
| * | | | only lock in getDirectoryContent if we need to update the cacheRobin Appelman2015-11-031-21/+17
| * | | | only lock in getFileInfo if we need to update the cacheRobin Appelman2015-11-031-18/+16
| * | | | Split checkUpdateRobin Appelman2015-11-032-45/+65
| | |_|/ | |/| |
* | | | Merge pull request #20300 from owncloud/fix_commentMorris Jobke2015-11-041-1/+1
|\ \ \ \
| * | | | adjust comment, this parameter was added for 9.0Björn Schießle2015-11-041-1/+1
|/ / / /
* | | | Merge pull request #18361 from owncloud/sharing_performance_improvementsThomas Müller2015-11-043-9/+32
|\ \ \ \
| * | | | cache result from parent foldersBjoern Schiessle2015-11-043-9/+32
* | | | | Merge pull request #20155 from owncloud/fix-20020Morris Jobke2015-11-041-3/+7
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | add port to host only, if an URL is used instead of a plain hostnameArthur Schiwon2015-11-041-3/+7
|/ / / /
* | | | Merge pull request #20283 from owncloud/fix-varaible-typeThomas Müller2015-11-041-4/+4
|\ \ \ \
| * | | | Fix typo in variable nameMorris Jobke2015-11-041-4/+4
| |/ / /
* | | | Merge pull request #18821 from owncloud/global-classesThomas Müller2015-11-043-20/+51
|\ \ \ \
| * | | | Global Classes for Core.Raghu Nayyar2015-11-023-20/+51
* | | | | Merge pull request #20157 from owncloud/users-fixeveryonecountThomas Müller2015-11-045-60/+110
|\ \ \ \ \
| * | | | | fix subadmin user count for empty groupsMorris Jobke2015-11-041-0/+1
| * | | | | Fix everyone count for subadminsVincent Petry2015-10-295-60/+109
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-15 20:08:59 +0000