summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* console commands shall not be limited with respect to execution time - fixes ↵Thomas Müller2015-02-161-0/+3
| | | | #14156
* [tx-robot] updated from transifexJenkins for ownCloud2015-02-166-22/+30
|
* [tx-robot] updated from transifexJenkins for ownCloud2015-02-1536-48/+98
|
* [tx-robot] updated from transifexJenkins for ownCloud2015-02-1430-70/+128
|
* Merge pull request #14206 from owncloud/issue/14204-revert-14171Thomas Müller2015-02-132-17/+1
|\ | | | | Issue/14204 revert #14171
| * Update version to a higher one then beforeJoas Schilling2015-02-131-1/+1
| |
| * Revert "Improve: Index for file_map"Joas Schilling2015-02-131-18/+0
| | | | | | | | This reverts commit c9b56084051ad33f15ad8a1a7fee95d38ba0d954.
| * Revert "Incorporate review changes"Joas Schilling2015-02-132-1/+3
|/ | | | This reverts commit f6a452cabf02e4a8005f874a77754f68abbc8fa5.
* Merge pull request #14178 from RealRancor/fix_config_sampleMorris Jobke2015-02-131-1/+1
|\ | | | | Removed anchor in config.sample.php
| * Removed anchor in config.sample.phpRealRancor2015-02-121-1/+1
| |
* | Merge pull request #14197 from ↵Lukas Reschke2015-02-132-1/+10
|\ \ | | | | | | | | | | | | owncloud/ensure-that-passed-file-path-is-always-a-string Ensure that passed argument is always a string
| * | Ensure that passed argument is always a stringLukas Reschke2015-02-132-1/+10
| | | | | | | | | | | | | | | | | | Some code paths called the `normalizePath` functionality with types other than a string which resulted in unexpected behaviour. Thus the function is now manually casting the type to a string and I corrected the usage in list.php as well.
* | | Merge pull request #14086 from hlop/masterLukas Reschke2015-02-131-1/+1
|\ \ \ | |/ / |/| | App install behind a Proxy
| * | App install behind a ProxyWitali Rott2015-02-111-1/+1
| | |
* | | Merge pull request #14171 from owncloud/fix/11639Joas Schilling2015-02-132-1/+17
|\ \ \ | | | | | | | | Improve: Index for file_map
| * | | Incorporate review changesLukas Reschke2015-02-122-3/+1
| | | |
| * | | Improve: Index for file_mapwindaishi2015-02-121-0/+18
| | |/ | |/| | | | | | | Added two indices for file_map, that improve syncing and uploading and deleting files
* / | [tx-robot] updated from transifexJenkins for ownCloud2015-02-1398-148/+22
|/ /
* | 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
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-17 06:07:46 +0000