Commit message (Expand) | 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. | Joachim Bauch | 2016-02-15 | 1 | -1/+1 | |
| | |/ / / | |/| | | | ||||||
* | | | | | [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 | Morris Jobke | 2016-02-14 | 1 | -14/+29 | |
* | | | | Merge pull request #22381 from owncloud/remove-not-needed-variable | Thomas Müller | 2016-02-15 | 1 | -1/+0 | |
|\ \ \ \ | ||||||
| * | | | | 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 | 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 | |
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-02-14 | 2 | -0/+2 | |
* | | | Merge pull request #22345 from owncloud/make-note-if-appcodechecker-is-not-en... | Thomas Müller | 2016-02-13 | 1 | -2/+0 | |
|\ \ \ | ||||||
| * | | | Add note if integrity check is disabled | Lukas Reschke | 2016-02-12 | 1 | -2/+0 | |
* | | | | Merge pull request #22343 from owncloud/check-if-admin-user | Thomas Müller | 2016-02-13 | 1 | -1/+1 | |
|\ \ \ \ | ||||||
| * | | | | Check if admin user | Lukas Reschke | 2016-02-12 | 1 | -1/+1 | |
| |/ / / | ||||||
* | | | | [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 | |
* | | | | 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 | 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 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | ||||||
| * | | | | 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 | 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 | 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 | |
|\ \ \ \ \ | |_|_|/ / |/| | | | | ||||||
| * | | | | 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 | |
|/ / / | ||||||
* | | | [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 | |
|\ \ \ | ||||||
| * | | | Also filter the old share info endpoint | Roeland Jago Douma | 2016-02-10 | 1 | -1/+5 | |
| |/ / | ||||||
* | | | Merge pull request #22269 from owncloud/issue-22243-avoid-deadlock-with-lots-... | Thomas Müller | 2016-02-10 | 1 | -8/+16 | |
|\ \ \ | ||||||
| * | | | 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 | |
|\ \ \ | ||||||
| * | | | 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 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | remember signature version and only set it on update to make sure that other | Bjoern Schiessle | 2016-02-10 | 1 | -0/+4 | |
* | | | 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 | Lukas Reschke | 2016-02-09 | 1 | -0/+1 | |
* | | | [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 | |
* | | | 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 | |
|\ \ \ | ||||||
| * | | | Catch exception | Roeland Jago Douma | 2016-02-09 | 1 | -4/+17 |