summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #8593 from eneiluj/masterMorris Jobke2018-03-081-28/+18
|\
| * Add testsRoeland Jago Douma2018-03-081-18/+8
| * Make SecurityMiddleware strictRoeland Jago Douma2018-03-081-10/+9
| * Do not throw AppNotEnabledException for app public pages - refs #6962, refs #...Julien Veyssier2018-02-281-1/+2
* | Merge pull request #8711 from nextcloud/objectstore-write-only-fopenMorris Jobke2018-03-081-7/+13
|\ \
| * | don't read existing file when overwriting using object storeRobin Appelman2018-03-071-7/+13
* | | Merge pull request #8662 from nextcloud/better-debugging-unit-testsRoeland Jago Douma2018-03-071-0/+7
|\ \ \
| * | | Single quotesJoas Schilling2018-03-071-1/+1
| * | | Suppress phan errorJoas Schilling2018-03-071-0/+1
| * | | Try without autoloadingJoas Schilling2018-03-061-1/+1
| * | | Better debugging for "Your test case is not allowed to access the database."Joas Schilling2018-03-051-0/+6
* | | | Merge pull request #8714 from nextcloud/8705Morris Jobke2018-03-071-1/+8
|\ \ \ \ | |_|/ / |/| | |
| * | | Check if the cached js file existsRoeland Jago Douma2018-03-071-1/+8
* | | | Merge pull request #8696 from nextcloud/fix-public-api-docblizzz2018-03-071-1/+1
|\ \ \ \
| * | | | Fix PHPDoc for public APIMorris Jobke2018-03-061-1/+1
* | | | | Merge pull request #8596 from nextcloud/bugfix/8454/sharee-email-matches-not-...Morris Jobke2018-03-061-4/+9
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add the users result only when non empty so tests stay the sameJoas Schilling2018-03-021-1/+3
| * | | | Also array_slice wide email matches of local usersJoas Schilling2018-03-011-4/+7
* | | | | Merge pull request #7419 from Abijeet/feature-7175Morris Jobke2018-03-068-48/+80
|\ \ \ \ \
| * | | | | reuse query builderRobin Appelman2018-01-123-10/+13
| * | | | | refactor user searchingRobin Appelman2017-12-206-48/+68
| * | | | | Adds search by email function on the users screen.Abijeet2017-12-161-2/+11
* | | | | | Merge pull request #8579 from nextcloud/feature/2692/merge-can-i-updateMorris Jobke2018-03-062-2/+4
|\ \ \ \ \ \
| * | | | | | Also allow to specify the cache file nameJoas Schilling2018-02-282-2/+4
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #5833 from nextcloud/fix_uninstall_rep_stepMorris Jobke2018-03-064-40/+10
|\ \ \ \ \ \
| * | | | | | Remove unused and outdated hookMorris Jobke2018-03-061-3/+0
| * | | | | | Remove unused $enableAppsCache in OC_AppTobia De Koninck2018-03-061-13/+0
| * | | | | | Remove OC_App::disable methodTobia De Koninck2018-03-063-17/+3
| * | | | | | Run repair steps on uninstall in all casesTobia De Koninck2018-03-062-10/+10
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #8666 from nextcloud/strict_idproofMorris Jobke2018-03-063-10/+13
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Make \OC\Security\IdentityProof strictRoeland Jago Douma2018-03-053-10/+13
* | | | | | [tx-robot] updated from transifexNextcloud bot2018-03-062-0/+2
|/ / / / /
* | | | | Merge pull request #8659 from nextcloud/csrf_token_strictRoeland Jago Douma2018-03-054-13/+17
|\ \ \ \ \
| * | | | | Make \OC\Security\CSRF strictRoeland Jago Douma2018-03-054-13/+17
| | |_|_|/ | |/| | |
* / | | | Make OC\Security\CSP strictRoeland Jago Douma2018-03-053-30/+33
|/ / / /
* | | | Merge pull request #8603 from nextcloud/enc-cleanupMorris Jobke2018-03-053-11/+0
|\ \ \ \
| * | | | this was a migration step to ownCloud 8.0 to restructure the encryption folde...Bjoern Schiessle2018-03-023-11/+0
| | |_|/ | |/| |
* | | | Fix commentsRoeland Jago Douma2018-03-053-9/+9
* | | | Fix testsRoeland Jago Douma2018-03-052-2/+2
* | | | Make \OCP\Mail strictRoeland Jago Douma2018-03-058-85/+93
* | | | [tx-robot] updated from transifexNextcloud bot2018-03-052-0/+10
* | | | [tx-robot] updated from transifexNextcloud bot2018-03-046-16/+32
* | | | Merge pull request #8289 from nextcloud/appdata_hardeningJoas Schilling2018-03-022-1/+38
|\ \ \ \
| * | | | Hardening of SimpleFile getContentRoeland Jago Douma2018-02-272-1/+38
* | | | | [tx-robot] updated from transifexNextcloud bot2018-03-0210-0/+54
* | | | | Merge pull request #8284 from nextcloud/lib_log-storage-test-failedRoeland Jago Douma2018-03-011-0/+3
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | External storage test: log exceptionsRoland Tapken2018-02-111-0/+3
* | | | | [tx-robot] updated from transifexNextcloud bot2018-03-0114-0/+58
* | | | | Correct mistaken regex wildcard in .htaccessDan Callahan2018-02-281-1/+1
| |_|/ / |/| | |
* | | | [tx-robot] updated from transifexNextcloud bot2018-02-2816-2/+42