summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #13771 from owncloud/fix-humanfileSizeLukas Reschke2015-02-122-1/+3
|\ | | | | generate valid human readable text for 0
| * generate valid human readable text for 0 - fixed #9342Thomas Müller2015-01-292-1/+3
| |
* | Merge pull request #13780 from owncloud/cmreflector-inheritanceLukas Reschke2015-02-121-2/+58
|\ \ | | | | | | Additional controllermethodreflector inheritance tests
| * | another test for overriding the docblockBernhard Posselt2015-01-291-0/+14
| | |
| * | additional inheritance testsBernhard Posselt2015-01-291-2/+44
| | |
* | | Merge pull request #14145 from owncloud/no-whitespace-from-themes-masterLukas Reschke2015-02-122-11/+13
|\ \ \ | | | | | | | | catch any whitespaces which might get written to the output buffer while...
| * | | catch any whitespaces which might get written to the output buffer while ↵Thomas Müller2015-02-122-11/+13
| | | | | | | | | | | | | | | | loading a theme
* | | | Merge pull request #14159 from owncloud/remove-internalThomas Müller2015-02-121-5/+3
|\ \ \ \ | | | | | | | | | | Remove internal annotation
| * | | | Remove internal annotationLukas Reschke2015-02-121-5/+3
|/ / / / | | | | | | | | | | | | PHPStorm complained about those functions being declared as Internal. I doubt that this is actually the case since they are even in the public API.
* | | | Merge pull request #14121 from Zillode/app-faviconMorris Jobke2015-02-122-4/+4
|\ \ \ \ | | | | | | | | | | Disable application-specific favicons for non-user pages
| * | | | Disable application-specific favicons for non-user pagesLode Hoste2015-02-112-4/+4
| | | | |
* | | | | Merge pull request #9038 from owncloud/add_tag_fileLukas Reschke2015-02-121-0/+1
|\ \ \ \ \ | | | | | | | | | | | | Add .tag file to make tar balls tracable
| * | | | | Add .tag file to make tar balls tracableDaniel Molkentin2014-06-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "git archive" operation will substitute the contents of this file with the hash sum of the commit that this tar ball is based on. This improves tracebility and allows to retrospectively set tags. It has proven to be a valuable asset in mirall.
* | | | | | Merge pull request #14071 from owncloud/add_timeout_for_post_requestsBjörn Schießle2015-02-121-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | add timeout to curl request
| * | | | | | add timeout to curl requestBjoern Schiessle2015-02-121-1/+2
| | | | | | |
* | | | | | | Merge pull request #13913 from rullzer/showusergroupsLukas Reschke2015-02-122-0/+14
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | Added overview of groups a user is member of
| * | | | | | Added overview of groups a user is a member ofRoeland Jago Douma2015-02-122-0/+14
| | | | | | |
* | | | | | | Merge pull request #14135 from cmeh/masterMorris Jobke2015-02-122-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Clean-up of messages (orthography, format)
| * | | | | | | Orthography: "Back-end" -> Backend (without hyphen) and correction of ↵cmeh2015-02-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "users" to the genitive "user's"
| * | | | | | | Adding a missing space between value and unitcmeh2015-02-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Added the missing space between value and unit, as it is formatted in all other places across ownCloud.
* | | | | | | | Merge pull request #10993 from owncloud/scanner-reuse-fileidMorris Jobke2015-02-122-73/+124
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Reuse known fileids and cache data in the scanner
| * | | | | | | | only read permissions onceRobin Appelman2015-02-111-2/+3
| | | | | | | | |
| * | | | | | | | Only try to scan the children of directoriesRobin Appelman2015-02-111-3/+3
| | | | | | | | |
| * | | | | | | | Cast mtimes and size to intRobin Appelman2015-02-111-0/+3
| | | | | | | | |
| * | | | | | | | Reuse cache data of existing files during scanRobin Appelman2015-02-111-69/+116
| | | | | | | | |
* | | | | | | | | Merge pull request #14129 from owncloud/deprecate-oc-jsonMorris Jobke2015-02-122-122/+139
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Deprecate `OC_JSON` and `OCP\JSON`
| * | | | | | | | | Deprecate `OC_JSON` and `OCP\JSON`Lukas Reschke2015-02-122-122/+139
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This deprecates – but not removes – those two classes and all functions in it. There is no reason that new developments should use those methods as with the AppFramework there is a replacement that allows testable code. With the `@deprecated` annotation IDEs like PHPStorm will point out to the developer that a functionality is deprecated and that there is a better suited replacement.
* / | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-1266-70/+176
|/ / / / / / / /
* | | | | | | | Merge pull request #14126 from owncloud/remove-that-old-thingLukas Reschke2015-02-111-54/+0
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | Remove unused file
| * | | | | | | Remove unused fileLukas Reschke2015-02-111-54/+0
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | This file is unused and has been last modified two years ago. Furthermore it won't evne work anymore properly because it uses things like `CONFIG_DATEFORMAT` which are gone a long time ago...
* | | | | | | Merge pull request #14097 from yanntech/fix/utf8-checkThomas Müller2015-02-111-1/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | in some case charset can be in lower case.
| * | | | | | | in some case charset can be in lower case.Yann VERRY2015-02-111-1/+3
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Add strtoupper() in UTF-8 check to avoid error message
* | | | | | | Merge pull request #13979 from ↵Vincent Petry2015-02-112-5/+16
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/group-share-collition-wrong-type-in-post-hook Do not overwrite the shareType so the post hook is still correct
| * | | | | | | Add a test for the post_shared hook shareTypeJoas Schilling2015-02-091-0/+11
| | | | | | | |
| * | | | | | | Do not overwrite the shareType so the post hook is still correctJoas Schilling2015-02-091-5/+5
| | | | | | | |
* | | | | | | | Merge pull request #14105 from owncloud/second-parameter-is-optionalThomas Müller2015-02-111-1/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Second parameter is optional
| * | | | | | | Second parameter is optionalLukas Reschke2015-02-111-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Makes my IDE happier.
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-1161-37/+83
| | | | | | |
* | | | | | | Merge pull request #14074 from RealRancor/documents_preview_notesMorris Jobke2015-02-111-0/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add hint for troubleshooting MS Word previews
| * | | | | | | Add hint for troubleshooting MS Word previewsRealRancor2015-02-101-0/+4
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #13861 from owncloud/remove-disabled-files-repair-stepThomas Müller2015-02-102-52/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Revert "enabled disabled files app in repair step"
| * | | | | | | Revert "enabled disabled files app in repair step"Morris Jobke2015-02-032-52/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d70160c6077ca017d6cb7d61f066fe33e3b1e081.
* | | | | | | | Merge pull request #14072 from owncloud/add-files-external-test-readmeLukas Reschke2015-02-101-0/+58
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | add readme for files external tests
| * | | | | | | add rreadme for files external testsMorris Jobke2015-02-101-0/+58
|/ / / / / / /
* | | | | | | Merge pull request #11056 from AdamWill/9885-opcodeMorris Jobke2015-02-102-2/+31
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | add function to invalidate one opcache file, use it if possible #9885
| * | | | | | | writeData(): correct variable name for config file pathAdam Williamson2014-11-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It changed since we wrote this patch.
| * | | | | | | deleteFromOpcodeCache: make parameter mandatory, document parameterAdam Williamson2014-11-061-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Both pointed out in submission review by @bantu, thanks.
| * | | | | | | add function to invalidate one opcache file, use it if possible #9885Adam Williamson2014-11-062-2/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue #9885 appears to be triggered by ownCloud invalidating the entire PHP opcache. Testing indicates it can be avoided by only invalidating the single file that was written from the opcache, instead of clearing the whole thing. In general it is more efficient to invalidate only the single file that was changed, rather than the whole cache. This adds a deleteFromOpcodeCache() function which invalidates a single file from the opcache if possible, returning true if the underlying function returns true (which may mean 'success', or 'file does not exist', or 'file exists but is not in opcache', all of which are OK to treat as good for our purposes). It also changes writeData() in config.php to try using deleteFromOpcodeCache() and only fall back on clearOpcodeCache() if that fails.
* | | | | | | | Merge pull request #13190 from is-apps/master-sftp-keyVincent Petry2015-02-1010-7/+472
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add SFTP public key authentication support
| * | | | | | | | Add support for SFTP key authenticationRoss Nicoll2015-01-1410-7/+472
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for external files accessed via SFTP using public key exchange authentication. Keys are generated automatically when the configuration is added, or can be regenerated on demand if a key is compromised. Creation of a new configuration row now triggers focus on that row. This is used to trigger auto-configuration for SFTP keys. Generated public keys are saved in user's data directory for easy retrieval by an external application. Add controller for SFTP key generation AJAX SFTP class initialisation no longer produces a warning if the password field is missing. Add unit tests for SFTP with key authentication backend
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-09 13:22:08 +0000