Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #22407 from fancycode/untrusted_domain | Thomas Müller | 2016-02-16 | 1 | -1/+1 |
|\ | | | | | Pass checked host as "domain" variable to "untrustedDomain" template. | ||||
| * | Pass checked host as "domain" variable to "untrustedDomain" template. | Joachim Bauch | 2016-02-15 | 1 | -1/+1 |
| | | | | | | | | Currently the "SERVER_NAME" is passed to the template, which in some cases doesn't match the host returned by "getInsecureServerHost" (or is empty). | ||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-02-16 | 2 | -0/+2 |
| | | |||||
* | | Merge pull request #22376 from owncloud/fix-return-code-getAppPath | Thomas Müller | 2016-02-15 | 1 | -14/+29 |
|\ \ | |/ |/| | Properly handle return code of OC_App::getAppPath | ||||
| * | Properly handle return code of OC_App::getAppPath | Morris Jobke | 2016-02-14 | 1 | -14/+29 |
| | | | | | | | | | | * fixes #20128 * getAppPath could return false, but it was not handled everywhere | ||||
* | | Merge pull request #22381 from owncloud/remove-not-needed-variable | Thomas Müller | 2016-02-15 | 1 | -1/+0 |
|\ \ | | | | | | | Remove not needed variable | ||||
| * | | Remove not needed variable | Morris Jobke | 2016-02-14 | 1 | -1/+0 |
| |/ | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-02-15 | 6 | -0/+10 |
| | | |||||
* | | Merge pull request #22380 from owncloud/make-scrutinizer-happy | Thomas Müller | 2016-02-15 | 2 | -2/+2 |
|\ \ | | | | | | | Fix typo in PHPDoc | ||||
| * | | Fix typo in PHPDoc | Morris Jobke | 2016-02-14 | 2 | -2/+2 |
| |/ | |||||
* / | Remove unreachable code in priavte/api.php | Morris Jobke | 2016-02-14 | 1 | -5/+0 |
|/ | |||||
* | Fix BMP support | Morris Jobke | 2016-02-14 | 1 | -0/+1 |
| | | | | * fixes #16461 | ||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-02-14 | 2 | -0/+2 |
| | |||||
* | Merge pull request #22345 from ↵ | Thomas Müller | 2016-02-13 | 1 | -2/+0 |
|\ | | | | | | | | | owncloud/make-note-if-appcodechecker-is-not-enabled Add note if integrity check is disabled | ||||
| * | Add note if integrity check is disabled | Lukas Reschke | 2016-02-12 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | Our issue template states that users should post the output of `/index.php/settings/integrity/failed`, at the moment it displays that all passes have been passed if the integrity checker has been disabled. This is however a wrong approach considering that some distributions are gonna package Frankenstein releases and makes it harder for us to detect such issues. Thus if the integrity code checker is disabled (using the config switch) it displays now: `Appcode checker has been disabled. Integrity cannot be verified.` This is not displayed anywhere else in the UI except these URL used for us for debugging purposes. | ||||
* | | Merge pull request #22343 from owncloud/check-if-admin-user | Thomas Müller | 2016-02-13 | 1 | -1/+1 |
|\ \ | | | | | | | Check if admin user | ||||
| * | | Check if admin user | Lukas Reschke | 2016-02-12 | 1 | -1/+1 |
| |/ | | | | | | | We should not add the JS for not admin users. | ||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-02-13 | 10 | -0/+12 |
| | | |||||
* | | Always set up a config object within the user object | Morris Jobke | 2016-02-12 | 1 | -15/+10 |
| | | | | | | | | * the new getEmailAddress and setEmailAddress relies on this anyway | ||||
* | | Merge pull request #22309 from owncloud/infinite-recursion-on-expired-link | Thomas Müller | 2016-02-12 | 1 | -2/+2 |
|\ \ | | | | | | | Do not getShare in deleteShare, it's already there when deleting | ||||
| * | | Do not getShare in deleteShare, it's already there when deleting | Joas Schilling | 2016-02-11 | 1 | -2/+2 |
| | | | |||||
* | | | Merge pull request #22317 from owncloud/fix_invisible_linkshares | Thomas Müller | 2016-02-12 | 2 | -0/+27 |
|\ \ \ | |_|/ |/| | | Do not allow invisible link shares | ||||
| * | | Add parent for invisible link shares | Roeland Jago Douma | 2016-02-11 | 2 | -0/+27 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-02-12 | 84 | -84/+12 |
| | | | |||||
* | | | Merge pull request #22315 from owncloud/update-info-checker-requirements | Thomas Müller | 2016-02-11 | 1 | -12/+5 |
|\ \ \ | | | | | | | | | Update info checker requirements | ||||
| * | | | Update info checker requirements | Joas Schilling | 2016-02-11 | 1 | -12/+5 |
| | |/ | |/| | |||||
* | | | Merge pull request #22264 from owncloud/read-version-from-info.xml-only | Thomas Müller | 2016-02-11 | 4 | -19/+6 |
|\ \ \ | | | | | | | | | No longer evaluate appinfo/version | ||||
| * | | | No longer evaluate appinfo/version | Thomas Müller | 2016-02-10 | 4 | -19/+6 |
| | | | | |||||
* | | | | Merge pull request #22308 from owncloud/shorter-ttl-find-path | Thomas Müller | 2016-02-11 | 1 | -1/+2 |
|\ \ \ \ | |_|_|/ |/| | | | Shorter TTL on findBinaryPath caching | ||||
| * | | | Fixes #13658 | Thomas Müller | 2016-02-11 | 1 | -1/+2 |
| | |/ | |/| | |||||
* / | | Properly check for legacy methods | Roeland Jago Douma | 2016-02-11 | 2 | -3/+10 |
|/ / | | | | | | | | | | | | | | | The new shares are completely without parents eventually. But for some current legacy reasons the methods are still around. But we should properly check for them. Fixes #22309 | ||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-02-11 | 2 | -0/+2 |
| | | |||||
* | | Merge pull request #22285 from owncloud/fix_22275 | Thomas Müller | 2016-02-10 | 1 | -1/+5 |
|\ \ | | | | | | | Only show link shares for the current user | ||||
| * | | Also filter the old share info endpoint | Roeland Jago Douma | 2016-02-10 | 1 | -1/+5 |
| |/ | | | | | | | Make sure we do not show an icon if we can't display a share | ||||
* | | Merge pull request #22269 from ↵ | Thomas Müller | 2016-02-10 | 1 | -8/+16 |
|\ \ | | | | | | | | | | | | | owncloud/issue-22243-avoid-deadlock-with-lots-of-entries-to-cleanup Chunk the cleanup queries to make sure they don't time out | ||||
| * | | Chunk the queries to make sure they don't time out | Joas Schilling | 2016-02-10 | 1 | -8/+16 |
| |/ | |||||
* | | Merge pull request #22271 from owncloud/remember-login-state | Thomas Müller | 2016-02-10 | 1 | -0/+1 |
|\ \ | | | | | | | Remember previous state of remember login checkbox | ||||
| * | | refactoring code | Vincent Chan | 2016-02-10 | 1 | -0/+1 |
| |/ | |||||
* | | Merge pull request #22267 from owncloud/fix_encryption2 | Thomas Müller | 2016-02-10 | 1 | -0/+4 |
|\ \ | |/ |/| | calculate and update the version of the encryption signature correctly | ||||
| * | remember signature version and only set it on update to make sure that other | Bjoern Schiessle | 2016-02-10 | 1 | -0/+4 |
| | | | | | | | | apps like files_versions still get the old signature version | ||||
* | | Merge pull request #22256 from owncloud/hide-updater-secret | Thomas Müller | 2016-02-10 | 1 | -0/+1 |
|\ \ | |/ |/| | Hide updater.secret from occ output by default | ||||
| * | Hide updater.secret from occ output by default | Lukas Reschke | 2016-02-09 | 1 | -0/+1 |
| | | | | | | | | We should not have people post that value to us. | ||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-02-10 | 2 | -0/+4 |
| | | |||||
* | | Check if partial cache entry or not in encryption wrapper | Vincent Petry | 2016-02-09 | 1 | -2/+5 |
| | | |||||
* | | Use database for keeping track of the version | Lukas Reschke | 2016-02-09 | 3 | -3/+18 |
| | | |||||
* | | Use number of chunk for HMAC as well | Lukas Reschke | 2016-02-09 | 1 | -5/+13 |
| | | | | | | | | Prevents switching single blocks within the encrypted file. | ||||
* | | fixing unit tests | Björn Schießle | 2016-02-09 | 1 | -0/+3 |
| | | |||||
* | | make it backward compatible to work with signed and un-signed files | Björn Schießle | 2016-02-09 | 3 | -8/+15 |
| | | |||||
* | | Merge pull request #22192 from owncloud/fix_19685 | Thomas Müller | 2016-02-09 | 3 | -7/+35 |
|\ \ | | | | | | | Only set the default expiration date on share creation | ||||
| * | | Catch exception | Roeland Jago Douma | 2016-02-09 | 1 | -4/+17 |
| | | |