]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
8 years agoRemove old test
Joas Schilling [Fri, 25 Nov 2016 10:17:40 +0000 (11:17 +0100)]
Remove old test

Signed-off-by: Joas Schilling <coding@schilljs.com>
8 years agoGet user name from contacts if available
Joas Schilling [Fri, 25 Nov 2016 10:17:06 +0000 (11:17 +0100)]
Get user name from contacts if available

Signed-off-by: Joas Schilling <coding@schilljs.com>
8 years agoMove ShareByMail activities to new API
Joas Schilling [Thu, 24 Nov 2016 14:46:38 +0000 (15:46 +0100)]
Move ShareByMail activities to new API

Signed-off-by: Joas Schilling <coding@schilljs.com>
8 years agoMerge pull request #2299 from nextcloud/oc-mounts-non-existing-user
Lukas Reschke [Thu, 24 Nov 2016 14:28:40 +0000 (15:28 +0100)]
Merge pull request #2299 from nextcloud/oc-mounts-non-existing-user

filter out oc_mounts results from non existing users

8 years agoMerge pull request #2305 from nextcloud/fix_previews_federated_shares
Morris Jobke [Thu, 24 Nov 2016 13:37:12 +0000 (14:37 +0100)]
Merge pull request #2305 from nextcloud/fix_previews_federated_shares

Fix previews for federated shares

8 years agoMerge pull request #2303 from nextcloud/password-check-improvements
Morris Jobke [Thu, 24 Nov 2016 12:30:11 +0000 (13:30 +0100)]
Merge pull request #2303 from nextcloud/password-check-improvements

small password check improvements

8 years agoFix previews for federated shares 2305/head
Roeland Jago Douma [Thu, 24 Nov 2016 12:20:51 +0000 (13:20 +0100)]
Fix previews for federated shares

The owner of a federated file is the federated user. For which we
obviously can't setup a view.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
8 years agoshow dialog again of operation failed 2303/head
Bjoern Schiessle [Thu, 24 Nov 2016 11:35:59 +0000 (12:35 +0100)]
show dialog again of operation failed

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
8 years agoset focus on input field
Bjoern Schiessle [Thu, 24 Nov 2016 11:35:28 +0000 (12:35 +0100)]
set focus on input field

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
8 years agofilter out oc_mounts results from non existing users 2299/head
Robin Appelman [Thu, 24 Nov 2016 10:44:18 +0000 (11:44 +0100)]
filter out oc_mounts results from non existing users

Signed-off-by: Robin Appelman <robin@icewind.nl>
8 years agoMerge pull request #2296 from nextcloud/nitpicking-on-federation-admin-section
Lukas Reschke [Thu, 24 Nov 2016 09:13:57 +0000 (10:13 +0100)]
Merge pull request #2296 from nextcloud/nitpicking-on-federation-admin-section

Fix some language issues in the federation admin panel

8 years agoMerge pull request #2290 from nextcloud/placeholder-typo-public-link-activity
Roeland Jago Douma [Thu, 24 Nov 2016 08:34:35 +0000 (09:34 +0100)]
Merge pull request #2290 from nextcloud/placeholder-typo-public-link-activity

Fix placeholder typo in public link activity

8 years agoFix some language issues in the federation admin panel 2296/head
Joas Schilling [Thu, 24 Nov 2016 08:34:06 +0000 (09:34 +0100)]
Fix some language issues in the federation admin panel

Signed-off-by: Joas Schilling <coding@schilljs.com>
8 years agoMerge pull request #2283 from nextcloud/no-padding-if-no-settings-area
Julius Härtl [Wed, 23 Nov 2016 20:52:13 +0000 (21:52 +0100)]
Merge pull request #2283 from nextcloud/no-padding-if-no-settings-area

Remove padding from apps navigation if there is no settings area

8 years agoFix placeholder typo in public link activity 2290/head
Joas Schilling [Wed, 23 Nov 2016 20:43:14 +0000 (21:43 +0100)]
Fix placeholder typo in public link activity

https://www.transifex.com/nextcloud/nextcloud/translate/#152/files_sharing/101548786/

8 years agoMerge pull request #2233 from nextcloud/change-link-to-11
Lukas Reschke [Wed, 23 Nov 2016 19:58:20 +0000 (20:58 +0100)]
Merge pull request #2233 from nextcloud/change-link-to-11

Update link to the docs to 11

8 years agoMerge pull request #2286 from nextcloud/ldap_password_pr-1
Lukas Reschke [Wed, 23 Nov 2016 19:54:31 +0000 (20:54 +0100)]
Merge pull request #2286 from nextcloud/ldap_password_pr-1

LDAP PR with tests

8 years agoAdd tests 2286/head
Lukas Reschke [Wed, 23 Nov 2016 18:58:43 +0000 (19:58 +0100)]
Add tests

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
8 years agoMerge pull request #2247 from nextcloud/avatar-fallback
Roeland Jago Douma [Wed, 23 Nov 2016 18:27:59 +0000 (19:27 +0100)]
Merge pull request #2247 from nextcloud/avatar-fallback

use ? instead of X for avatar name fallback

8 years agorestore ldap_password_pr
root [Tue, 30 Aug 2016 09:43:29 +0000 (17:43 +0800)]
restore ldap_password_pr

Signed-off-by: Roger Szabo <roger.szabo@web.de>
remove notification part

Signed-off-by: Roger Szabo <roger.szabo@web.de>
blizzz comments

Signed-off-by: Roger Szabo <roger.szabo@web.de>
morris comment

Signed-off-by: Roger Szabo <roger.szabo@web.de>
improved error message for changing password

Signed-off-by: Roger Szabo <roger.szabo@web.de>
blizz comments 20161013

Signed-off-by: Roger Szabo <roger.szabo@web.de>
Signed-off-by: Roger Szabo <roger.szabo@web.de>
Adjust HintException usage

Signed-off-by: Roger Szabo <roger.szabo@web.de>
Signed-off-by: Roger Szabo <roger.szabo@web.de>
8 years agoRemove padding from apps navigation if there is no settings area 2283/head
Morris Jobke [Wed, 23 Nov 2016 17:41:33 +0000 (18:41 +0100)]
Remove padding from apps navigation if there is no settings area

* fixes #2189

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
8 years agoMerge pull request #2242 from nextcloud/fix-installation-spinner
Morris Jobke [Wed, 23 Nov 2016 17:20:56 +0000 (18:20 +0100)]
Merge pull request #2242 from nextcloud/fix-installation-spinner

show installation spinner correctly, fix #2129

8 years agofix unit tests 2247/head
Morris Jobke [Wed, 23 Nov 2016 17:02:23 +0000 (18:02 +0100)]
fix unit tests

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
8 years agoMerge pull request #2281 from nextcloud/fix-translation
Morris Jobke [Wed, 23 Nov 2016 16:53:21 +0000 (17:53 +0100)]
Merge pull request #2281 from nextcloud/fix-translation

Fix language typo

8 years agoMerge pull request #2232 from nextcloud/imagescale-fix
Lukas Reschke [Wed, 23 Nov 2016 16:45:59 +0000 (17:45 +0100)]
Merge pull request #2232 from nextcloud/imagescale-fix

Workaround for PHP bug when calling imagescale

8 years agoFix language typo 2281/head
Joas Schilling [Wed, 23 Nov 2016 15:52:20 +0000 (16:52 +0100)]
Fix language typo

Signed-off-by: Joas Schilling <coding@schilljs.com>
8 years agoMerge pull request #2278 from nextcloud/filelist-share-visible
Lukas Reschke [Wed, 23 Nov 2016 15:40:10 +0000 (16:40 +0100)]
Merge pull request #2278 from nextcloud/filelist-share-visible

make the share icon in the filelist visible again

8 years agoMerge pull request #2280 from nextcloud/do_not_escape_sharees
Lukas Reschke [Wed, 23 Nov 2016 15:40:01 +0000 (16:40 +0100)]
Merge pull request #2280 from nextcloud/do_not_escape_sharees

Do not escape sharees

8 years agoimproved style of shared entry 2278/head
Morris Jobke [Wed, 23 Nov 2016 14:25:48 +0000 (15:25 +0100)]
improved style of shared entry

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
8 years agoDo not escape sharees 2280/head
Roeland Jago Douma [Wed, 23 Nov 2016 14:22:36 +0000 (15:22 +0100)]
Do not escape sharees

Fixes #2253

Do not escape special characters else it will look very strange.

8 years agoMerge pull request #2240 from nextcloud/daita-encryption-init_on_master_key
Lukas Reschke [Wed, 23 Nov 2016 14:19:24 +0000 (15:19 +0100)]
Merge pull request #2240 from nextcloud/daita-encryption-init_on_master_key

init Session/privateKeys on Master Key

8 years agoMerge pull request #2266 from nextcloud/avatar_image
Morris Jobke [Wed, 23 Nov 2016 13:49:32 +0000 (14:49 +0100)]
Merge pull request #2266 from nextcloud/avatar_image

VCARDS don't hold binary data

8 years agomake the share icon in the filelist visible again
Robin Appelman [Wed, 23 Nov 2016 13:44:53 +0000 (14:44 +0100)]
make the share icon in the filelist visible again

Signed-off-by: Robin Appelman <robin@icewind.nl>
8 years agoMerge pull request #2275 from nextcloud/harden-cookies
Lukas Reschke [Wed, 23 Nov 2016 13:34:24 +0000 (14:34 +0100)]
Merge pull request #2275 from nextcloud/harden-cookies

Harden cookies more appropriate

8 years agoMerge pull request #2262 from nextcloud/specify-parameters-on-public-download
Lukas Reschke [Wed, 23 Nov 2016 13:02:38 +0000 (14:02 +0100)]
Merge pull request #2262 from nextcloud/specify-parameters-on-public-download

Specify the parameters on public download

8 years agoVCARDS don't hold binary data 2266/head
Roeland Jago Douma [Tue, 22 Nov 2016 20:26:49 +0000 (21:26 +0100)]
VCARDS don't hold binary data

* We need to base64 encode the avatar!
* Switched to vcard v4
* User proper data uri

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
8 years agoHarden cookies more appropriate 2275/head
Lukas Reschke [Wed, 23 Nov 2016 11:53:44 +0000 (12:53 +0100)]
Harden cookies more appropriate

This adds the __Host- prefix to the same-site cookies. This is a small but yet nice security hardening.

See https://googlechrome.github.io/samples/cookie-prefixes/ for the implications.

Fixes https://github.com/nextcloud/server/issues/1412

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
8 years agocheck if session is initialized 2240/head
Bjoern Schiessle [Wed, 23 Nov 2016 11:07:04 +0000 (12:07 +0100)]
check if session is initialized

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
8 years agoMerge pull request #2263 from nextcloud/remove91_migration
Lukas Reschke [Wed, 23 Nov 2016 11:18:06 +0000 (12:18 +0100)]
Merge pull request #2263 from nextcloud/remove91_migration

Remove migration steps in app dav

8 years agoMerge pull request #2267 from nextcloud/issue-2254-react-to-remote-share-activities...
Lukas Reschke [Wed, 23 Nov 2016 11:16:55 +0000 (12:16 +0100)]
Merge pull request #2267 from nextcloud/issue-2254-react-to-remote-share-activities-only

Only do stuff when its a remote-share activity

8 years agoMerge pull request #2239 from nextcloud/cleanup-settings-application-again
Joas Schilling [Wed, 23 Nov 2016 10:07:10 +0000 (11:07 +0100)]
Merge pull request #2239 from nextcloud/cleanup-settings-application-again

Cleanup settings application again

8 years agoOnly do stuff when its a remote-share activity 2267/head
Joas Schilling [Tue, 22 Nov 2016 21:46:18 +0000 (22:46 +0100)]
Only do stuff when its a remote-share activity

Signed-off-by: Joas Schilling <coding@schilljs.com>
8 years agoMerge pull request #2250 from nextcloud/check-if-data-is-defined
Joas Schilling [Tue, 22 Nov 2016 19:31:32 +0000 (20:31 +0100)]
Merge pull request #2250 from nextcloud/check-if-data-is-defined

Check if data is defined

8 years agoRemove 9.1 migration steps in app dav (#25654) 2263/head
Thomas Müller [Tue, 9 Aug 2016 06:17:41 +0000 (08:17 +0200)]
Remove 9.1 migration steps in app dav (#25654)

8 years agoSpecify the parameters on public download 2262/head
Joas Schilling [Tue, 22 Nov 2016 19:14:42 +0000 (20:14 +0100)]
Specify the parameters on public download

Signed-off-by: Joas Schilling <coding@schilljs.com>
8 years agoMerge pull request #2251 from nextcloud/remove-superfluos-mail-input-field
Morris Jobke [Tue, 22 Nov 2016 18:21:22 +0000 (19:21 +0100)]
Merge pull request #2251 from nextcloud/remove-superfluos-mail-input-field

Remove superfluous email input field

8 years agoRemove superfluous email input field 2251/head
Lukas Reschke [Tue, 22 Nov 2016 17:29:09 +0000 (18:29 +0100)]
Remove superfluous email input field

That field is already there and looking at the code this seems to have been missed on a rebase.

Fixes https://github.com/nextcloud/server/issues/2222

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
8 years agoMerge pull request #2246 from nextcloud/display-name-for-files-and-tagging-activities...
Lukas Reschke [Tue, 22 Nov 2016 17:25:52 +0000 (18:25 +0100)]
Merge pull request #2246 from nextcloud/display-name-for-files-and-tagging-activities-again

Use the display name for files activities again

8 years agoCheck if data is defined 2250/head
Lukas Reschke [Tue, 22 Nov 2016 17:23:48 +0000 (18:23 +0100)]
Check if data is defined

Otherwise when adding a user as subadmin this would throw the following JS error:

```
users.js?v=bc2aae7…:500 Uncaught TypeError: Cannot read property 'message' of undefined(…)(anonymous function) @ users.js?v=bc2aae7…:500j @ jquery.js:3099fireWith @ jquery.js:3211x @ jquery.js:8264(anonymous function) @ jquery.js:8605
```

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
8 years agoMerge pull request #2229 from nextcloud/select2-fix-bis
Lukas Reschke [Tue, 22 Nov 2016 16:50:53 +0000 (17:50 +0100)]
Merge pull request #2229 from nextcloud/select2-fix-bis

Select2 fix bis

8 years agouse ? instead of X for avatar name fallback
Jan-Christoph Borchardt [Tue, 22 Nov 2016 16:08:28 +0000 (17:08 +0100)]
use ? instead of X for avatar name fallback

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
8 years agoMerge pull request #2241 from nextcloud/make-it-a-beta
Lukas Reschke [Tue, 22 Nov 2016 16:04:15 +0000 (17:04 +0100)]
Merge pull request #2241 from nextcloud/make-it-a-beta

Make it 11.0 beta

8 years agodocument new variable 2246/head
Morris Jobke [Tue, 22 Nov 2016 15:55:02 +0000 (16:55 +0100)]
document new variable

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
8 years agoUse the display name for files activities again
Joas Schilling [Tue, 22 Nov 2016 15:39:29 +0000 (16:39 +0100)]
Use the display name for files activities again

Signed-off-by: Joas Schilling <coding@schilljs.com>
8 years agoshow installation spinner correctly, fix #2129 2242/head
Jan-Christoph Borchardt [Tue, 22 Nov 2016 14:58:00 +0000 (15:58 +0100)]
show installation spinner correctly, fix #2129

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
8 years agoMake it 11.0 beta 2241/head
Lukas Reschke [Tue, 22 Nov 2016 14:55:59 +0000 (15:55 +0100)]
Make it 11.0 beta

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
8 years agoMerge pull request #2238 from nextcloud/fix_systemtags
Joas Schilling [Tue, 22 Nov 2016 14:53:15 +0000 (15:53 +0100)]
Merge pull request #2238 from nextcloud/fix_systemtags

Fix undefined systemtags stuff

8 years agoinit Session/privateKeys on Master Key
Maxence Lange [Tue, 22 Nov 2016 14:19:42 +0000 (13:19 -0100)]
init Session/privateKeys on Master Key

I can't find another way to init the session ...

8 years agoClean up the Application class again 2239/head
Joas Schilling [Tue, 22 Nov 2016 14:04:03 +0000 (15:04 +0100)]
Clean up the Application class again

Signed-off-by: Joas Schilling <coding@schilljs.com>
8 years agoFix undefined systemtags stuff 2238/head
Roeland Jago Douma [Tue, 22 Nov 2016 13:59:51 +0000 (14:59 +0100)]
Fix undefined systemtags stuff

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
8 years agoMerge pull request #2234 from nextcloud/add-subadmin-middleware-back
Joas Schilling [Tue, 22 Nov 2016 13:46:43 +0000 (14:46 +0100)]
Merge pull request #2234 from nextcloud/add-subadmin-middleware-back

Add SubAdminMiddleware back

8 years agoAdd SubAdminMiddleware back 2234/head
Lukas Reschke [Tue, 22 Nov 2016 12:33:23 +0000 (13:33 +0100)]
Add SubAdminMiddleware back

Removed by mistake in #1946

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
8 years agoUpdate link to the docs to 11 2233/head
Lukas Reschke [Tue, 22 Nov 2016 12:29:24 +0000 (13:29 +0100)]
Update link to the docs to 11

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
8 years agoMerge pull request #1972 from nextcloud/invalid-files-from-scanner
Roeland Jago Douma [Tue, 22 Nov 2016 11:55:54 +0000 (12:55 +0100)]
Merge pull request #1972 from nextcloud/invalid-files-from-scanner

Make sure we don't scan files that can not be accessed

8 years agoWorkaround for PHP bug when calling imagescale 2232/head
Julius Haertl [Tue, 22 Nov 2016 11:12:59 +0000 (12:12 +0100)]
Workaround for PHP bug when calling imagescale

Signed-off-by: Julius Haertl <jus@bitgrid.net>
8 years agoMerge pull request #2179 from nextcloud/update-systemtags-to-new-activity-api
Joas Schilling [Tue, 22 Nov 2016 10:05:06 +0000 (11:05 +0100)]
Merge pull request #2179 from nextcloud/update-systemtags-to-new-activity-api

Update systemtags activity to new API

8 years agoFix select2 input on retina - fixes #2226 2229/head
Morris Jobke [Tue, 22 Nov 2016 09:42:15 +0000 (10:42 +0100)]
Fix select2 input on retina - fixes #2226

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
8 years agoFix systemtagsfilelist unwanted margin and clean aera a bit
John Molakvoæ [Tue, 22 Nov 2016 08:34:35 +0000 (09:34 +0100)]
Fix systemtagsfilelist unwanted margin and clean aera a bit

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
8 years agoRemove unwanted padding
John Molakvoæ [Tue, 22 Nov 2016 08:33:33 +0000 (09:33 +0100)]
Remove unwanted padding

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
8 years agoMerge pull request #2165 from nextcloud/sharing-activities-update
Roeland Jago Douma [Tue, 22 Nov 2016 09:19:15 +0000 (10:19 +0100)]
Merge pull request #2165 from nextcloud/sharing-activities-update

Move file sharing activities to the new API

8 years agoMerge pull request #2228 from nextcloud/use-appid-instead-of-app-element
Roeland Jago Douma [Tue, 22 Nov 2016 09:06:33 +0000 (10:06 +0100)]
Merge pull request #2228 from nextcloud/use-appid-instead-of-app-element

Use app ID instead of object

8 years agoMerge pull request #2154 from nextcloud/comments-activities-update
Morris Jobke [Tue, 22 Nov 2016 08:56:22 +0000 (09:56 +0100)]
Merge pull request #2154 from nextcloud/comments-activities-update

Move comments activities to the new API

8 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 22 Nov 2016 01:06:54 +0000 (01:06 +0000)]
[tx-robot] updated from transifex

8 years agoUse app ID instead of object 2228/head
Lukas Reschke [Mon, 21 Nov 2016 23:24:23 +0000 (00:24 +0100)]
Use app ID instead of object

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>
8 years agoMerge pull request #2215 from nextcloud/add-setup-page-integration-test
Lukas Reschke [Mon, 21 Nov 2016 22:26:19 +0000 (23:26 +0100)]
Merge pull request #2215 from nextcloud/add-setup-page-integration-test

Add integration test for web based installer

8 years agoMerge pull request #2221 from nextcloud/from-is-featured-to-featured
Lukas Reschke [Mon, 21 Nov 2016 22:11:29 +0000 (23:11 +0100)]
Merge pull request #2221 from nextcloud/from-is-featured-to-featured

Error log spam: Cast "isFeatured" to "featured"

8 years agoMerge pull request #2225 from nextcloud/fix_caldav_proppatch_requests
Lukas Reschke [Mon, 21 Nov 2016 21:54:17 +0000 (22:54 +0100)]
Merge pull request #2225 from nextcloud/fix_caldav_proppatch_requests

fix PropPatch requests on calendars

8 years agofix PropPatch requests on calendars 2225/head
Georg Ehrke [Mon, 21 Nov 2016 20:58:24 +0000 (21:58 +0100)]
fix PropPatch requests on calendars

Signed-off-by: Georg Ehrke <developer@georgehrke.com>
8 years agoMerge pull request #2220 from nextcloud/app-password-default-device-name
Lukas Reschke [Mon, 21 Nov 2016 21:10:39 +0000 (22:10 +0100)]
Merge pull request #2220 from nextcloud/app-password-default-device-name

app passwords: add default name if none given

8 years agoAdd integration test for web based installer 2215/head
Morris Jobke [Mon, 21 Nov 2016 13:00:54 +0000 (14:00 +0100)]
Add integration test for web based installer

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
8 years agoCast "isFeatured" to "featured" 2221/head
Lukas Reschke [Mon, 21 Nov 2016 20:34:37 +0000 (21:34 +0100)]
Cast "isFeatured" to "featured"

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>
8 years agouse date as device name if no name was given 2220/head
Bjoern Schiessle [Mon, 21 Nov 2016 19:28:21 +0000 (20:28 +0100)]
use date as device name if no name was given

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
8 years agoMerge pull request #2216 from nextcloud/proper-return-value
Lukas Reschke [Mon, 21 Nov 2016 16:34:46 +0000 (17:34 +0100)]
Merge pull request #2216 from nextcloud/proper-return-value

Use proper return function

8 years agoMerge pull request #2214 from nextcloud/remove-logging
Robin Appelman [Mon, 21 Nov 2016 16:17:02 +0000 (17:17 +0100)]
Merge pull request #2214 from nextcloud/remove-logging

remove old logging section

8 years agoupdate tests 2214/head
Robin Appelman [Mon, 21 Nov 2016 13:14:20 +0000 (14:14 +0100)]
update tests

Signed-off-by: Robin Appelman <robin@icewind.nl>
8 years agoUse proper return function 2216/head
Lukas Reschke [Mon, 21 Nov 2016 14:14:32 +0000 (15:14 +0100)]
Use proper return function

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
8 years agoMerge pull request #2211 from nextcloud/maintenance-wsod
Robin Appelman [Mon, 21 Nov 2016 13:00:41 +0000 (14:00 +0100)]
Merge pull request #2211 from nextcloud/maintenance-wsod

fix white screen of death in maintenance mode when theming is disabled

8 years agoMerge pull request #2212 from nextcloud/fix_web_installer
Morris Jobke [Mon, 21 Nov 2016 12:57:48 +0000 (13:57 +0100)]
Merge pull request #2212 from nextcloud/fix_web_installer

Do not trigger appconfig queries when we are not yet installed

8 years agoMerge pull request #1946 from nextcloud/federated-sharing-persona-settings
Lukas Reschke [Mon, 21 Nov 2016 12:50:03 +0000 (13:50 +0100)]
Merge pull request #1946 from nextcloud/federated-sharing-persona-settings

Add more personal information fields to the settings page for enhanced federated sharing

8 years agoremove old logging section
Robin Appelman [Mon, 21 Nov 2016 12:46:31 +0000 (13:46 +0100)]
remove old logging section

Signed-off-by: Robin Appelman <robin@icewind.nl>
8 years agoDo not trigger appconfig queries when we are not yet installed 2212/head
Roeland Jago Douma [Mon, 21 Nov 2016 12:13:53 +0000 (13:13 +0100)]
Do not trigger appconfig queries when we are not yet installed

Fixes #2209

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
8 years agofix white screen of death in maintenance mode when theming is disabled 2211/head
Robin Appelman [Mon, 21 Nov 2016 12:10:55 +0000 (13:10 +0100)]
fix white screen of death in maintenance mode when theming is disabled

Signed-off-by: Robin Appelman <robin@icewind.nl>
8 years agocenter checkmark to indicate that the setting was stored 1946/head
Bjoern Schiessle [Mon, 21 Nov 2016 08:58:35 +0000 (09:58 +0100)]
center checkmark to indicate that the setting was stored

8 years agodon't try to verify email address if no email address is set
Bjoern Schiessle [Mon, 21 Nov 2016 08:43:52 +0000 (09:43 +0100)]
don't try to verify email address if no email address is set

8 years agosmall fixes
Bjoern Schiessle [Mon, 21 Nov 2016 08:07:50 +0000 (09:07 +0100)]
small fixes

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
8 years agoAdjust unit tests
Lukas Reschke [Sat, 19 Nov 2016 10:36:51 +0000 (11:36 +0100)]
Adjust unit tests

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
8 years agoAdjust integration test
Lukas Reschke [Fri, 18 Nov 2016 19:13:41 +0000 (20:13 +0100)]
Adjust integration test

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
8 years agoAsk for password when scope is changed
Lukas Reschke [Fri, 18 Nov 2016 19:03:02 +0000 (20:03 +0100)]
Ask for password when scope is changed

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
8 years agoFix mail scope
Lukas Reschke [Fri, 18 Nov 2016 18:54:45 +0000 (19:54 +0100)]
Fix mail scope

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
8 years agoHighlight current entry
Lukas Reschke [Fri, 18 Nov 2016 18:44:21 +0000 (19:44 +0100)]
Highlight current entry

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>