Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-05 | 18 | -35/+64 |
| | |||||
* | Merge pull request #10840 from owncloud/issue_10674 | Jesus Macias Portela | 2014-09-04 | 2 | -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_10674 | Jesus Macias | 2014-09-03 | 0 | -0/+0 |
| |\ | |||||
| | * | Fix code with previous comments | Jesus Macias | 2014-09-03 | 1 | -1/+1 |
| | | | |||||
| | * | Solve bug with touch always return true on /lib/private/files/view.php | Jesus Macias | 2014-09-03 | 2 | -1/+7 |
| | | | |||||
| * | | Fix code with previous comments | Jesus Macias | 2014-09-03 | 1 | -1/+1 |
| | | | |||||
| * | | Solve bug with touch always return true on /lib/private/files/view.php | Jesus Macias | 2014-09-03 | 1 | -0/+0 |
| | | | |||||
| * | | Reset changes on 3rdparty submodule | Jesus Macias | 2014-09-03 | 1 | -1/+7 |
| | | | |||||
* | | | Merge pull request #10818 from owncloud/enableappforgroupfix | Lukas Reschke | 2014-09-04 | 5 | -13/+286 |
|\ \ \ | | | | | | | | | Fix upgrade process when apps enabled for specific groups | ||||
| * | | | Added unit tests for cache of enabled apps | Vincent Petry | 2014-09-03 | 1 | -10/+74 |
| | | | | |||||
| * | | | Added test for needUpgrade for core | Vincent Petry | 2014-09-02 | 1 | -0/+19 |
| | | | | |||||
| * | | | Fix upgrade process when apps enabled for specific groups | Vincent Petry | 2014-09-02 | 5 | -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-test | Vincent Petry | 2014-09-04 | 1 | -13/+28 |
|\ \ \ \ | | | | | | | | | | | add utf8 folder test | ||||
| * | | | | add utf8 folder test | Jörn Friedrich Dreyer | 2014-08-07 | 1 | -13/+28 |
| | | | | | |||||
* | | | | | Typ in whichOpenOffice test | Olivier Paroz | 2014-09-04 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-04 | 73 | -232/+112 |
| | | | | | |||||
* | | | | | Merge pull request #10790 from cbhp/master | Lukas Reschke | 2014-09-03 | 1 | -1/+6 |
|\ \ \ \ \ | | | | | | | | | | | | | added missing User-Agents | ||||
| * | | | | | always use a user-agent constant | cbhp | 2014-09-03 | 1 | -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-Agents | cbhp | 2014-08-31 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | header "User-Agent" was missed | ||||
* | | | | | | Merge pull request #10849 from owncloud/UseProperRandomFunction | Andreas Fischer | 2014-09-03 | 4 | -4/+4 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use proper RNG * owncloud/UseProperRandomFunction: Use proper RNG generator | ||||
| * | | | | | | Use proper RNG generator | Lukas Reschke | 2014-09-03 | 4 | -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-733 | pdessauw | 2014-09-03 | 3 | -0/+82 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Scroll to uploaded file in file list | ||||
| * | | | | | | Highlight every uploaded files and scroll down to the last one | pdessauw | 2014-09-03 | 3 | -0/+82 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #10842 from owncloud/remove-add-to-your-owncloud-if-disabled | Lukas Reschke | 2014-09-03 | 2 | -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 enabled | Clark Tomlinson | 2014-09-03 | 2 | -1/+9 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #10845 from owncloud/usealphanumericstring | Clark Tomlinson | 2014-09-03 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Only return lowercase letters and digits for backwards compatbility | ||||
| * | | | | | | | Only return lowercase letters and digits for backwards compatbility | Lukas Reschke | 2014-09-03 | 1 | -1/+1 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #10667 from pmjdebruijn/itunes-appid | Thomas Müller | 2014-09-03 | 3 | -2/+16 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | defaults: add customizable defaultiTunesAppId | ||||
| * | | | | | | templates: use p() for getiTunesAppId | Pascal de Bruijn | 2014-08-28 | 2 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | defaults: add customizable defaultiTunesAppId | Pascal de Bruijn | 2014-08-27 | 3 | -2/+16 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #10642 from owncloud/securityutils | Lukas Reschke | 2014-09-03 | 20 | -55/+638 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | Add some security utilities | ||||
| * | | | | | | Increment version | Lukas Reschke | 2014-09-03 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Fix quoting | Lukas Reschke | 2014-09-03 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Add test for the second argument | Lukas Reschke | 2014-09-03 | 2 | -1/+20 |
| | | | | | | | |||||
| * | | | | | | Refactor tests a little bit | Lukas Reschke | 2014-09-03 | 3 | -31/+61 |
| | | | | | | | |||||
| * | | | | | | Fix CHAR_SYMBOLS | Lukas Reschke | 2014-09-03 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'securityutils' of https://github.com/owncloud/core into ↵ | Lukas Reschke | 2014-09-03 | 1146 | -24642/+32646 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | securityutils | ||||
| | * | | | | | | Use correct 3rdparty | Lukas Reschke | 2014-08-31 | 1 | -0/+0 |
| | | | | | | | | |||||
| | * | | | | | | Merge branch 'master' into securityutils | Lukas Reschke | 2014-08-31 | 1146 | -24642/+32646 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/private/util.php | ||||
| * | | | | | | | | Add char consts, hash the specified password for the HMAC | Lukas Reschke | 2014-09-03 | 4 | -2/+17 |
| |/ / / / / / / | |||||
| * | | | | | | | Use DI | Lukas Reschke | 2014-08-27 | 3 | -12/+20 |
| | | | | | | | | |||||
| * | | | | | | | Add some security utilities | Lukas Reschke | 2014-08-27 | 18 | -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/master | Clark Tomlinson | 2014-09-03 | 2 | -0/+49 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Adding TIFF support to the files app | ||||
| * | | | | | | | | This is not a PDF, there are no pages | Olivier Paroz | 2014-09-03 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Converts TIFF files to PNG | Olivier Paroz | 2014-09-02 | 1 | -0/+48 |
| | | | | | | | | | |||||
| * | | | | | | | | Adding support for tiff files | Olivier Paroz | 2014-09-02 | 1 | -0/+1 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #10723 from owncloud/webdav-folder-size | Clark Tomlinson | 2014-09-03 | 2 | -2/+17 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | adding new webdav property containing the folder size | ||||
| * | | | | | | | | adding new webdav property containing the folder size | Thomas Müller | 2014-08-29 | 2 | -2/+17 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #10761 from canadaduane/fix_occ_upgrade | Thomas Müller | 2014-09-03 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Ensure db connection before changing cache state | ||||
| * | | | | | | | | | Ensure db connection before changing cache state | Duane Johnson | 2014-08-30 | 1 | -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 |