]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
7 years agodeleted forgotten code in test 4412/head
Artur Neumann [Thu, 20 Apr 2017 16:35:17 +0000 (22:20 +0545)]
deleted forgotten code in test

how embarrassing, left code from before I've done the loop around the test
Signed-off-by: Artur Neumann <info@individual-it.net>
7 years agoremove accidently left over *f*it 4212/head
Artur Neumann [Tue, 18 Apr 2017 15:02:39 +0000 (20:47 +0545)]
remove accidently left over *f*it

Signed-off-by: Artur Neumann <info@individual-it.net>
7 years agoJS tests for upload only function
Artur Neumann [Tue, 18 Apr 2017 14:58:25 +0000 (20:43 +0545)]
JS tests for upload only function

Signed-off-by: Artur Neumann <info@individual-it.net>
7 years agorefactor to make it easier to test
Artur Neumann [Tue, 18 Apr 2017 14:53:43 +0000 (20:38 +0545)]
refactor to make it easier to test

Signed-off-by: Artur Neumann <info@individual-it.net>
7 years agovalidate file name before uploading in upload only folder
Artur Neumann [Wed, 5 Apr 2017 07:12:41 +0000 (12:57 +0545)]
validate file name before uploading in upload only folder

fixes #4211

Signed-off-by: Artur Neumann <info@individual-it.net>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 5 Apr 2017 00:08:20 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #4138 from nextcloud/resources_match_fullid
Morris Jobke [Tue, 4 Apr 2017 20:52:53 +0000 (15:52 -0500)]
Merge pull request #4138 from nextcloud/resources_match_fullid

Match slashes in ../{id} resource routes

7 years agoMerge pull request #4192 from nextcloud/fix/custom-default-app-redirect-2fa-selection
Morris Jobke [Tue, 4 Apr 2017 20:47:35 +0000 (15:47 -0500)]
Merge pull request #4192 from nextcloud/fix/custom-default-app-redirect-2fa-selection

Redirect to 2FA selection screen

7 years agoMerge pull request #4204 from nextcloud/append-fixes-swift
Roeland Jago Douma [Tue, 4 Apr 2017 19:15:34 +0000 (21:15 +0200)]
Merge pull request #4204 from nextcloud/append-fixes-swift

fix fseek (Swift backend) against string not resource by removing append support

7 years agofix fseek against string not resource by removing append support 4204/head
Arthur Schiwon [Tue, 4 Apr 2017 11:12:29 +0000 (13:12 +0200)]
fix fseek against string not resource by removing append support

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
7 years agoMerge pull request #3310 from duritong/patch-1
Morris Jobke [Tue, 4 Apr 2017 16:42:26 +0000 (11:42 -0500)]
Merge pull request #3310 from duritong/patch-1

only chmod logfile if necessary

7 years agoMerge pull request #4071 from nextcloud/issue-173-database-conversion-failure
Joas Schilling [Tue, 4 Apr 2017 14:29:53 +0000 (16:29 +0200)]
Merge pull request #4071 from nextcloud/issue-173-database-conversion-failure

Make sure blob columns are correctly converted as parameters

7 years agoMerge pull request #2095 from nextcloud/bruteforcesetttings
Lukas Reschke [Tue, 4 Apr 2017 09:57:43 +0000 (11:57 +0200)]
Merge pull request #2095 from nextcloud/bruteforcesetttings

Introduce bruteforce settings

7 years agoMerge pull request #4030 from nextcloud/masterkey-publiclink-nc12
Roeland Jago Douma [Tue, 4 Apr 2017 09:46:13 +0000 (11:46 +0200)]
Merge pull request #4030 from nextcloud/masterkey-publiclink-nc12

Make public links work with master key

7 years agoMerge pull request #4093 from nextcloud/endorse-password-protection
Roeland Jago Douma [Tue, 4 Apr 2017 09:04:21 +0000 (11:04 +0200)]
Merge pull request #4093 from nextcloud/endorse-password-protection

Endorse password protection

7 years agoFix tests 2095/head
Roeland Jago Douma [Sun, 2 Apr 2017 19:41:14 +0000 (21:41 +0200)]
Fix tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoMerge pull request #4147 from nextcloud/fix_3890
Roeland Jago Douma [Tue, 4 Apr 2017 08:25:13 +0000 (10:25 +0200)]
Merge pull request #4147 from nextcloud/fix_3890

Don't try to parse empty body if there is no body

7 years agoMerge pull request #3896 from nextcloud/xx621998xx-newbranch
Roeland Jago Douma [Tue, 4 Apr 2017 08:24:32 +0000 (10:24 +0200)]
Merge pull request #3896 from nextcloud/xx621998xx-newbranch

Fix remaining upload time calculation

7 years agoSome more hardening 3896/head
Joas Schilling [Fri, 17 Mar 2017 11:59:33 +0000 (12:59 +0100)]
Some more hardening

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agofile-upload.js modified : Remaining upload time corrected
SarthikaDhawan [Mon, 6 Mar 2017 11:08:35 +0000 (16:38 +0530)]
file-upload.js modified : Remaining upload time corrected

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMatch slashes in ../{id} resource routes 4138/head
Roeland Jago Douma [Wed, 29 Mar 2017 09:03:53 +0000 (11:03 +0200)]
Match slashes in ../{id} resource routes

Fixes #2954

Before we could match on <prefix>/{id} however if the id contains a /
this would not match properly. But since we define the resource routes
internally we now make sure that we match all chars (up until the ?).

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoDon't try to parse empty body if there is no body 4147/head
Roeland Jago Douma [Wed, 29 Mar 2017 13:09:45 +0000 (15:09 +0200)]
Don't try to parse empty body if there is no body

Fixes #3890

If we do a put request without a body the current code still tries to
read the body. This patch makes sure that we do not try to read the body
if the content length is 0.

See RFC 2616 Section 4.3

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 4 Apr 2017 00:07:46 +0000 (00:07 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #3620 from nextcloud/feature/1463/editable_color_name_for_shared_c...
Morris Jobke [Mon, 3 Apr 2017 18:12:56 +0000 (13:12 -0500)]
Merge pull request #3620 from nextcloud/feature/1463/editable_color_name_for_shared_calendars

allow sharees to edit certain calendar properties for themselves

7 years agoMerge pull request #4191 from nextcloud/bump-autosize
Roeland Jago Douma [Mon, 3 Apr 2017 13:32:42 +0000 (15:32 +0200)]
Merge pull request #4191 from nextcloud/bump-autosize

Bump autosize

7 years agoRedirect to 2FA selection screen 4192/head
Christoph Wurst [Mon, 3 Apr 2017 12:29:24 +0000 (14:29 +0200)]
Redirect to 2FA selection screen

Apps like 'rainloop' use \OCP\Util::isLoggedIn() to check whether the
current request is authenticated. Since we redirected to the index
page before, it resulted in an infinite redirection loop. This change
sets the redirection URL to the 2FA selection page, which is the only
allowed page in that authentication state.

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

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
7 years agoMove to autosize.min.js 4191/head
Roeland Jago Douma [Mon, 3 Apr 2017 11:42:33 +0000 (13:42 +0200)]
Move to autosize.min.js

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoBump autosize.js
Roeland Jago Douma [Mon, 3 Apr 2017 11:40:34 +0000 (13:40 +0200)]
Bump autosize.js

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoMerge pull request #4166 from nextcloud/issue-4165-invalid-int-for-transparency-on...
Roeland Jago Douma [Mon, 3 Apr 2017 10:46:00 +0000 (12:46 +0200)]
Merge pull request #4166 from nextcloud/issue-4165-invalid-int-for-transparency-on-calendars

Make sure transparency is an integer when saving a calendar

7 years agoMerge pull request #4189 from nextcloud/add-issue-template-app
Jos Poortvliet [Mon, 3 Apr 2017 10:12:00 +0000 (12:12 +0200)]
Merge pull request #4189 from nextcloud/add-issue-template-app

Add reference to issue template app

7 years agoUpdate issue_template.md 4189/head
Jos Poortvliet [Mon, 3 Apr 2017 10:11:34 +0000 (12:11 +0200)]
Update issue_template.md

7 years agoMerge pull request #4131 from nextcloud/fix-jscombiner
Christoph Wurst [Mon, 3 Apr 2017 09:27:39 +0000 (11:27 +0200)]
Merge pull request #4131 from nextcloud/fix-jscombiner

Fix check for cache value in JSCombiner

7 years agoMerge pull request #4175 from nextcloud/fix-socialmenudisplay
Roeland Jago Douma [Mon, 3 Apr 2017 08:59:44 +0000 (10:59 +0200)]
Merge pull request #4175 from nextcloud/fix-socialmenudisplay

Do not show social menu when there is no link share

7 years agofix unit tests 4093/head
Bjoern Schiessle [Mon, 3 Apr 2017 08:54:25 +0000 (10:54 +0200)]
fix unit tests

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
7 years agolet the user set an empty password for share link
Timo Benk [Mon, 17 Oct 2016 12:23:55 +0000 (14:23 +0200)]
let the user set an empty password for share link

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
7 years agoendorseLinkPassword changed to enableLinkPasswordByDefault
Timo Benk [Mon, 17 Oct 2016 07:11:30 +0000 (09:11 +0200)]
endorseLinkPassword changed to enableLinkPasswordByDefault

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
7 years agofeature endorse password for share links
Timo Benk [Fri, 14 Oct 2016 07:58:24 +0000 (09:58 +0200)]
feature endorse password for share links

works like "enforce password protection", but let the
user optionally remove the password protection after the
password is set.

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
7 years agofeature endorse password for share links
Bjoern Schiessle [Mon, 27 Mar 2017 13:11:13 +0000 (15:11 +0200)]
feature endorse password for share links

works like "enforce password protection", but let the
user optionally remove the password protection after the
password is set. by Timo Benk

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 3 Apr 2017 00:08:20 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years agoAdd reference to issue template app
Lukas Reschke [Sun, 2 Apr 2017 20:13:04 +0000 (22:13 +0200)]
Add reference to issue template app

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMove app to own repo
Roeland Jago Douma [Sun, 2 Apr 2017 19:26:02 +0000 (21:26 +0200)]
Move app to own repo

https://github.com/nextcloud/bruteforcesettings

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoFixed layout of bruteforcesettings
Morris Jobke [Tue, 14 Mar 2017 01:44:10 +0000 (19:44 -0600)]
Fixed layout of bruteforcesettings

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoFix app
Roeland Jago Douma [Sun, 2 Apr 2017 19:16:22 +0000 (21:16 +0200)]
Fix app

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoUpdate App Manager test
Roeland Jago Douma [Sat, 19 Nov 2016 20:03:39 +0000 (21:03 +0100)]
Update App Manager test

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoApp is always enabled
Roeland Jago Douma [Fri, 18 Nov 2016 08:27:33 +0000 (09:27 +0100)]
App is always enabled

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoRespect bruteforce settings in the Throttler
Roeland Jago Douma [Mon, 14 Nov 2016 13:05:01 +0000 (14:05 +0100)]
Respect bruteforce settings in the Throttler

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoAdds security section to the admin page
Roeland Jago Douma [Mon, 14 Nov 2016 13:02:03 +0000 (14:02 +0100)]
Adds security section to the admin page

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoInitial commit of the bruteforcesettings app
Roeland Jago Douma [Mon, 14 Nov 2016 12:59:52 +0000 (13:59 +0100)]
Initial commit of the bruteforcesettings app

This adds the bruteforce settings app that allows to configure (for now)
subnets that are to be ignored when doing brute force analysis. This can
for example be the LAN since we trust people from there.

* Add app
* Add php tests
* Add js tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoMerge pull request #4183 from nextcloud/css-shortcuts-view
Lukas Reschke [Sun, 2 Apr 2017 14:45:07 +0000 (16:45 +0200)]
Merge pull request #4183 from nextcloud/css-shortcuts-view

Add CSS for styling of keyboard shortcuts view

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 2 Apr 2017 00:07:48 +0000 (00:07 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #4139 from nextcloud/phpseclib
Roeland Jago Douma [Sat, 1 Apr 2017 12:00:25 +0000 (14:00 +0200)]
Merge pull request #4139 from nextcloud/phpseclib

[3rdparty] Bump phpseclib to 2.0.4

7 years agoMerge pull request #4174 from nextcloud/mergejs-newline
Christoph Wurst [Sat, 1 Apr 2017 06:38:47 +0000 (08:38 +0200)]
Merge pull request #4174 from nextcloud/mergejs-newline

mergejs should print a newline between imports

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 1 Apr 2017 00:08:09 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years agoDo not show social menu when there is no link share 4175/head
Roeland Jago Douma [Fri, 31 Mar 2017 15:29:41 +0000 (17:29 +0200)]
Do not show social menu when there is no link share

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agomergejs should print a newline between imports 4174/head
Roeland Jago Douma [Fri, 31 Mar 2017 15:06:38 +0000 (17:06 +0200)]
mergejs should print a newline between imports

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoMerge pull request #3438 from nextcloud/external-storage-user-folder
Roeland Jago Douma [Fri, 31 Mar 2017 13:07:39 +0000 (15:07 +0200)]
Merge pull request #3438 from nextcloud/external-storage-user-folder

Allow using '/' as external storage mountpoint

7 years agoMerge pull request #4140 from nextcloud/no_encryption_no_wrapper
Björn Schießle [Fri, 31 Mar 2017 12:49:38 +0000 (14:49 +0200)]
Merge pull request #4140 from nextcloud/no_encryption_no_wrapper

Don't add the Encryption Storage Wrapper if there are no encryption modules

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 31 Mar 2017 00:08:35 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #3832 from nextcloud/fix_1303
Roeland Jago Douma [Thu, 30 Mar 2017 16:25:50 +0000 (18:25 +0200)]
Merge pull request #3832 from nextcloud/fix_1303

Do not clear CSRF token on logout (fix for #1303)

7 years agoMake sure transparency is an integer when saving a calendar 4166/head
Joas Schilling [Thu, 30 Mar 2017 15:58:12 +0000 (17:58 +0200)]
Make sure transparency is an integer when saving a calendar

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agofix setup of external storage integration tests 4140/head
Robin Appelman [Thu, 30 Mar 2017 15:16:59 +0000 (17:16 +0200)]
fix setup of external storage integration tests

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoMerge pull request #4150 from nextcloud/capped-memcache-push
Joas Schilling [Thu, 30 Mar 2017 13:16:33 +0000 (15:16 +0200)]
Merge pull request #4150 from nextcloud/capped-memcache-push

support pushing to CappedMemoryCache

7 years agoMerge pull request #4128 from nextcloud/updateclipboard
Joas Schilling [Thu, 30 Mar 2017 12:37:03 +0000 (14:37 +0200)]
Merge pull request #4128 from nextcloud/updateclipboard

Update clipboard.js

7 years agoMerge pull request #4143 from nextcloud/ldap-downstream-64
Roeland Jago Douma [Thu, 30 Mar 2017 12:10:21 +0000 (14:10 +0200)]
Merge pull request #4143 from nextcloud/ldap-downstream-64

Correctly apply quota

7 years agoMerge pull request #3089 from nextcloud/cache-move-single-query
Roeland Jago Douma [Thu, 30 Mar 2017 12:08:31 +0000 (14:08 +0200)]
Merge pull request #3089 from nextcloud/cache-move-single-query

Move all children of a folder in a single query

7 years agoAdd CSS for styling of keyboard shortcuts view 4183/head
Jan-Christoph Borchardt [Thu, 30 Mar 2017 11:07:26 +0000 (13:07 +0200)]
Add CSS for styling of keyboard shortcuts view

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
7 years agouser ids are strings 4150/head
Robin Appelman [Thu, 30 Mar 2017 10:24:46 +0000 (12:24 +0200)]
user ids are strings

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agosupport pushing to CappedMemoryCache
Robin Appelman [Wed, 29 Mar 2017 17:16:12 +0000 (19:16 +0200)]
support pushing to CappedMemoryCache

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agorename fun to func 3089/head
Robin Appelman [Sun, 26 Mar 2017 18:45:49 +0000 (20:45 +0200)]
rename fun to func

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoAdd tests for query builder (i)like
Robin Appelman [Tue, 21 Feb 2017 13:48:00 +0000 (14:48 +0100)]
Add tests for query builder (i)like

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agodont double escape
Robin Appelman [Thu, 26 Jan 2017 11:15:26 +0000 (12:15 +0100)]
dont double escape

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoupdate autoloader
Robin Appelman [Thu, 26 Jan 2017 11:02:09 +0000 (12:02 +0100)]
update autoloader

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agofix licence headers
Robin Appelman [Wed, 18 Jan 2017 14:47:05 +0000 (15:47 +0100)]
fix licence headers

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoMove all children of a folder in a single query
Robin Appelman [Mon, 16 Jan 2017 15:20:53 +0000 (16:20 +0100)]
Move all children of a folder in a single query

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoAdd function builder to the query builder
Robin Appelman [Mon, 16 Jan 2017 14:31:04 +0000 (15:31 +0100)]
Add function builder to the query builder

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoadd support for escaping like parameters when using the query builder
Robin Appelman [Mon, 16 Jan 2017 14:12:30 +0000 (15:12 +0100)]
add support for escaping like parameters when using the query builder

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoAdd MD5() to sqlite
Robin Appelman [Mon, 16 Jan 2017 15:16:32 +0000 (16:16 +0100)]
Add MD5() to sqlite

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoMerge pull request #4132 from nextcloud/fix-safari-gzip
Lukas Reschke [Thu, 30 Mar 2017 08:47:28 +0000 (10:47 +0200)]
Merge pull request #4132 from nextcloud/fix-safari-gzip

Fix gzip files for Safari

7 years ago[3rdparty] Bump phpseclib to 2.0.4 4139/head
Roeland Jago Douma [Wed, 29 Mar 2017 10:14:57 +0000 (12:14 +0200)]
[3rdparty] Bump phpseclib to 2.0.4

See: https://github.com/phpseclib/phpseclib/blob/master/CHANGELOG.md

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoMerge pull request #4100 from nextcloud/header-indicator
Morris Jobke [Thu, 30 Mar 2017 03:43:18 +0000 (21:43 -0600)]
Merge pull request #4100 from nextcloud/header-indicator

show triangle below user menu too when an entry inside there is active

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 30 Mar 2017 00:07:41 +0000 (00:07 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #4142 from nextcloud/numeric_avatar
Morris Jobke [Wed, 29 Mar 2017 23:17:19 +0000 (17:17 -0600)]
Merge pull request #4142 from nextcloud/numeric_avatar

Allow avatars for full numeric users

7 years agoMerge pull request #4141 from nextcloud/ldap-downstream-9
Morris Jobke [Wed, 29 Mar 2017 21:47:28 +0000 (15:47 -0600)]
Merge pull request #4141 from nextcloud/ldap-downstream-9

Convert the group limit to match the same behaviour as the user search

7 years agoFix tests 4142/head
Roeland Jago Douma [Wed, 29 Mar 2017 20:54:08 +0000 (22:54 +0200)]
Fix tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoMerge pull request #4145 from nextcloud/ldap-downstream-54
Roeland Jago Douma [Wed, 29 Mar 2017 17:31:35 +0000 (19:31 +0200)]
Merge pull request #4145 from nextcloud/ldap-downstream-54

Add tooltips to LDAP wizard special attributtes

7 years agoMerge pull request #4108 from nextcloud/color-variable-rename
Roeland Jago Douma [Wed, 29 Mar 2017 17:13:36 +0000 (19:13 +0200)]
Merge pull request #4108 from nextcloud/color-variable-rename

rename confusing getMailHeaderColor to getColorPrimary, ref #3491

7 years agoMerge pull request #3329 from andreas-p/ldap_no-memberof-with-memberuid
Roeland Jago Douma [Wed, 29 Mar 2017 17:12:51 +0000 (19:12 +0200)]
Merge pull request #3329 from andreas-p/ldap_no-memberof-with-memberuid

Ldap no memberof with memberuid

7 years agoDon't add the Encryption Storage Wrapper if there are no encryption modules
Roeland Jago Douma [Wed, 29 Mar 2017 10:23:46 +0000 (12:23 +0200)]
Don't add the Encryption Storage Wrapper if there are no encryption modules

fixes #4125

If there is no encryption module enabled it makes no sense to setup the
encryption wrapper (because we can't do anything anyway).

This saves reading the header of files.
Especialy on external storage/objectstore this should improve
performance

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoMerge pull request #4062 from nextcloud/downstream-26872
Morris Jobke [Wed, 29 Mar 2017 16:30:22 +0000 (10:30 -0600)]
Merge pull request #4062 from nextcloud/downstream-26872

Adding dav resource for avatars

7 years agoalso rename defaultMailHeaderColor to defaultColorPrimary 4108/head
Jan-Christoph Borchardt [Tue, 28 Mar 2017 16:10:02 +0000 (18:10 +0200)]
also rename defaultMailHeaderColor to defaultColorPrimary

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
7 years agoAdd fallback to getMailHeaderColor so we don't break existing themes
Julius Härtl [Tue, 28 Mar 2017 11:29:59 +0000 (13:29 +0200)]
Add fallback to getMailHeaderColor so we don't break existing themes

Signed-off-by: Julius Härtl <jus@bitgrid.net>
7 years agorename confusing getMailHeaderColor to getColorPrimary, ref #3491
Jan-Christoph Borchardt [Mon, 27 Mar 2017 23:37:47 +0000 (01:37 +0200)]
rename confusing getMailHeaderColor to getColorPrimary, ref #3491

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
7 years agoAdd tooltips to LDAP wizard special attributtes 4145/head
David Toledo [Thu, 16 Feb 2017 13:42:11 +0000 (14:42 +0100)]
Add tooltips to LDAP wizard special attributtes

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Update settings.php

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Update settings.php

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Update settings.php

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
7 years agoAllow avatars for full numeric users
Roeland Jago Douma [Wed, 29 Mar 2017 11:39:48 +0000 (13:39 +0200)]
Allow avatars for full numeric users

Fixes #4087

Because of fancy javascript if a full numeric uid was used javascript
would convert this to an int. Now we just convert everything to a string
first.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoInclude tests for "default" and "none" quotas 4143/head
Juan Pablo Villafáñez [Fri, 17 Mar 2017 12:02:08 +0000 (13:02 +0100)]
Include tests for "default" and "none" quotas

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
7 years agoAdd comments in the updateQuota method to explain the behavior
Juan Pablo Villafáñez [Fri, 17 Mar 2017 11:56:27 +0000 (12:56 +0100)]
Add comments in the updateQuota method to explain the behavior

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
7 years agoAdd new testes to cover more cases
Juan Pablo Villafáñez [Thu, 16 Mar 2017 11:22:02 +0000 (12:22 +0100)]
Add new testes to cover more cases

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
7 years agoAdjust current tests to match the expectations
Juan Pablo Villafáñez [Wed, 15 Mar 2017 07:55:14 +0000 (08:55 +0100)]
Adjust current tests to match the expectations

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
7 years agoCheck if the user exists before trying to set the quota
Juan Pablo Villafáñez [Tue, 14 Mar 2017 16:08:05 +0000 (17:08 +0100)]
Check if the user exists before trying to set the quota

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
7 years agoCorrectly apply quota
Juan Pablo Villafáñez [Tue, 14 Mar 2017 13:07:33 +0000 (14:07 +0100)]
Correctly apply quota

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>