summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | | | | | | | Merge pull request #10725 from owncloud/sabredav-etag-masterThomas Müller2014-09-033-15/+20
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | adding OC-ETag header
| * | | | | | | | adding OC-ETag headerThomas Müller2014-08-293-15/+20
| | |/ / / / / / | |/| | | | | |
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-0323-16/+56
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge pull request #10816 from owncloud/app-nav-submitjbtbnl2014-09-021-1/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Also style submit buttons for navigation inputs
| * | | | | | | also style submit buttonsBernhard Posselt2014-09-021-1/+2
| | | | | | | |
* | | | | | | | Merge pull request #10697 from owncloud/fs-no-autosetupRobin Appelman2014-09-024-19/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Don't automatically setup the filesystem the moment we load OC\Files\Filesystem
| * | | | | | | | Also setup the filesystem when matching routesRobin Appelman2014-09-021-0/+1
| | | | | | | | |
| * | | | | | | | Remove unneeded file initialization in encryption, already handled in a hookRobin Appelman2014-09-021-16/+0
| | | | | | | | |
| * | | | | | | | Don't automatically setup the filesystem the moment we load OC\Files\FileSystemRobin Appelman2014-09-023-3/+6
|/ / / / / / / /
* | | | | | | | Merge pull request #10807 from owncloud/acceptance-readmeVincent Petry2014-09-021-4/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Fixed readme for acceptance tests
| * | | | | | | Fixed readme for acceptance testsVincent Petry2014-09-011-4/+4
| | | | | | | |
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-0275-13/+194
|/ / / / / / /
* | | | | | | Merge pull request #10733 from owncloud/acceptance_testsfelixboehm2014-09-0128-0/+2049
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | ownCloud acceptance tests
| * | | | | | | further documentationFelix Böhm2014-08-291-3/+44
| | | | | | | |
| * | | | | | | fix login suiteFelix Böhm2014-08-292-7/+11
| | | | | | | |
| * | | | | | | bump version of protractor in package.jsonFelix Böhm2014-08-291-1/+1
| | | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-10 16:54:21 +0000