Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-12-09 | 2 | -0/+4 |
| | |||||
* | Merge pull request #21031 from owncloud/sanitize-findAppInDirectories | Thomas Müller | 2015-12-08 | 1 | -1/+5 |
|\ | | | | | Sanitize the appId passed to `findAppInDirectories` | ||||
| * | Sanitize the appId passed to `findAppInDirectories` | Lukas Reschke | 2015-12-08 | 1 | -1/+5 |
| | | | | | | | | Would have prevented quite some security bugs in the past. Nice hardening for now. | ||||
* | | Merge pull request #21030 from owncloud/querybuilder-new-features | Thomas Müller | 2015-12-08 | 3 | -2/+99 |
|\ \ | | | | | | | Querybuilder new features | ||||
| * | | Add a method to the get "to use" table and column name | Joas Schilling | 2015-12-08 | 3 | -2/+38 |
| | | | |||||
| * | | Add select distinct to the query builder | Joas Schilling | 2015-12-08 | 2 | -0/+38 |
| | | | |||||
| * | | Allow getting the last insert id without much hassle | Joas Schilling | 2015-12-08 | 2 | -0/+23 |
| |/ | |||||
* | | Merge pull request #20786 from owncloud/systemtags-dav | Thomas Müller | 2015-12-08 | 3 | -4/+8 |
|\ \ | | | | | | | DAV endpoint for system tags | ||||
| * | | Fixed system tags DAV and API and docs | Vincent Petry | 2015-12-04 | 3 | -4/+4 |
| | | | |||||
| * | | Added dav endpoints for system tags | Vincent Petry | 2015-12-03 | 1 | -0/+4 |
| | | | |||||
* | | | Merge pull request #21022 from owncloud/get-rid-of-by-reference | Thomas Müller | 2015-12-08 | 4 | -12/+14 |
|\ \ \ | | | | | | | | | Get rid of by reference | ||||
| * | | | Use \OCP\Util::sanitizeHTML instead of \OC_Util::sanitizeHTML | Lukas Reschke | 2015-12-08 | 3 | -8/+8 |
| | | | | |||||
| * | | | Get rid of passing a reference | Lukas Reschke | 2015-12-08 | 1 | -4/+6 |
| | |/ | |/| | | | | | | | Fixes https://github.com/owncloud/core/issues/14643 | ||||
* | | | Do not trust casting | Lukas Reschke | 2015-12-08 | 1 | -1/+1 |
| | | | |||||
* | | | Remove unused repair steps | Lukas Reschke | 2015-12-08 | 2 | -85/+2 |
| | | | | | | | | | | | | These ones are not necessary anymore for the new major release. | ||||
* | | | Remove legacy check | Lukas Reschke | 2015-12-08 | 1 | -5/+0 |
|/ / | | | | | | | This one is not required anymore as we have the RepairConfig repair step since November 2014. | ||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-12-08 | 4 | -4/+14 |
| | | |||||
* | | Merge pull request #20996 from ↵ | Thomas Müller | 2015-12-07 | 1 | -0/+8 |
|\ \ | | | | | | | | | | | | | owncloud/issue-12215-remove-password-reset-when-not-possible Issue 12215 remove password reset when not possible | ||||
| * | | Allow specifying a custom reset-password-url | Joas Schilling | 2015-12-07 | 1 | -3/+5 |
| | | | |||||
| * | | Remove password reset when the user can not change the password | Joas Schilling | 2015-12-07 | 1 | -0/+6 |
| | | | |||||
* | | | Scrutinizer Auto-Fixes | Scrutinizer Auto-Fixer | 2015-12-07 | 3 | -4/+0 |
| | | | | | | | | | | | | This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com | ||||
* | | | Merge pull request #20993 from owncloud/issue-20666-language-always-overwritten | Thomas Müller | 2015-12-07 | 1 | -3/+7 |
|\ \ \ | | | | | | | | | Do not overwrite the language when it's just missing for one app | ||||
| * | | | Do not overwrite the language when it's just missing for one app | Joas Schilling | 2015-12-07 | 1 | -3/+7 |
| |/ / | |||||
* | | | Merge pull request #20981 from ↵ | Thomas Müller | 2015-12-07 | 1 | -1/+3 |
|\ \ \ | |/ / |/| | | | | | | | | owncloud/issue-19848-multiple-emails-for-sharelink Allow sending a share email to multiple users | ||||
| * | | Allow sending a share email to multiple users | Joas Schilling | 2015-12-07 | 1 | -1/+3 |
| | | | |||||
* | | | Merge pull request #20960 from owncloud/drop-OC_Util-getUrlContent | Thomas Müller | 2015-12-07 | 2 | -19/+12 |
|\ \ \ | | | | | | | | | Remove OC_Util::getUrlContent and replace by proper usage of public i… | ||||
| * | | | Remove OC_Util::getUrlContent and replace by proper usage of public interfaces | Morris Jobke | 2015-12-04 | 2 | -19/+12 |
| | | | | |||||
* | | | | Merge pull request #11131 from owncloud/use-phpini-wrapper | Thomas Müller | 2015-12-07 | 7 | -14/+16 |
|\ \ \ \ | | | | | | | | | | | Replacing ini_get instances with inigetwrapper usages | ||||
| * | | | | Replace new occurences of ini_get with IniWrapper methods | Morris Jobke | 2015-11-23 | 4 | -7/+9 |
| | | | | | |||||
| * | | | | Replacing ini_get instances with inigetwrapper usages | Clark Tomlinson | 2015-11-23 | 5 | -7/+7 |
| | | | | | |||||
* | | | | | Merge pull request #20904 from owncloud/view-mime-filter | Thomas Müller | 2015-12-07 | 1 | -6/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix mimetype filter in getDirectoryContent | ||||
| * | | | | | Fix mimetype filter in getDirectoryContent | Robin Appelman | 2015-12-03 | 1 | -6/+2 |
| | | | | | | |||||
* | | | | | | Merge pull request #20949 from owncloud/fix_20892 | Thomas Müller | 2015-12-07 | 1 | -4/+2 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | [Sharing] Properly check if a group already has access | ||||
| * | | | | | | [Sharing] Properly check if a group already has access | Roeland Jago Douma | 2015-12-04 | 1 | -4/+2 |
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old code check was to liberal resulting in wrong matches if a user with the same name as the group already had access. Fixes 20892 | ||||
* | | | | | | Merge pull request #20957 from owncloud/use-correct-method-signature | Thomas Müller | 2015-12-07 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Use correct method signature | ||||
| * | | | | | | Use correct method signature | Lukas Reschke | 2015-12-04 | 1 | -1/+1 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | This function takes only one parameter | ||||
* | | | | | | Merge pull request #20959 from owncloud/drop-OC_App-setActiveNavigationEntry | Thomas Müller | 2015-12-07 | 2 | -32/+2 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | Remove unused setActiveNavigationEntry of OC_App - it's also in OCP\App | ||||
| * | | | | | remove OC_App::getActiveNavigationEntry - not unsed anymore | Morris Jobke | 2015-12-04 | 1 | -14/+0 |
| | | | | | | |||||
| * | | | | | Remove unused setActiveNavigationEntry of OC_App - it's also in OCP\App | Morris Jobke | 2015-12-04 | 2 | -18/+2 |
| |/ / / / | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-12-07 | 2 | -0/+6 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-12-06 | 4 | -2/+14 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-12-05 | 8 | -8/+40 |
|/ / / / | |||||
* | | | | Merge pull request #20933 from owncloud/more-OC_Config-cleanups | Thomas Müller | 2015-12-04 | 8 | -10/+11 |
|\ \ \ \ | | | | | | | | | | | More cleanups of OC_Config usage | ||||
| * | | | | More cleanups of OC_Config usage | Morris Jobke | 2015-12-03 | 8 | -10/+11 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-12-04 | 2 | -0/+2 |
| | | | | | |||||
* | | | | | Merge pull request #20807 from ↵ | Thomas Müller | 2015-12-03 | 7 | -37/+178 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/dont-append-redirect-url-if-user-is-already-logged-in Don't append redirect URL if user is logged-in | ||||
| * | | | | | Show error template | Lukas Reschke | 2015-11-30 | 7 | -37/+178 |
| | | | | | | | | | | | | | | | | | | | | | | | | Otherwise this leads to an endless redirection in case of a CSRF exception. Also sets user expectation right. | ||||
* | | | | | | Merge pull request #20545 from owncloud/scan-storage-in-background-job | Thomas Müller | 2015-12-03 | 1 | -1/+0 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Move files/ajax/scan.php to background job | ||||
| * | | | | | Move files/ajax/scan.php to background job | Lukas Reschke | 2015-11-28 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | The background job will now be executed in chunks of 500 users all 10 minutes. | ||||
* | | | | | | Merge pull request #20924 from owncloud/use-url-generator-to-generate-link | Thomas Müller | 2015-12-03 | 1 | -2/+2 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Use URLGenerator instead of hard-coded WEBROOT |