aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* call post_addToGroup als for class OC_User because sharing and LDAP are ↵Bjoern Schiessle2015-07-021-0/+2
| | | | using this class. Minimal approach to fix #16740
* owner is stored as 'uid_owner', not as 'owner' in the oc_share tableBjoern Schiessle2015-07-021-2/+2
|
* Merge pull request #17246 from owncloud/share-lock-owner-parentJoas Schilling2015-07-023-10/+134
|\ | | | | lock parent folders for the owner when locking a shared file as recipient
| * only lock the parent foldersRobin Appelman2015-07-012-2/+13
| |
| * lock parent folders for the owner when locking a shared file as recipientRobin Appelman2015-07-013-10/+123
| |
* | Merge pull request #17310 from owncloud/master-remove-ocs-idsThomas Müller2015-07-025-5/+0
|\ \ | | | | | | [master] Remove OCS IDs
| * | [master] Remove OCS IDsLukas Reschke2015-07-025-5/+0
|/ / | | | | | | | | | | While making the AppStore ready for 8.1 I also deleted some dummy entries which means that these IDs do not resolve anymore. We should remove them to prevent errors such as https://github.com/owncloud/core/issues/17307 Ref https://github.com/owncloud/activity/issues/320#issuecomment-117691867
* | Merge pull request #17293 from owncloud/revert-z-indexMorris Jobke2015-07-022-2/+1
|\ \ | | | | | | Revert z-index changes
| * | Revert "fix z-index of share-autocomplete"Jan-Christoph Borchardt2015-07-011-1/+0
| | | | | | | | | | | | This reverts commit 4edf388a3852507886e1fc1c396725ea0a6c8e82.
| * | Revert "explicitly set z-index on app-content, fix overlap from navigation"Jan-Christoph Borchardt2015-07-011-1/+1
| | | | | | | | | | | | This reverts commit 71e5bc180399e75af7b67b4187c19d94b5586a5f.
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-0260-32/+292
| | |
* | | Merge pull request #17295 from owncloud/scanfilesignatureLukas Reschke2015-07-011-1/+3
|\ \ \ | |/ / |/| | Fix scanFile signature to avoid boring warning
| * | Fix scanFile signature to avoid boring warningVincent Petry2015-07-011-1/+3
| | |
* | | This will be 8.2 in the futureFrank Karlitschek2015-07-012-3/+3
| | |
* | | Merge pull request #17252 from owncloud/fix-php-errors-in-app-descriptionMorris Jobke2015-07-012-15/+23
|\ \ \ | |/ / |/| | Only do the description kung-fu on strings
| * | Only do the description kung-fu on strings - fixes #17028Thomas Müller2015-07-012-15/+23
| |/
* | Merge pull request #17268 from owncloud/files-cleanuppartfileonlyonceVincent Petry2015-07-011-4/+8
|\ \ | | | | | | Clean up part file only once, not twice on error
| * | Only delete part file on error if it is really a part fileVincent Petry2015-07-011-2/+6
| | |
| * | Clean up part file only once, not twice on errorVincent Petry2015-07-011-2/+2
| | |
* | | Merge pull request #17285 from Rechenzentrum-Universitaet-Augsburg/masterLukas Reschke2015-07-011-2/+2
|\ \ \ | |_|/ |/| | Changed broken links to php manual
| * | Changed broken links to php manualMichael Roth2015-07-011-2/+2
|/ /
* | Merge pull request #17273 from owncloud/s2s-catchmoreexceptiontypesVincent Petry2015-07-011-13/+7
|\ \ | | | | | | Catch more error codes thrown by federated shares
| * | Catch more error codes thrown by federated sharesVincent Petry2015-07-011-13/+7
| |/ | | | | | | | | | | | | | | Most of the time it doesn't make sense to forward Guzzle's RequestException, so we convert it to StorageNotAvailable instead. This prevents unpredictable error codes to block access to unrelated folders needlessly.
* | Merge pull request #15363 from owncloud/ext-ocpMorris Jobke2015-07-019-49/+70
|\ \ | |/ |/| Use OCP classes as much as possible in files_external
| * Use OCP classes as much as possible in files_externalRobin McCorkell2015-07-019-49/+70
|/
* Merge pull request #17088 from owncloud/add-verbosity-to-upgradeMorris Jobke2015-07-013-0/+16
|\ | | | | [upgrade] add verbosity check and show repair info & steps
| * [Repair] add repair info for changed collationMorris Jobke2015-06-241-0/+1
| |
| * [upgrade] add verbosity check and show repair info & stepsMorris Jobke2015-06-242-0/+15
| |
* | Merge pull request #17093 from owncloud/upgrade-timestampMorris Jobke2015-07-012-3/+119
|\ \ | | | | | | [upgrade] show timestamp for output during upgrade
| * | Use a OutputFormatter instead of hacking into writeln()Joas Schilling2015-06-242-49/+133
| | |
| * | Use logtimezone and logdateformatJoas Schilling2015-06-241-2/+5
| | |
| * | [upgrade] show timestamp for output during upgradeMorris Jobke2015-06-241-14/+43
| |/ | | | | | | * added --show-timestamp option
* | Merge pull request #17078 from owncloud/fix-initial-server-hostMorris Jobke2015-07-012-8/+96
|\ \ | | | | | | Fix undefined offset
| * | Fix undefined offsetLukas Reschke2015-06-222-8/+96
| | | | | | | | | | | | There are cases where no trusted host is specified such as when installing the instance, this lead to an undefined offset warning in the log right after installing. (when another domain than localhost or 127.0.0.1 was used)
* | | Merge pull request #16535 from rullzer/ocs_share_api_urlMorris Jobke2015-07-012-0/+55
|\ \ \ | | | | | | | | OCS Share API link shares now always have an url
| * | | OCS Share API link shares now always have an urlRoeland Jago Douma2015-05-222-0/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | To make sure clients have the correct and latest link add an url field to all OCS Share API return statements on public link shares. * Added unit tests
* | | | Merge pull request #16406 from owncloud/enc-strlenperffixMorris Jobke2015-07-011-1/+1
|\ \ \ \ | | | | | | | | | | Small perf tweak in strlen loop
| * | | | Small perf tweak in strlen loopVincent Petry2015-05-181-1/+1
| | | | |
* | | | | Merge pull request #15569 from owncloud/remove-getetag-propertiesMorris Jobke2015-07-013-0/+138
|\ \ \ \ \ | | | | | | | | | | | | Remove unneeded getetag entries in properties table
| * | | | | Remove unneeded getetag entries in properties tableMorris Jobke2015-06-253-0/+138
| | | | | | | | | | | | | | | | | | | | | | | | * fixes #13281
* | | | | | Merge pull request #15506 from rullzer/core_apps_oc_log2ocp_utilMorris Jobke2015-07-0112-33/+33
|\ \ \ \ \ \ | | | | | | | | | | | | | | Move core apps from OC_Log::write to OCP\Util
| * | | | | | Move core apps from OC_Log::write to OCP\UtilRoeland Jago Douma2015-05-1812-33/+33
| | | | | | |
* | | | | | | Merge pull request #15475 from rullzer/files_sharing_OCP_DBMorris Jobke2015-07-017-14/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Move files sharing app (mostly) to OCP\DB
| * | | | | | | Move files sharing app (mostly) to OCP\DBRoeland Jago Douma2015-05-187-14/+14
| |/ / / / / /
* | | | | | | Merge pull request #17224 from ↵Vincent Petry2015-07-012-29/+86
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/webdav-handle-ServerNotAvailableException Adding exception handling for ServerNotAvailableException
| * | | | | | | Avoid namespace clashThomas Müller2015-06-301-5/+4
| | | | | | | |
| * | | | | | | Fixing content type detection and handle all local printErrorPage callsThomas Müller2015-06-301-12/+29
| | | | | | | |
| * | | | | | | Adding request specific exception handling - now with WebDAV responses - ↵Thomas Müller2015-06-301-7/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | refs #17192
| * | | | | | | Adding exception handling for ServerNotAvailableException - refs #17192Thomas Müller2015-06-301-18/+33
| | | | | | | |
* | | | | | | | Merge pull request #17259 from owncloud/chunk-cleanupgracefulonlockVincent Petry2015-07-013-10/+107
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Do not try clearing locked files in cache folder
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-16 22:00:26 +0000