summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-09-0518-35/+64
|
* Merge pull request #10840 from owncloud/issue_10674Jesus Macias Portela2014-09-042-1/+7
|\ | | | | Solve bug with touch always return true on /lib/private/files/view.php
| * Merge branch 'issue_10674' of github.com:owncloud/core into issue_10674Jesus Macias2014-09-030-0/+0
| |\
| | * Fix code with previous commentsJesus Macias2014-09-031-1/+1
| | |
| | * Solve bug with touch always return true on /lib/private/files/view.phpJesus Macias2014-09-032-1/+7
| | |
| * | Fix code with previous commentsJesus Macias2014-09-031-1/+1
| | |
| * | Solve bug with touch always return true on /lib/private/files/view.phpJesus Macias2014-09-031-0/+0
| | |
| * | Reset changes on 3rdparty submoduleJesus Macias2014-09-031-1/+7
| | |
* | | Merge pull request #10818 from owncloud/enableappforgroupfixLukas Reschke2014-09-045-13/+286
|\ \ \ | | | | | | | | Fix upgrade process when apps enabled for specific groups
| * | | Added unit tests for cache of enabled appsVincent Petry2014-09-031-10/+74
| | | |
| * | | Added test for needUpgrade for coreVincent Petry2014-09-021-0/+19
| | | |
| * | | Fix upgrade process when apps enabled for specific groupsVincent Petry2014-09-025-13/+203
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix issue where the currently logged user was causing side-effects when upgrading. Now setting incognito mode (no user) on update to make sure the whole apps list is taken into account with getEnabledApps() or isEnabled().
* | | | Merge pull request #10244 from owncloud/utf8-folder-testVincent Petry2014-09-041-13/+28
|\ \ \ \ | | | | | | | | | | add utf8 folder test
| * | | | add utf8 folder testJörn Friedrich Dreyer2014-08-071-13/+28
| | | | |
* | | | | Typ in whichOpenOffice testOlivier Paroz2014-09-041-1/+1
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-0473-232/+112
| | | | |
* | | | | Merge pull request #10790 from cbhp/masterLukas Reschke2014-09-031-1/+6
|\ \ \ \ \ | | | | | | | | | | | | added missing User-Agents
| * | | | | always use a user-agent constantcbhp2014-09-031-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some providers block connections with missing user-agents. Also user-agents are useful for analyzing requests. I've added a USER_AGENT constant that is used in cURL and in file_get_contents.
| * | | | | added missing User-Agentscbhp2014-08-311-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | header "User-Agent" was missed
* | | | | | Merge pull request #10849 from owncloud/UseProperRandomFunctionAndreas Fischer2014-09-034-4/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use proper RNG * owncloud/UseProperRandomFunction: Use proper RNG generator
| * | | | | | Use proper RNG generatorLukas Reschke2014-09-034-4/+4
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | OC_Util::generateRandomBytes() only returns lowercase alphanumeric values. We should use the new RNG which has a broader characterset.
* | | | | | Merge pull request #9195 from owncloud/fix-733pdessauw2014-09-033-0/+82
|\ \ \ \ \ \ | | | | | | | | | | | | | | Scroll to uploaded file in file list
| * | | | | | Highlight every uploaded files and scroll down to the last onepdessauw2014-09-033-0/+82
| | | | | | |
* | | | | | | Merge pull request #10842 from owncloud/remove-add-to-your-owncloud-if-disabledLukas Reschke2014-09-032-1/+9
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Hiding add to your own cloud if server2server sharing is not enabled
| * | | | | | Hiding add to your own cloud if server2server sharing is not enabledClark Tomlinson2014-09-032-1/+9
| | | | | | |
* | | | | | | Merge pull request #10845 from owncloud/usealphanumericstringClark Tomlinson2014-09-031-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Only return lowercase letters and digits for backwards compatbility
| * | | | | | | Only return lowercase letters and digits for backwards compatbilityLukas Reschke2014-09-031-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #10667 from pmjdebruijn/itunes-appidThomas Müller2014-09-033-2/+16
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | defaults: add customizable defaultiTunesAppId
| * | | | | | templates: use p() for getiTunesAppIdPascal de Bruijn2014-08-282-2/+2
| | | | | | |
| * | | | | | defaults: add customizable defaultiTunesAppIdPascal de Bruijn2014-08-273-2/+16
| | | | | | |
* | | | | | | Merge pull request #10642 from owncloud/securityutilsLukas Reschke2014-09-0320-55/+638
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Add some security utilities
| * | | | | | Increment versionLukas Reschke2014-09-031-1/+1
| | | | | | |
| * | | | | | Fix quotingLukas Reschke2014-09-031-1/+1
| | | | | | |
| * | | | | | Add test for the second argumentLukas Reschke2014-09-032-1/+20
| | | | | | |
| * | | | | | Refactor tests a little bitLukas Reschke2014-09-033-31/+61
| | | | | | |
| * | | | | | Fix CHAR_SYMBOLSLukas Reschke2014-09-031-1/+1
| | | | | | |
| * | | | | | Merge branch 'securityutils' of https://github.com/owncloud/core into ↵Lukas Reschke2014-09-031146-24642/+32646
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | securityutils
| | * | | | | | Use correct 3rdpartyLukas Reschke2014-08-311-0/+0
| | | | | | | |
| | * | | | | | Merge branch 'master' into securityutilsLukas Reschke2014-08-311146-24642/+32646
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/private/util.php
| * | | | | | | | Add char consts, hash the specified password for the HMACLukas Reschke2014-09-034-2/+17
| |/ / / / / / /
| * | | | | | | Use DILukas Reschke2014-08-273-12/+20
| | | | | | | |
| * | | | | | | Add some security utilitiesLukas Reschke2014-08-2718-62/+565
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds some security utilities to core including: - A library for basic crypto operations (e.g. to encrypt passwords) - A better library for cryptographic actions which allows you to specify the charset - A library for secure string comparisions Remove .htaccess Remove .htaccess Fix typo Add public API Use timing constant comparision Remove CBC constant Adjust code Remove confusing $this
* | | | | | | | Merge pull request #10826 from oparoz/masterClark Tomlinson2014-09-032-0/+49
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Adding TIFF support to the files app
| * | | | | | | | This is not a PDF, there are no pagesOlivier Paroz2014-09-031-1/+1
| | | | | | | | |
| * | | | | | | | Converts TIFF files to PNGOlivier Paroz2014-09-021-0/+48
| | | | | | | | |
| * | | | | | | | Adding support for tiff filesOlivier Paroz2014-09-021-0/+1
| | | | | | | | |
* | | | | | | | | Merge pull request #10723 from owncloud/webdav-folder-sizeClark Tomlinson2014-09-032-2/+17
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | adding new webdav property containing the folder size
| * | | | | | | | adding new webdav property containing the folder sizeThomas Müller2014-08-292-2/+17
| | | | | | | | |
* | | | | | | | | Merge pull request #10761 from canadaduane/fix_occ_upgradeThomas Müller2014-09-031-0/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Ensure db connection before changing cache state
| * | | | | | | | | Ensure db connection before changing cache stateDuane Johnson2014-08-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When trying to upgrade from 7.0.0 to 7.0.2, the manual upgrade path (e.g. ` sudo -u www-data /usr/bin/php5 ./occ upgrade`) exits with the following fatal error: ``` /var/www/owncloud# php occ upgrade PHP Fatal error: Call to a member function disableQueryStatementCaching() on a non-object in /var/www/owncloud/lib/private/db.php on line 423 ``` This is caused by the self::$connection static variable having not been initialized at the point of call. Adding a self::connect() fixes the issue. See https://forum.owncloud.org/viewtopic.php?f=29&t=23398&p=68556#p68556