summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1972 from nextcloud/invalid-files-from-scannerRoeland Jago Douma2016-11-227-27/+138
|\ | | | | Make sure we don't scan files that can not be accessed
| * Move the validation into one place onlyJoas Schilling2016-11-216-42/+106
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Make sure we don't scan files that can not be accessedJoas Schilling2016-11-212-0/+47
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #2179 from nextcloud/update-systemtags-to-new-activity-apiJoas Schilling2016-11-226-363/+425
|\ \ | | | | | | Update systemtags activity to new API
| * | Update systemtags activity to new APIJoas Schilling2016-11-176-363/+425
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #2165 from nextcloud/sharing-activities-updateRoeland Jago Douma2016-11-2216-609/+1645
|\ \ \ | | | | | | | | Move file sharing activities to the new API
| * | | Move file sharing activities to the new APIJoas Schilling2016-11-1616-609/+1645
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #2228 from nextcloud/use-appid-instead-of-app-elementRoeland Jago Douma2016-11-221-1/+1
|\ \ \ \ | | | | | | | | | | Use app ID instead of object
| * | | | Use app ID instead of objectLukas Reschke2016-11-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes several error messages when installing an app from the appstore, including: ``` Illegal offset type in isset or empty at /media/psf/stable9/lib/private/legacy/app.php#662 Illegal offset type at /media/psf/stable9/lib/private/legacy/app.php#663 Illegal offset type at /media/psf/stable9/lib/private/legacy/app.php#661 Object of class OC_App could not be converted to string at /media/psf/stable9/lib/private/legacy/app.php#81 trim() expects parameter 1 to be string, object given at /media/psf/stable9/lib/private/legacy/app.php#628 ``` Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | Merge pull request #2154 from nextcloud/comments-activities-updateMorris Jobke2016-11-2214-380/+468
|\ \ \ \ \ | | | | | | | | | | | | Move comments activities to the new API
| * | | | | Update testJoas Schilling2016-11-181-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | Fix wrong copyright headersJoas Schilling2016-11-165-22/+21
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | Use the display name for usersJoas Schilling2016-11-161-4/+41
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | Move comments activities to the new APIJoas Schilling2016-11-168-357/+407
| | |/ / / | |/| | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | [tx-robot] updated from transifexNextcloud bot2016-11-2266-638/+666
| |/ / / |/| | |
* | | | Merge pull request #2215 from nextcloud/add-setup-page-integration-testLukas Reschke2016-11-215-14/+85
|\ \ \ \ | | | | | | | | | | Add integration test for web based installer
| * | | | Add integration test for web based installerMorris Jobke2016-11-215-14/+85
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #2221 from nextcloud/from-is-featured-to-featuredLukas Reschke2016-11-211-0/+3
|\ \ \ \ \ | | | | | | | | | | | | Error log spam: Cast "isFeatured" to "featured"
| * | | | | Cast "isFeatured" to "featured"Lukas Reschke2016-11-211-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The appstore returns a "isFeatured" in the current API revision. We need to cast this thus. Fixes the following error log message when opening the tab "Customization": > Undefined index: featured at /media/psf/stable9/settings/Controller/AppSettingsController.php#233 Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | | Merge pull request #2225 from nextcloud/fix_caldav_proppatch_requestsLukas Reschke2016-11-212-8/+19
|\ \ \ \ \ \ | | | | | | | | | | | | | | fix PropPatch requests on calendars
| * | | | | | fix PropPatch requests on calendarsGeorg Ehrke2016-11-212-8/+19
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | | | | Merge pull request #2220 from nextcloud/app-password-default-device-nameLukas Reschke2016-11-211-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | app passwords: add default name if none given
| * | | | | use date as device name if no name was givenBjoern Schiessle2016-11-211-1/+1
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | | Merge pull request #2216 from nextcloud/proper-return-valueLukas Reschke2016-11-211-2/+1
|\ \ \ \ \ | | | | | | | | | | | | Use proper return function
| * | | | | Use proper return functionLukas Reschke2016-11-211-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | | Merge pull request #2214 from nextcloud/remove-loggingRobin Appelman2016-11-217-418/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | | remove old logging section
| * | | | | update testsRobin Appelman2016-11-213-181/+0
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | remove old logging sectionRobin Appelman2016-11-214-237/+0
| | |_|_|/ | |/| | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | Merge pull request #2211 from nextcloud/maintenance-wsodRobin Appelman2016-11-211-0/+3
|\ \ \ \ \ | |_|_|/ / |/| | | | fix white screen of death in maintenance mode when theming is disabled
| * | | | fix white screen of death in maintenance mode when theming is disabledRobin Appelman2016-11-211-0/+3
| |/ / / | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | Merge pull request #2212 from nextcloud/fix_web_installerMorris Jobke2016-11-211-2/+3
|\ \ \ \ | | | | | | | | | | Do not trigger appconfig queries when we are not yet installed
| * | | | Do not trigger appconfig queries when we are not yet installedRoeland Jago Douma2016-11-211-2/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | Fixes #2209 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #1946 from nextcloud/federated-sharing-persona-settingsLukas Reschke2016-11-2151-424/+2524
|\ \ \ \ | |/ / / |/| | | Add more personal information fields to the settings page for enhanced federated sharing
| * | | center checkmark to indicate that the setting was storedBjoern Schiessle2016-11-211-1/+1
| | | |
| * | | don't try to verify email address if no email address is setBjoern Schiessle2016-11-211-1/+1
| | | |
| * | | small fixesBjoern Schiessle2016-11-213-8/+7
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | Adjust unit testsLukas Reschke2016-11-212-8/+18
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | Adjust integration testLukas Reschke2016-11-211-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | Ask for password when scope is changedLukas Reschke2016-11-211-0/+8
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | Fix mail scopeLukas Reschke2016-11-211-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | Highlight current entryLukas Reschke2016-11-212-4/+26
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | Make JS aware of password verificationLukas Reschke2016-11-212-0/+9
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | Remove debug codeLukas Reschke2016-11-211-4/+0
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | Add config switchLukas Reschke2016-11-216-18/+71
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | Remove unused variableLukas Reschke2016-11-211-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | Add retry jobLukas Reschke2016-11-213-24/+76
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | make icons a bit smallerJan-Christoph Borchardt2016-11-211-3/+3
| | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | fix menu positioning hackJan-Christoph Borchardt2016-11-212-2/+1
| | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | Fix lookup urlRoeland Jago Douma2016-11-212-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | put explanatory text directly in popupJan-Christoph Borchardt2016-11-214-15/+25
| | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-03 20:02:46 +0000