mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
38,150 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

7162 Commits

Author SHA1 Message Date
Bjoern Schiessle 0dea31d48b
add tests for discovery service 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-11 15:04:01 +02:00
Bjoern Schiessle 45aee2e479
provide public discovery service to discover OCS end-points on another server 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-11 15:03:59 +02:00
Lukas Reschke afb5d45705 Merge pull request #4256 from nextcloud/theming 
Move OC_Defaults to OCP\Defaults
 2017-04-11 14:39:46 +02:00
Morris Jobke 11d6fe1023 Merge pull request #4283 from nextcloud/shares-by-folder-quote 
properly quota table names in getSharesInFolder
 2017-04-10 19:39:19 -05:00
Morris Jobke a045f3c4d7 Merge pull request #4146 from nextcloud/unread-comments-folder 
Allow getting the unread comment count for an entire folder at once
 2017-04-10 13:21:39 -05:00
Robin Appelman a555672f21
properly quota table names in getSharesInFolder 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-04-10 17:59:40 +02:00
Björn Schießle 18580395d4 Merge pull request #4277 from nextcloud/permissions-mask-scanner 
Dont use the permissions mask while scanning
 2017-04-10 16:04:12 +02:00
Roeland Jago Douma e9c6fe2fd8 Merge pull request #4222 from nextcloud/dav-search-fileid 
Allow searching file by fileid
 2017-04-10 15:57:56 +02:00
Robin Appelman a7c611039d
Dont use the permissions mask while scanning 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-04-10 15:19:21 +02:00
Roeland Jago Douma afea05d296 Merge pull request #4210 from nextcloud/downstream-26643 
Removed path to datadir in exception
 2017-04-10 12:43:46 +02:00
Joas Schilling 9e3a3eebf9
Lowercase "data" correctly 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-10 11:13:46 +02:00
Joas Schilling bc217cdf87
Also send the new account data with the event 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-10 10:22:57 +02:00
Morris Jobke 5b4adf66e5
Move OC_Defaults to OCP\Defaults 
* currently there are two ways to access default values:
  OCP\Defaults or OC_Defaults (which is extended by
  OCA\Theming\ThemingDefaults)
* our code used a mixture of both of them, which made
  it hard to work on theme values
* this extended the public interface with the missing
  methods and uses them everywhere to only rely on the
  public interface

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-09 21:43:01 -05:00
Morris Jobke ca9d25169d Merge pull request #4136 from nextcloud/expire-date-for-all-shares 
Unified sharing options
 2017-04-07 17:14:05 -05:00
Roeland Jago Douma 6c0cafb10f Merge pull request #4253 from nextcloud/downstream-27599 
make JobList::next() lock free
 2017-04-07 22:18:40 +02:00
Jörn Friedrich Dreyer c993c363e0
make JobList::next() lock free 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-07 13:07:09 -05:00
Lukas Reschke 281ad406e8
Add support for theming 
Add support for theming in generated emails and simplify API

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-07 12:03:47 -05:00
Morris Jobke 0560e69913
New layout for welcome email 
* thanks to @espina2 for make this nice design
* the button says "Set password" if the admin didn't specified a password

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-07 12:03:32 -05:00
Bjoern Schiessle 3323d01db1
update unit tests 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-07 15:43:59 +02:00
Joas Schilling 9f3d9b5b23
Don't force the use of Accept-Language anymore 
This is not intended anymore, since it falls back to force english
when the header is not set. Also 0228bc6e66
makes clear that the order should be:

1. User setting
2. Accept language
3. Admin default

This is the case since the commit from above, unless via OCS and DAV.
Both forced to accept-language falling back to english.
By removing the force, it now also matches the w3 priority list:
https://www.w3.org/International/questions/qa-lang-priorities

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-07 11:10:04 +02:00
Robin Appelman baec42e80a
Save the scope of an auth token in the session 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-04-05 17:58:33 +02:00
Robin Appelman bb7e236e74
Allow searching file by fileid 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-04-05 15:22:53 +02:00
Kawohl bee0a3699e
removed path to datadir 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-04 19:07:59 -05:00
Morris Jobke fa4107893d Merge pull request #4138 from nextcloud/resources_match_fullid 
Match slashes in ../{id} resource routes
 2017-04-04 15:52:53 -05:00
Morris Jobke b78876236d Merge pull request #4192 from nextcloud/fix/custom-default-app-redirect-2fa-selection 
Redirect to 2FA selection screen
 2017-04-04 15:47:35 -05:00
Morris Jobke 52eaf6cfbb Merge pull request #3310 from duritong/patch-1 
only chmod logfile if necessary
 2017-04-04 11:42:26 -05:00
Lukas Reschke e0227cb458 Merge pull request #2095 from nextcloud/bruteforcesetttings 
Introduce bruteforce settings
 2017-04-04 11:57:43 +02:00
Roeland Jago Douma efb21a948e Merge pull request #4093 from nextcloud/endorse-password-protection 
Endorse password protection
 2017-04-04 11:04:21 +02:00
Roeland Jago Douma 31f9be7a75
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>
 2017-04-04 08:37:11 +02:00
Roeland Jago Douma 2a9192334e
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>
 2017-04-04 08:22:33 +02:00
Christoph Wurst a7cc8c86ab
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>
 2017-04-03 14:31:57 +02:00
Christoph Wurst cbe44043be Merge pull request #4131 from nextcloud/fix-jscombiner 
Fix check for cache value in JSCombiner
 2017-04-03 11:27:39 +02:00
Bjoern Schiessle b85b6f2439
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>
 2017-04-03 10:57:52 +02:00
Bjoern Schiessle dac6826ad7
setting to disable sending password by mail 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-03 10:29:33 +02:00
Bjoern Schiessle b84fd7c361
set expire date for all share types 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-03 10:29:32 +02:00
Bjoern Schiessle 3cc0d15f92
add secure drop functionallity to mail shares 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-03 10:29:32 +02:00
Bjoern Schiessle c191173d59
allow password protected mail shares 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-03 10:29:32 +02:00
Bjoern Schiessle 0d5147bd49
add new password column to the share table in order to set passwords for share by mails 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-03 10:20:49 +02:00
Morris Jobke ed00bab80b
Fixed layout of bruteforcesettings 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-02 21:19:30 +02:00
Roeland Jago Douma be674c19a5
Respect bruteforce settings in the Throttler 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-04-02 21:13:50 +02:00
Roeland Jago Douma dca555b7f3
Adds security section to the admin page 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-04-02 21:13:09 +02:00
Björn Schießle 85da9378c0 Merge pull request #4140 from nextcloud/no_encryption_no_wrapper 
Don't add the Encryption Storage Wrapper if there are no encryption modules
 2017-03-31 14:49:38 +02:00
Roeland Jago Douma 548871a9f3 Merge pull request #3832 from nextcloud/fix_1303 
Do not clear CSRF token on logout (fix for #1303)
 2017-03-30 18:25:50 +02:00
Joas Schilling a51e4dd259 Merge pull request #4150 from nextcloud/capped-memcache-push 
support pushing to CappedMemoryCache
 2017-03-30 15:16:33 +02:00
Robin Appelman 11c1e5dd86
fix whitespace in cleantags 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-03-30 12:49:09 +02:00
Robin Appelman 40154dd6a3
use castColumn 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-03-30 12:48:30 +02:00
Robin Appelman 212d9fd277
Add test for getting unread comment count by folder 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-03-30 12:48:27 +02:00
Robin Appelman 429f8ae011
Allow getting the unread comment count for an entire folder at once 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-03-30 12:48:24 +02:00
Robin Appelman 0aeb595784
user ids are strings 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-03-30 12:24:46 +02:00
Robin Appelman dc4b983639
support pushing to CappedMemoryCache 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-03-30 11:21:32 +02:00