summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-12-092-0/+4
|
* Merge pull request #21031 from owncloud/sanitize-findAppInDirectoriesThomas Müller2015-12-081-1/+5
|\ | | | | Sanitize the appId passed to `findAppInDirectories`
| * Sanitize the appId passed to `findAppInDirectories`Lukas Reschke2015-12-081-1/+5
| | | | | | | | Would have prevented quite some security bugs in the past. Nice hardening for now.
* | Merge pull request #21030 from owncloud/querybuilder-new-featuresThomas Müller2015-12-083-2/+99
|\ \ | | | | | | Querybuilder new features
| * | Add a method to the get "to use" table and column nameJoas Schilling2015-12-083-2/+38
| | |
| * | Add select distinct to the query builderJoas Schilling2015-12-082-0/+38
| | |
| * | Allow getting the last insert id without much hassleJoas Schilling2015-12-082-0/+23
| |/
* | Merge pull request #20786 from owncloud/systemtags-davThomas Müller2015-12-083-4/+8
|\ \ | | | | | | DAV endpoint for system tags
| * | Fixed system tags DAV and API and docsVincent Petry2015-12-043-4/+4
| | |
| * | Added dav endpoints for system tagsVincent Petry2015-12-031-0/+4
| | |
* | | Merge pull request #21022 from owncloud/get-rid-of-by-referenceThomas Müller2015-12-084-12/+14
|\ \ \ | | | | | | | | Get rid of by reference
| * | | Use \OCP\Util::sanitizeHTML instead of \OC_Util::sanitizeHTMLLukas Reschke2015-12-083-8/+8
| | | |
| * | | Get rid of passing a referenceLukas Reschke2015-12-081-4/+6
| | |/ | |/| | | | | | | Fixes https://github.com/owncloud/core/issues/14643
* | | Do not trust castingLukas Reschke2015-12-081-1/+1
| | |
* | | Remove unused repair stepsLukas Reschke2015-12-082-85/+2
| | | | | | | | | | | | These ones are not necessary anymore for the new major release.
* | | Remove legacy checkLukas Reschke2015-12-081-5/+0
|/ / | | | | | | This one is not required anymore as we have the RepairConfig repair step since November 2014.
* | [tx-robot] updated from transifexJenkins for ownCloud2015-12-084-4/+14
| |
* | Merge pull request #20996 from ↵Thomas Müller2015-12-071-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-urlJoas Schilling2015-12-071-3/+5
| | |
| * | Remove password reset when the user can not change the passwordJoas Schilling2015-12-071-0/+6
| | |
* | | Scrutinizer Auto-FixesScrutinizer Auto-Fixer2015-12-073-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-overwrittenThomas Müller2015-12-071-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 appJoas Schilling2015-12-071-3/+7
| |/ /
* | | Merge pull request #20981 from ↵Thomas Müller2015-12-071-1/+3
|\ \ \ | |/ / |/| | | | | | | | owncloud/issue-19848-multiple-emails-for-sharelink Allow sending a share email to multiple users
| * | Allow sending a share email to multiple usersJoas Schilling2015-12-071-1/+3
| | |
* | | Merge pull request #20960 from owncloud/drop-OC_Util-getUrlContentThomas Müller2015-12-072-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 interfacesMorris Jobke2015-12-042-19/+12
| | | |
* | | | Merge pull request #11131 from owncloud/use-phpini-wrapperThomas Müller2015-12-077-14/+16
|\ \ \ \ | | | | | | | | | | Replacing ini_get instances with inigetwrapper usages
| * | | | Replace new occurences of ini_get with IniWrapper methodsMorris Jobke2015-11-234-7/+9
| | | | |
| * | | | Replacing ini_get instances with inigetwrapper usagesClark Tomlinson2015-11-235-7/+7
| | | | |
* | | | | Merge pull request #20904 from owncloud/view-mime-filterThomas Müller2015-12-071-6/+2
|\ \ \ \ \ | | | | | | | | | | | | Fix mimetype filter in getDirectoryContent
| * | | | | Fix mimetype filter in getDirectoryContentRobin Appelman2015-12-031-6/+2
| | | | | |
* | | | | | Merge pull request #20949 from owncloud/fix_20892Thomas Müller2015-12-071-4/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | [Sharing] Properly check if a group already has access
| * | | | | | [Sharing] Properly check if a group already has accessRoeland Jago Douma2015-12-041-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-signatureThomas Müller2015-12-071-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use correct method signature
| * | | | | | Use correct method signatureLukas Reschke2015-12-041-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | This function takes only one parameter
* | | | | | Merge pull request #20959 from owncloud/drop-OC_App-setActiveNavigationEntryThomas Müller2015-12-072-32/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Remove unused setActiveNavigationEntry of OC_App - it's also in OCP\App
| * | | | | remove OC_App::getActiveNavigationEntry - not unsed anymoreMorris Jobke2015-12-041-14/+0
| | | | | |
| * | | | | Remove unused setActiveNavigationEntry of OC_App - it's also in OCP\AppMorris Jobke2015-12-042-18/+2
| |/ / / /
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-12-072-0/+6
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-12-064-2/+14
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-12-058-8/+40
|/ / / /
* | | | Merge pull request #20933 from owncloud/more-OC_Config-cleanupsThomas Müller2015-12-048-10/+11
|\ \ \ \ | | | | | | | | | | More cleanups of OC_Config usage
| * | | | More cleanups of OC_Config usageMorris Jobke2015-12-038-10/+11
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-12-042-0/+2
| | | | |
* | | | | Merge pull request #20807 from ↵Thomas Müller2015-12-037-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 templateLukas Reschke2015-11-307-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-jobThomas Müller2015-12-031-1/+0
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Move files/ajax/scan.php to background job
| * | | | | Move files/ajax/scan.php to background jobLukas Reschke2015-11-281-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-linkThomas Müller2015-12-031-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use URLGenerator instead of hard-coded WEBROOT