summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fixed typorakekniven2018-04-261-1/+1
|
* Merge pull request #9302 from nextcloud/update-phan-configMorris Jobke2018-04-261-7/+43
|\ | | | | Improve phan config
| * Improve phan configLukas Reschke2018-04-261-7/+43
| | | | | | | | | | | | | | * exclude routes Signed-off-by: Lukas Reschke <lukas@statuscode.ch> Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #9308 from nextcloud/proper-ocp-constantsMorris Jobke2018-04-2674-298/+412
|\ \ | | | | | | Move log constants to ILogger
| * | move log constants to ILoggerArthur Schiwon2018-04-2674-298/+412
|/ / | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | [tx-robot] updated from transifexNextcloud bot2018-04-262-0/+2
| |
* | Merge pull request #9256 from nextcloud/fed-sharing-improvementsMorris Jobke2018-04-256-89/+25
|\ \ | | | | | | improve error reporting and move format parameter to the options
| * | improve error reporting and move format parameter to the optionsBjoern Schiessle2018-04-256-89/+25
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | Merge pull request #9296 from nextcloud/migrate-groups-fetch-to-ocs-apiMorris Jobke2018-04-252-450/+457
|\ \ \ | | | | | | | | Migrate groups fetch to ocs api
| * | | Workflow engine to ocs apiJohn Molakvoæ (skjnldsv)2018-04-251-369/+373
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | Settings groups to ocsJohn Molakvoæ (skjnldsv)2018-04-251-81/+84
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | Merge pull request #9284 from nextcloud/bugfix/9279/strict_sharee_apiMorris Jobke2018-04-251-5/+6
|\ \ \ \ | |_|_|/ |/| | | Make ShareesAPIController strict
| * | | Make ShareesAPIController strictRoeland Jago Douma2018-04-231-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #9279 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #8540 from nextcloud/theming-advancedMorris Jobke2018-04-2517-623/+717
|\ \ \ \ | | | | | | | | | | Add option for header logo and favicon in theming app
| * | | | Add more tests for ImageManagerJulius Härtl2018-04-191-0/+91
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Fix theming testsJulius Härtl2018-04-197-253/+186
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Make sure the custom favicon is usedJulius Härtl2018-04-191-2/+10
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Add typehintsJulius Härtl2018-04-193-3/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Fix background colorJulius Härtl2018-04-191-5/+9
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Return valueJulius Härtl2018-04-191-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Remove unneeded preview image handlingJulius Härtl2018-04-191-3/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Fix undo preview and remove duplicate codeJulius Härtl2018-04-192-29/+28
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Add advanced theming options to frontendJulius Härtl2018-04-191-7/+37
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Use generic image upload in theming JSJulius Härtl2018-04-191-45/+17
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Use SCSS for previewing images as wellJulius Härtl2018-04-191-6/+39
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Move theming settings to SCSSJulius Härtl2018-04-192-107/+120
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Move to more generic image handling and add extra imagesJulius Härtl2018-04-197-178/+191
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | [tx-robot] updated from transifexNextcloud bot2018-04-254-2/+4
| | | | |
* | | | | Merge pull request #9248 from nextcloud/fix-files-ellipsisRoeland Jago Douma2018-04-242-84/+27
|\ \ \ \ \ | | | | | | | | | | | | Fix ellipsis in filename column
| * | | | | Add min-width to trick the table width calculation in safariJulius Härtl2018-04-221-11/+14
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | | Use flex based layout inside the filename table cellJulius Härtl2018-04-192-84/+24
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | Merge pull request #9292 from nextcloud/bugfix/9279/cast_db_backend_numericRoeland Jago Douma2018-04-241-5/+8
|\ \ \ \ \ | | | | | | | | | | | | Cast retrieved DB fields to string
| * | | | | Numeric only uids are no funRoeland Jago Douma2018-04-241-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | Cast retrieved DB fields to stringRoeland Jago Douma2018-04-241-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #9279 If a pure numerical user is in the DB the value might be casted to a int when returned. Cast it all to a string so we don't break the strict typing. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | Merge pull request #9282 from nextcloud/bugfix/9279/scrit_type_share_apiJoas Schilling2018-04-242-54/+55
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Make the ShareAPIController strict
| * | | | | Fix testsRoeland Jago Douma2018-04-242-15/+17
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | Make the ShareAPIController strictRoeland Jago Douma2018-04-231-40/+39
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #9279 With types we can force php to not cast a full nummeric user to an int. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #9280 from nextcloud/bugfix/noid/swift-v3-scopeRoeland Jago Douma2018-04-242-1/+13
|\ \ \ \ \ | | | | | | | | | | | | Swift v3 requires setting a scope
| * | | | | Swift v3 requires setting a scopeRoeland Jago Douma2018-04-232-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unscoped auth is not guaranteed to return a catalog. So require the scope to be set properly. See https://developer.openstack.org/api-ref/identity/v3/index.html#password-authentication-with-unscoped-authorization Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | [tx-robot] updated from transifexNextcloud bot2018-04-2418-4/+54
| |/ / / / |/| | | |
* | | | | Merge pull request #9278 from nextcloud/bug/noid/ldap-wizard-newaccessMorris Jobke2018-04-232-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Access needs UserManager, missed to add in #8833
| * | | | | Access needs UserManager, missed to add in #8833Arthur Schiwon2018-04-232-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | | Merge pull request #9272 from ↵Daniel Calviño Sánchez2018-04-231-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/noid/save-a-query-help-saving-the-world Only query last comment info, when there is one
| * | | | | | Only query last comment info, when there is oneJoas Schilling2018-04-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | Merge pull request #9276 from nextcloud/remove-unused-config-sampleMorris Jobke2018-04-231-6/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove unused config option
| * | | | | | | Remove unused config optionMorris Jobke2018-04-231-6/+0
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | | Merge pull request #9271 from nextcloud/fix-undefined-variableJoas Schilling2018-04-233-5/+3
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Fix undefined variable - found by Phan
| * | | | | | Remove a check for an unused variableMorris Jobke2018-04-231-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Left over from a refactoring https://github.com/nextcloud/server/pull/1940 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | | Fix undefined variable - found by phanMorris Jobke2018-04-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added in https://github.com/nextcloud/server/pull/8314/files#diff-a55c10804586cd797b7f3f16556c1457R157 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | | Fix undefined variable - found by PhanMorris Jobke2018-04-231-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>