summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Revert OCS error code change from #20135Joas Schilling2015-11-052-2/+17
|
* Merge pull request #20273 from owncloud/sharing-api-adding-testsThomas Müller2015-11-052-0/+203
|\ | | | | Adding more tests to the sharing API.
| * 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 group
| * | 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 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
* | | Merge pull request #20320 from owncloud/drop-file_mapThomas Müller2015-11-052-61/+1
|\ \ \ | | | | | | | | Drop unused table file_map
| * | | Drop unused table file_mapMorris Jobke2015-11-053-62/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * used only for windows support * windows support was dropped in 8.2.0 - see #17379 * was introduced in fd8cb9974be30aaca0d65d1807d6a4f784da5f0b * ref #18935
* | | | Merge pull request #20321 from owncloud/drop-principal-tablesThomas Müller2015-11-052-1/+3
|\ \ \ \ | |/ / / |/| | | Drop unused tables principalgroups and principals
| * | | Drop unused tables principalgroups and principalsMorris Jobke2015-11-052-1/+3
|/ / / | | | | | | | | | * was removed in 3e84f170e7133d9acc46123ba4c901a24e438b2c
* | | [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 badge
| * | | Add coverity badgeLukas Reschke2015-11-041-0/+1
| | | | | | | | | | | | Coverity now scans our JS code…
* | | | Merge pull request #20053 from owncloud/getfileinfo-lockingThomas Müller2015-11-043-65/+88
|\ \ \ \ | |/ / / |/| | | Don't lock if we're only reading cache metadata
| * | | 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.0
| * | | | 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
|\ \ \ \ | | | | | | | | | | improve calculation of share recipients
| * | | | 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 hostname
| * | | | 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 name
| * | | | Fix typo in variable nameMorris Jobke2015-11-041-4/+4
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * introduced with #20135 - c6f6a8758b3f08e47c3a8f45a67d09698376b2e2 Fixes following error meessage: {"reqId":"GliKwPFSIVn8GC2KNIHY","remoteAddr":"::1","app":"PHP","message":"Undefined variable: subAdmins at master\/settings\/users.php#76","level":0,"time":"2015-11-04T08:38:53+00:00","method":"GET","url":"\/master\/index.php\/settings\/users"} {"reqId":"GliKwPFSIVn8GC2KNIHY","remoteAddr":"::1","app":"PHP","message":"Invalid argument supplied for foreach() at master\/settings\/users.php#76","level":0,"time":"2015-11-04T08:38:53+00:00","method":"GET","url":"\/master\/index.php\/settings\/users"}
* | | | Merge pull request #18821 from owncloud/global-classesThomas Müller2015-11-043-20/+51
|\ \ \ \ | | | | | | | | | | Global classes in core CSS
| * | | | Global Classes for Core.Raghu Nayyar2015-11-023-20/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move up the global styles up the hierarchy. Adds Clear Left, Right and both. New CSS file for Global Styles.
* | | | | Merge pull request #20157 from owncloud/users-fixeveryonecountThomas Müller2015-11-045-60/+110
|\ \ \ \ \ | | | | | | | | | | | | Fix everyone count for subadmins
| * | | | | fix subadmin user count for empty groupsMorris Jobke2015-11-041-0/+1
| | | | | |
| * | | | | Fix everyone count for subadminsVincent Petry2015-10-295-60/+109
| | | | | | | | | | | | | | | | | | | | | | | | Also moved the logic to the UsersController
* | | | | | 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
| | |_|/ / | |/| | |
* / | | | [tx-robot] updated from transifexJenkins for ownCloud2015-11-0452-40/+202
|/ / / /
* | | | Merge pull request #20269 from owncloud/capabilities-webdav-ng-syncThomas Müller2015-11-031-1/+2
|\ \ \ \ | | | | | | | | | | Add a new core capability which tells the clients which url to use
| * | | | Add a new core capability which tells the clients which url to useThomas Müller2015-11-031-1/+2
| | |_|/ | |/| |
* | | | Merge pull request #20223 from owncloud/fix-apply-webdav-tagsThomas Müller2015-11-031-1/+1
|\ \ \ \ | |/ / / |/| | | Fix TagList namespace in property map
| * | | Fix TagList namespace in property mapVincent Petry2015-11-021-1/+1
| | | |
* | | | Merge pull request #20201 from owncloud/checkboxes-groups-enableThomas Müller2015-11-032-18/+10
|\ \ \ \ | | | | | | | | | | Apply new checkbox style in app settings
| * \ \ \ Merge branch 'master' into checkboxes-groups-enableRaghu Nayyar2015-11-0230-10/+90
| |\ \ \ \
| * | | | | new checkbox style in app settingsHendrik Leppelsack2015-10-312-18/+10
| | | | | |
* | | | | | Merge pull request #20253 from owncloud/external-storage-wordingThomas Müller2015-11-031-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | fix external storage wording detail, ref #19858
| * | | | | | fix external storage wording detail, ref #19858Jan-Christoph Borchardt2015-11-031-1/+1
| | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-15 18:21:52 +0000