Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Manually type-case all AJAX files | Lukas Reschke | 2015-02-13 | 47 | -133/+133 |
| | | | | | | This enforces proper types on POST and GET arguments where I considered it sensible. I didn't update some as I don't know what kind of values they would support :see_no_evil: Fixes https://github.com/owncloud/core/issues/14196 for core | ||||
* | Merge pull request #14171 from owncloud/fix/11639 | Joas Schilling | 2015-02-13 | 2 | -1/+17 |
|\ | | | | | Improve: Index for file_map | ||||
| * | Incorporate review changes | Lukas Reschke | 2015-02-12 | 2 | -3/+1 |
| | | |||||
| * | Improve: Index for file_map | windaishi | 2015-02-12 | 1 | -0/+18 |
| | | | | | | | | Added two indices for file_map, that improve syncing and uploading and deleting files | ||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-02-13 | 98 | -148/+22 |
|/ | |||||
* | Merge pull request #13771 from owncloud/fix-humanfileSize | Lukas Reschke | 2015-02-12 | 2 | -1/+3 |
|\ | | | | | generate valid human readable text for 0 | ||||
| * | generate valid human readable text for 0 - fixed #9342 | Thomas Müller | 2015-01-29 | 2 | -1/+3 |
| | | |||||
* | | Merge pull request #13780 from owncloud/cmreflector-inheritance | Lukas Reschke | 2015-02-12 | 1 | -2/+58 |
|\ \ | | | | | | | Additional controllermethodreflector inheritance tests | ||||
| * | | another test for overriding the docblock | Bernhard Posselt | 2015-01-29 | 1 | -0/+14 |
| | | | |||||
| * | | additional inheritance tests | Bernhard Posselt | 2015-01-29 | 1 | -2/+44 |
| | | | |||||
* | | | Merge pull request #14145 from owncloud/no-whitespace-from-themes-master | Lukas Reschke | 2015-02-12 | 2 | -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üller | 2015-02-12 | 2 | -11/+13 |
| | | | | | | | | | | | | | | | | loading a theme | ||||
* | | | | Merge pull request #14159 from owncloud/remove-internal | Thomas Müller | 2015-02-12 | 1 | -5/+3 |
|\ \ \ \ | | | | | | | | | | | Remove internal annotation | ||||
| * | | | | Remove internal annotation | Lukas Reschke | 2015-02-12 | 1 | -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-favicon | Morris Jobke | 2015-02-12 | 2 | -4/+4 |
|\ \ \ \ | | | | | | | | | | | Disable application-specific favicons for non-user pages | ||||
| * | | | | Disable application-specific favicons for non-user pages | Lode Hoste | 2015-02-11 | 2 | -4/+4 |
| | | | | | |||||
* | | | | | Merge pull request #9038 from owncloud/add_tag_file | Lukas Reschke | 2015-02-12 | 1 | -0/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Add .tag file to make tar balls tracable | ||||
| * | | | | | Add .tag file to make tar balls tracable | Daniel Molkentin | 2014-06-14 | 1 | -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_requests | Björn Schießle | 2015-02-12 | 1 | -1/+2 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | add timeout to curl request | ||||
| * | | | | | | add timeout to curl request | Bjoern Schiessle | 2015-02-12 | 1 | -1/+2 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #13913 from rullzer/showusergroups | Lukas Reschke | 2015-02-12 | 2 | -0/+14 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | Added overview of groups a user is member of | ||||
| * | | | | | | Added overview of groups a user is a member of | Roeland Jago Douma | 2015-02-12 | 2 | -0/+14 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #14135 from cmeh/master | Morris Jobke | 2015-02-12 | 2 | -2/+2 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Clean-up of messages (orthography, format) | ||||
| * | | | | | | | Orthography: "Back-end" -> Backend (without hyphen) and correction of ↵ | cmeh | 2015-02-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "users" to the genitive "user's" | ||||
| * | | | | | | | Adding a missing space between value and unit | cmeh | 2015-02-12 | 1 | -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-fileid | Morris Jobke | 2015-02-12 | 2 | -73/+124 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Reuse known fileids and cache data in the scanner | ||||
| * | | | | | | | | only read permissions once | Robin Appelman | 2015-02-11 | 1 | -2/+3 |
| | | | | | | | | | |||||
| * | | | | | | | | Only try to scan the children of directories | Robin Appelman | 2015-02-11 | 1 | -3/+3 |
| | | | | | | | | | |||||
| * | | | | | | | | Cast mtimes and size to int | Robin Appelman | 2015-02-11 | 1 | -0/+3 |
| | | | | | | | | | |||||
| * | | | | | | | | Reuse cache data of existing files during scan | Robin Appelman | 2015-02-11 | 1 | -69/+116 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #14129 from owncloud/deprecate-oc-json | Morris Jobke | 2015-02-12 | 2 | -122/+139 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Deprecate `OC_JSON` and `OCP\JSON` | ||||
| * | | | | | | | | | Deprecate `OC_JSON` and `OCP\JSON` | Lukas Reschke | 2015-02-12 | 2 | -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 transifex | Jenkins for ownCloud | 2015-02-12 | 66 | -70/+176 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge pull request #14126 from owncloud/remove-that-old-thing | Lukas Reschke | 2015-02-11 | 1 | -54/+0 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | Remove unused file | ||||
| * | | | | | | | Remove unused file | Lukas Reschke | 2015-02-11 | 1 | -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-check | Thomas Müller | 2015-02-11 | 1 | -1/+3 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | in some case charset can be in lower case. | ||||
| * | | | | | | | in some case charset can be in lower case. | Yann VERRY | 2015-02-11 | 1 | -1/+3 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | Add strtoupper() in UTF-8 check to avoid error message | ||||
* | | | | | | | Merge pull request #13979 from ↵ | Vincent Petry | 2015-02-11 | 2 | -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 shareType | Joas Schilling | 2015-02-09 | 1 | -0/+11 |
| | | | | | | | | |||||
| * | | | | | | | Do not overwrite the shareType so the post hook is still correct | Joas Schilling | 2015-02-09 | 1 | -5/+5 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #14105 from owncloud/second-parameter-is-optional | Thomas Müller | 2015-02-11 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | Second parameter is optional | ||||
| * | | | | | | | Second parameter is optional | Lukas Reschke | 2015-02-11 | 1 | -1/+1 |
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | Makes my IDE happier. | ||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-02-11 | 61 | -37/+83 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #14074 from RealRancor/documents_preview_notes | Morris Jobke | 2015-02-11 | 1 | -0/+4 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Add hint for troubleshooting MS Word previews | ||||
| * | | | | | | | Add hint for troubleshooting MS Word previews | RealRancor | 2015-02-10 | 1 | -0/+4 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #13861 from owncloud/remove-disabled-files-repair-step | Thomas Müller | 2015-02-10 | 2 | -52/+0 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Revert "enabled disabled files app in repair step" | ||||
| * | | | | | | | Revert "enabled disabled files app in repair step" | Morris Jobke | 2015-02-03 | 2 | -52/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d70160c6077ca017d6cb7d61f066fe33e3b1e081. | ||||
* | | | | | | | | Merge pull request #14072 from owncloud/add-files-external-test-readme | Lukas Reschke | 2015-02-10 | 1 | -0/+58 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | add readme for files external tests | ||||
| * | | | | | | | add rreadme for files external tests | Morris Jobke | 2015-02-10 | 1 | -0/+58 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #11056 from AdamWill/9885-opcode | Morris Jobke | 2015-02-10 | 2 | -2/+31 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | add function to invalidate one opcache file, use it if possible #9885 |