summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5953 from nextcloud/theming-lightness-correctionLukas Reschke2017-08-021-4/+7
|\ | | | | Use same lightness calculation as the SCSS compiler for theming
| * Use same lightness calculation as the SCSS compiler for themingJulius Härtl2017-08-011-4/+7
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | Merge pull request #5816 from nextcloud/fix-oracleMorris Jobke2017-08-0220-98/+215
|\ \ | | | | | | Fix oracle
| * | Add a method to compare empty strings with an expressionJoas Schilling2017-08-024-1/+64
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Fix repair step for oracle...Joas Schilling2017-08-021-1/+1
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Fix last failures with oracleJoas Schilling2017-08-023-5/+12
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Fix querybuilder and functionbuilder testsJoas Schilling2017-08-022-25/+33
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Fix ILIKE regex for oracleJoas Schilling2017-08-021-1/+1
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Fix auth providerJoas Schilling2017-08-021-1/+1
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Use selectAlias()Joas Schilling2017-08-021-2/+4
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Can not insert auto increment on oracleJoas Schilling2017-08-025-46/+53
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Fix missing escape on column and table nameJoas Schilling2017-08-021-1/+1
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Fix clob comparisonJoas Schilling2017-08-021-1/+1
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Allow to specify the table space on occJoas Schilling2017-08-021-0/+4
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Quote aliases as wellJoas Schilling2017-08-022-10/+24
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Oracle does not support PDO::FETCH_KEY_PAIRJoas Schilling2017-08-022-7/+19
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #5682 from nextcloud/inline-svg-iconMorris Jobke2017-08-026-15/+22
|\ \ \ | | | | | | | | Proof of concept #5593 - inline SVG icon for icon-contacts
| * | | Replace `include` with `file_get_contents`Marin Treselj2017-08-021-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Marin Treselj <marin@pixelipo.com>
| * | | Proof of concept #5593 - inline SVG icon for icon-contactsMarin Treselj2017-08-026-15/+22
|/ / / | | | | | | | | | Signed-off-by: Marin Treselj <marin@pixelipo.com>
* | | Merge pull request #5920 from nextcloud/gallery-share-view-fixMorris Jobke2017-08-024-10/+10
|\ \ \ | | | | | | | | Top bar buttons in share view are wrong positioned
| * | | Make sure this still works in other apps.Marin Treselj2017-08-021-4/+4
| | | | | | | | | | | | | | | | Signed-off-by: Marin Treselj <marin@pixelipo.com>
| * | | Change id to class in the main share templateMarin Treselj2017-07-311-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Marin Treselj <marin@pixelipo.com>
| * | | Fixes nextcloud/gallery#269Marin Treselj2017-07-283-8/+8
| | | | | | | | | | | | | | | | Signed-off-by: Marin Treselj <marin@pixelipo.com>
* | | | Merge pull request #4790 from nextcloud/fix-comparisons-in-appsMorris Jobke2017-08-0231-143/+139
|\ \ \ \ | | | | | | | | | | Fix comparisons in apps
| * | | | Remove undocumented configJoas Schilling2017-08-011-77/+73
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Fix versions appJoas Schilling2017-08-011-3/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Fix file size comparisonJoas Schilling2017-08-011-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Fix comparisions in the trashbin appJoas Schilling2017-08-012-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Fix comparisons in the sharing appJoas Schilling2017-08-015-10/+10
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Fix comparisons in the files external appJoas Schilling2017-08-019-26/+26
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Fix comparisons in the files appJoas Schilling2017-08-013-3/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Fix comparison in the ldap appJoas Schilling2017-08-011-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Fix comparisons in the versions appJoas Schilling2017-08-012-12/+12
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Fix comparisons in the dav appJoas Schilling2017-08-017-9/+9
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Fix comparisons in encryption appJoas Schilling2017-08-012-4/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | Merge pull request #5956 from nextcloud/proper-update-notification-layoutMorris Jobke2017-08-024-20/+52
|\ \ \ \ \ | | | | | | | | | | | | Improve update notification layout and show non-default update server
| * | | | | Improve update notification layout and show non-default update serverMorris Jobke2017-08-024-20/+52
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Merge pull request #5923 from nextcloud/expire-federation-jobsRoeland Jago Douma2017-08-0215-219/+400
|\ \ \ \ \ \ | | | | | | | | | | | | | | Expire federation jobs
| * | | | | | Close all the cursorsJoas Schilling2017-08-021-12/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | Use automatic injection whenever possibleJoas Schilling2017-08-026-80/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | Use ITimeFactoryRoeland Jago Douma2017-08-019-103/+231
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Inject the timefacotry so we can mock it properly in the tests. * Extended unit tests to cover the new paths Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | | we don't need to remove the job manually here, even if we ask once more the ↵Bjoern Schiessle2017-08-012-11/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | other server will decline and the background job will be removed Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | | | | update unit testsBjoern Schiessle2017-08-012-12/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | | | | cleanup constructorsBjoern Schiessle2017-08-012-53/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | | | | expire requestSharedSecret job after 30 daysBjoern Schiessle2017-08-013-5/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | | | | expire getShareadSecret job after 30 daysBjoern Schiessle2017-08-013-12/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | | | | Merge pull request #5952 from nextcloud/appmanager-isshippedMorris Jobke2017-08-024-24/+16
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Use public methods for OC_App::isShipped
| * | | | | | Use public methods for OC_App::isShippedMorris Jobke2017-08-014-24/+16
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Merge pull request #5949 from nextcloud/fix-broken-codeMorris Jobke2017-08-021-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use IUser
| * | | | | | Use IUserLukas Reschke2017-08-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is broken and will never work as the phan CI step pointed out. Pro-tip of the day: Check why CI fails before merging :see_no_evil: Signed-off-by: Lukas Reschke <lukas@statuscode.ch>