aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into clean-settings-layoutMorris Jobke2017-08-0468-198/+261
|\
| * Merge pull request #5967 from nextcloud/revert-5682-inline-svg-iconMorris Jobke2017-08-046-22/+15
| |\ | | | | | | Revert "Proof of concept #5593 - inline SVG icon for icon-contacts"
| | * Revert "Proof of concept #5593 - inline SVG icon for icon-contacts"Joas Schilling2017-08-036-22/+15
| | |
| * | [tx-robot] updated from transifexNextcloud bot2017-08-0462-176/+246
| |/
* | Merge branch 'clean-settings-layout' of ↵Marin Treselj2017-08-041011-7186/+12366
|\ \ | | | | | | | | | github.com:andreasjacobsen93/nextcloud-server into clean-settings-layout
| * | Merge branch 'master' into clean-settings-layoutMorris Jobke2017-08-031011-7186/+12366
| |\|
| | * Merge pull request #5738 from nextcloud/comradekingu-patch-3Morris Jobke2017-08-031-3/+3
| | |\ | | | | | | | | Spelling: UID
| | | * Improve spelling in LDAPAllan Nordhøy2017-08-021-3/+3
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| | * | Merge pull request #5959 from nextcloud/drop-logo-claimMorris Jobke2017-08-036-11/+6
| | |\ \ | | | | | | | | | | Logo claim is not used anymore
| | | * | Logo claim is not used anymoreMorris Jobke2017-08-026-11/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| | * | | [tx-robot] updated from transifexNextcloud bot2017-08-0340-6/+158
| | | | |
| | * | | 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>