a7da2ef977
Merge pull request #4282 from nextcloud/oci-connect-string
...
use the same oci connectstring in all code paths
2017-04-12 13:11:00 -05:00
124fdf8062
Merge pull request #4331 from nextcloud/query-builder-sum
...
Add sum() to the query function builder
2017-04-12 12:55:09 -05:00
31024b7700
Merge pull request #4329 from nextcloud/move-out-shared-folder
...
Fix moving files out of a shared folder
2017-04-12 11:44:26 -05:00
4b639e2763
No newlines when heading is empty
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-12 17:16:27 +02:00
0a464dfb61
make the plain text footer standard compliant and add a space after '--'. It also adds a line break in front so that there is some spacing between the mail body and the footer
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-12 17:16:27 +02:00
1c8c62272c
Use instance name as alt-text
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-12 17:16:26 +02:00
506c7731a6
Don't duplicate the sentence with the header
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-12 17:16:26 +02:00
33e077c1c1
Properly escape heading, body and button text
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-12 17:16:26 +02:00
050ce1d40b
Add addBodyButton to add a single button to email templates
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-12 17:16:26 +02:00
ac45af68cd
Add sub() to the query function builder
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-12 16:09:35 +02:00
dccb8928a1
Merge pull request #4325 from nextcloud/downstream-27522
...
Optimize put - Dont try to fetch filecache for not existing filecache…
2017-04-12 16:04:03 +02:00
b90e91144b
Merge pull request #3614 from nextcloud/discover-federatedsharing-endpoints
...
Discover federatedsharing endpoints
2017-04-12 16:01:07 +02:00
8500debe79
use unjailed path when moving files out of a shared storage
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-12 14:56:51 +02:00
2f949f4515
rename Jail::getSourcePath to getUnjailedPath to fix conflict with Local::getSourcePath
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-12 14:55:47 +02:00
38e5135cb9
Reorder the entries of the log for easier reading
2017-04-12 13:03:19 +02:00
dc78f1251e
Optimize put - Dont try to fetch filecache for not existing filecache in encription
2017-04-12 12:54:20 +02:00
bd37021587
Fix casing of same origin frame option
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-12 12:37:32 +02:00
b5d31e4e65
Merge pull request #4309 from nextcloud/remove-unused-code
...
Removes unused code for link share emails
2017-04-12 10:15:59 +02:00
d127f47801
Merge pull request #4310 from nextcloud/allow-plain-text-email
...
Allow to set text versions for the plain text email
2017-04-12 10:15:06 +02:00
633b952358
[tx-robot] updated from transifex
2017-04-12 00:07:44 +00:00
be9a514dff
Allow to set text versions for the plain text email
...
* allows different texts for HTML and text version of the email
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-11 17:50:06 -05:00
8fa5141aaa
Removes unused code for link share emails
...
* now handled by sharebymail app
* see https://github.com/nextcloud/server/pull/657
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-11 17:32:48 -05:00
f3a78ee39d
Remove constructor from interface
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-11 21:22:39 +02:00
3600dd4f52
Add IEMailTemplate to public OCP API
...
Also adds `\OCP\Mail\IMailer::createEMailTemplate` as helper so the functionality can easily be used within apps.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-11 16:35:46 +02:00
42f40659f6
Update autoloader
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-11 15:04:15 +02:00
53bca14a27
Do proper DI
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-11 15:04:01 +02:00
449011dae7
remove discovery manager in favour of the OCSDiscoveryService
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-11 15:04:01 +02:00
0dea31d48b
add tests for discovery service
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-11 15:04:01 +02:00
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
afb5d45705
Merge pull request #4256 from nextcloud/theming
...
Move OC_Defaults to OCP\Defaults
2017-04-11 14:39:46 +02:00
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
4d90b0520e
[tx-robot] updated from transifex
2017-04-11 00:07:29 +00:00
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
a555672f21
properly quota table names in getSharesInFolder
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-10 17:59:40 +02:00
421ca6439f
use the same oci connectstring in all code paths
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-10 17:58:52 +02:00
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
e9c6fe2fd8
Merge pull request #4222 from nextcloud/dav-search-fileid
...
Allow searching file by fileid
2017-04-10 15:57:56 +02:00
a7c611039d
Dont use the permissions mask while scanning
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-10 15:19:21 +02:00
afea05d296
Merge pull request #4210 from nextcloud/downstream-26643
...
Removed path to datadir in exception
2017-04-10 12:43:46 +02:00
9e3a3eebf9
Lowercase "data" correctly
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-10 11:13:46 +02:00
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
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
d25a96d921
[tx-robot] updated from transifex
2017-04-10 00:08:50 +00:00
16091f4424
[tx-robot] updated from transifex
2017-04-09 00:07:40 +00:00
4b0f50c456
[tx-robot] updated from transifex
2017-04-08 00:07:45 +00:00
ca9d25169d
Merge pull request #4136 from nextcloud/expire-date-for-all-shares
...
Unified sharing options
2017-04-07 17:14:05 -05:00
6c0cafb10f
Merge pull request #4253 from nextcloud/downstream-27599
...
make JobList::next() lock free
2017-04-07 22:18:40 +02:00
c993c363e0
make JobList::next() lock free
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-07 13:07:09 -05:00
8daf3d4a70
Update autoloader
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-07 12:03:47 -05:00
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
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
3323d01db1
update unit tests
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-07 15:43:59 +02:00
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 0228bc6e66https://www.w3.org/International/questions/qa-lang-priorities
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-07 11:10:04 +02:00
7ad791efb4
Dont create a log entry on email login
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-07 10:15:20 +02:00
536650c02f
[tx-robot] updated from transifex
2017-04-07 00:09:11 +00:00
fbadb37b9b
use known LockdownManager
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-04-06 15:27:30 +02:00
0a463e55ae
Save correct login name
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-04-06 15:22:43 +02:00
4eddb95fc4
Add method to $methodsWithSensitiveParameters
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-06 15:22:43 +02:00
daf9d23547
don't regenerate Session ID twice, also fixes tests
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-04-06 15:22:43 +02:00
50844e8c47
regenerate session id on successful login, fixes integration test
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-04-06 15:22:43 +02:00
7b3fdfeeaa
do login routine only once when done via LoginController
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-04-06 15:22:42 +02:00
7d9688c89e
[tx-robot] updated from transifex
2017-04-06 00:07:50 +00:00
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
bb7e236e74
Allow searching file by fileid
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-05 15:22:53 +02:00
84035862f7
[tx-robot] updated from transifex
2017-04-05 00:08:20 +00:00
bee0a3699e
removed path to datadir
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-04 19:07:59 -05:00
95a21e2f2a
Check for boolean false and add tests
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-04 15:56:50 -05:00
0fcb37adcb
OC_ -> NC_
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-04 15:56:50 -05:00
695a17804e
Override config.php values through ENV variables ( #26570 )
...
* added functionality to override config.php values with 'OC_' prefixed environment variables
* use getenv to read environment variables since apache does not set $_ENV variables, fixed test
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-04 15:56:50 -05:00
fa4107893d
Merge pull request #4138 from nextcloud/resources_match_fullid
...
Match slashes in ../{id} resource routes
2017-04-04 15:52:53 -05:00
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
52eaf6cfbb
Merge pull request #3310 from duritong/patch-1
...
only chmod logfile if necessary
2017-04-04 11:42:26 -05:00
e0227cb458
Merge pull request #2095 from nextcloud/bruteforcesetttings
...
Introduce bruteforce settings
2017-04-04 11:57:43 +02:00
efb21a948e
Merge pull request #4093 from nextcloud/endorse-password-protection
...
Endorse password protection
2017-04-04 11:04:21 +02:00
0d69b52fde
Merge pull request #4147 from nextcloud/fix_3890
...
Don't try to parse empty body if there is no body
2017-04-04 10:25:13 +02:00
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
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
ec5377306d
[tx-robot] updated from transifex
2017-04-04 00:07:46 +00:00
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
cbe44043be
Merge pull request #4131 from nextcloud/fix-jscombiner
...
Fix check for cache value in JSCombiner
2017-04-03 11:27:39 +02:00
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
dac6826ad7
setting to disable sending password by mail
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:29:33 +02:00
b84fd7c361
set expire date for all share types
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:29:32 +02:00
3cc0d15f92
add secure drop functionallity to mail shares
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:29:32 +02:00
c191173d59
allow password protected mail shares
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:29:32 +02:00
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
d56f6399eb
[tx-robot] updated from transifex
2017-04-03 00:08:20 +00:00
ed00bab80b
Fixed layout of bruteforcesettings
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-02 21:19:30 +02:00
be674c19a5
Respect bruteforce settings in the Throttler
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-02 21:13:50 +02:00
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
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
6a6300b1f2
[tx-robot] updated from transifex
2017-03-31 00:08:35 +00:00
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
a51e4dd259
Merge pull request #4150 from nextcloud/capped-memcache-push
...
support pushing to CappedMemoryCache
2017-03-30 15:16:33 +02:00
11c1e5dd86
fix whitespace in cleantags
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 12:49:09 +02:00
40154dd6a3
use castColumn
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 12:48:30 +02:00
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
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
0aeb595784
user ids are strings
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 12:24:46 +02:00
dc4b983639
support pushing to CappedMemoryCache
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 11:21:32 +02:00
d4a7cfec7c
rename fun to func
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 11:15:06 +02:00
fee818f493
Add tests for query builder (i)like
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 11:15:03 +02:00
3355fd549f
dont double escape
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 11:14:59 +02:00
07449a4885
update autoloader
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 11:14:56 +02:00
4125bdeb93
fix licence headers
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 11:14:52 +02:00
4b7bc2af0e
Move all children of a folder in a single query
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 11:14:48 +02:00
4279b13270
Add function builder to the query builder
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 11:09:26 +02:00
a65652fc1e
add support for escaping like parameters when using the query builder
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 11:09:22 +02:00
83f3990e06
Add MD5() to sqlite
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 11:09:19 +02:00
1ee7e1c0b1
Merge pull request #4132 from nextcloud/fix-safari-gzip
...
Fix gzip files for Safari
2017-03-30 10:47:28 +02:00
f984cf0987
[tx-robot] updated from transifex
2017-03-30 00:07:41 +00:00
111c9f7563
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>
2017-03-29 18:57:56 +02:00
354a24e0aa
also rename defaultMailHeaderColor to defaultColorPrimary
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-03-29 18:23:23 +02:00
698396a927
Add fallback to getMailHeaderColor so we don't break existing themes
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-03-29 18:23:23 +02:00
9a75714c22
rename confusing getMailHeaderColor to getColorPrimary, ref #3491
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-03-29 18:23:23 +02:00
626d03e3d4
Merge pull request #4116 from nextcloud/swift-cache-token
...
Cache swift authentication token in memcache
2017-03-29 11:23:13 +02:00
784e06073b
Merge pull request #4129 from nextcloud/remove-verbose-error-message
...
Remove verbose error message
2017-03-29 10:01:17 +02:00
9813023aab
Fix gzip files for Safari
...
* Safari support gzip only if the filename does not
end on .gz - so this renames them to .gzip
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-29 00:11:51 -06:00
05f2596311
Merge pull request #4091 from nextcloud/Rudloff-manifest
...
Web app manifest for adding to Android home screen
2017-03-28 21:36:54 -06:00
19d3133ccf
Web app manifest
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-03-28 18:39:57 -06:00
58513255d2
[tx-robot] updated from transifex
2017-03-29 00:07:41 +00:00
1f7124a57b
Merge pull request #4120 from nextcloud/newest-item-first-in-activity
...
Change the order on merging activities so the newest item is first
2017-03-28 17:51:30 -06:00
dbf6b7ff86
Merge pull request #4127 from nextcloud/update-legacy-csp-policy
...
Update legacy CSP policy
2017-03-28 17:47:32 -06:00
51e5c0766c
Fix check for cache value in JSCombiner
...
* fixes following log output, because there was empty string
stored in the cache
Invalid argument supplied for foreach() at lib/private/Template/JSCombiner.php#108
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-28 17:43:39 -06:00
16b8c0c691
Merge pull request #4070 from nextcloud/gzip_scss_js
...
GZip generated CSS/JS files
2017-03-28 17:11:17 -06:00
49ba822fef
Remove verbose error message
...
There's no need to have this included in the error message.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-29 00:34:33 +02:00
3a90ab7e0a
Update legacy CSP policy
...
Aligns it with the one enforced by the AppFramework
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-28 23:55:31 +02:00
a40405531c
Fix tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-28 23:13:59 +02:00
4821c00ea8
Merge pull request #4004 from nextcloud/backport-27172
...
Remove SharedCache::getNumericStorageId to let CacheWrapper do it
2017-03-28 21:56:44 +02:00
54f9b35f71
Allow to gzip CSS/JS files
...
Since in production the SCSS files are compiled once and the javascript
files are combined once we can just as well gzip them aggresively.
This means that once they are requested and the browser supports gzip we
can just serve the gzipped file saving precious bandwidth.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-28 21:46:23 +02:00
6991b79d40
serialize the token to json instead of using php's serialize
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-28 21:33:07 +02:00
205d5586e8
cache swift tokens in memcache
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-28 12:37:41 -06:00
e26f138fc5
Merge pull request #4112 from nextcloud/swift-config
...
Better error messages for objectsack swift configuration
2017-03-28 17:51:18 +02:00
644b37c7e4
Change the order on merging activities so the newest item is first
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-28 17:19:34 +02:00
8dbca71a77
better error messages for invalid regions, urltypes and service names
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-28 17:00:11 +02:00
5062d0ac50
better error messages when swift authentication fails
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-28 11:02:18 +02:00
6309b9ec1d
[tx-robot] updated from transifex
2017-03-28 00:07:53 +00:00
da11931815
Merge pull request #4084 from nextcloud/fix-log-spam-with-too-few-navigation-items
...
Don't spam the log with "Undefined index showInHeader"
2017-03-27 15:53:08 -06:00
f76a3b532d
Merge pull request #4096 from nextcloud/touch-floor
...
round the mtime in touch
2017-03-27 09:46:10 -06:00
8de4209c3e
round the mtime in touch
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-27 17:07:48 +02:00
fc044caab1
Merge pull request #4072 from nextcloud/move-x-frame-options-into-php
...
Move X-Frame-Options into PHP
2017-03-27 15:05:22 +02:00
81d87b01fe
Don't spam the log with "Undefined index showInHeader"
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-27 10:24:10 +02:00
d9ebc2626f
[tx-robot] updated from transifex
2017-03-27 00:07:55 +00:00
8d3c461151
Allow to specify the id
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-26 23:07:54 +02:00
918f6fd10b
Make sure help is always after users
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-26 22:32:12 +02:00
900f11fd91
Fix order as @jancborchardt requested
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-26 14:30:21 -06:00
0229c16e5f
Don't use the dropdown for one item only
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-26 21:23:18 +02:00
e0b040d623
Allow multiple navigation links from info.xml
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-26 21:15:25 +02:00
7cc5130e82
Allow apps to register a setting via info.xml
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-26 20:37:39 +02:00
433958e2e3
Move app management to the settings menu
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-26 20:26:05 +02:00
054e161eb5
Manage the right side menu via the navigation manager as well
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-26 19:40:41 +02:00
ec330c7ac4
Register the app management in the normal way
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-26 19:08:51 +02:00
bff6c8aafc
Move X-Frame-Options into PHP
...
The public calendar view should be embeddable and we can't do that if the .htaccess sets a global X-Frame-Options.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-26 17:26:11 +02:00
3668673d7b
Create a notification when the update server couldn't be reached for some days
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-26 10:59:58 +02:00
5da845609d
no ternary
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-25 21:25:38 -06:00
3d0005d001
fix constant
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-25 21:25:30 -06:00
ef57c03dd2
Add Redis Cluster support
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-25 21:25:27 -06:00
0981f9a18a
[tx-robot] updated from transifex
2017-03-26 01:07:03 +00:00
d81cdcbe88
Don't run JSCombiner when not installed
...
When the instance is not installed don't run the JSCombiner as the appdata folder does not yet exist.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-25 15:25:06 +01:00
2f7669179e
Merge pull request #4043 from nextcloud/merge-js-for-template-prepend
...
Merge JS for template prepend
2017-03-24 15:42:08 -06:00
6a470e5935
Merge JS for template prepend
...
Shaves off 14 requests.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-24 20:37:13 +01:00
4d68324ba6
Merge sharing backend JS
...
Removes 8 requests.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-24 20:17:38 +01:00
be6acbeb52
Update autoloader
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-24 16:11:54 +01:00
b5299b1403
Add return
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-24 10:58:11 +01:00
90910290d1
Add debug mode
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-24 10:58:11 +01:00
242f8964cf
Add caching
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-24 10:58:11 +01:00
8e89ad21a2
[PoC] JS Combiner
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-24 10:58:10 +01:00
f94bc6f8bb
Merge pull request #4013 from nextcloud/bundle_vendor_js
...
Bundle vendor js
2017-03-24 10:49:57 +01:00
1397b84777
Merge pull request #3928 from nextcloud/downstream-17978
...
Adjust 4 byte MySQL code to upstream
2017-03-23 23:45:43 -06:00
d197f609a8
Merge pull request #3889 from nextcloud/downstream-26950
...
Sharing dialog: make autocomplete sorting case insensitive
2017-03-23 23:45:28 -06:00
e18d928d9b
[tx-robot] updated from transifex
2017-03-24 01:08:00 +00:00
dbaebc53b0
fix sorting in the backend
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-23 15:41:25 -06:00
b59f6dcca4
Merge pull request #3850 from nextcloud/search-order
...
Fix search ordering
2017-03-23 15:25:27 -06:00
2d02a4735c
Fix search ordering
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-23 15:24:50 -06:00
eee7e97a6e
Merge pull request #4001 from nextcloud/backport-27389
...
Ensure that FileInfo return values as required by its phpdoc.
2017-03-23 13:00:49 -06:00
9039b71a23
Merge pull request #4000 from nextcloud/backport-27216
...
allow configuring authType for DAV backend
2017-03-23 19:28:49 +01:00
88015bc51f
Fix type hints and doc blocks
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-23 17:52:47 +01:00
eda98ed3df
Merge vendor js
...
There is a bunch of javascript we always load from vendors. This
combines this into 1 javascript file. Which reduces the number of
request by ~10.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-23 13:40:23 +01:00
9675bbd830
Merge pull request #3978 from nextcloud/scss_deps_memcache
...
Cache SCSS dependency file in memcache
2017-03-23 11:56:35 +01:00
d6cff564f6
Merge pull request #3994 from nextcloud/only_init_backbone_once
...
Only initialize backbone once
2017-03-23 11:54:54 +01:00
89c42a76c3
Remove SharedCache::getNumericStorageId to let CacheWrapper do it
...
The CacheWrapper will properly forward the call to the wrapped cache.
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-23 00:02:48 -06:00
5c7079f8c6
Ensure that FileInfo return values as required by its phpdoc.
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-22 20:03:46 -06:00
9eca1da1dd
allow configuring authType for DAV backend
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-22 18:13:42 -06:00
e4d4fb5352
Only initialize backbone once
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-22 22:48:58 +01:00
e3925ba2a1
Cache SCSS dependency file in memcache
...
Since reading a file from disks can be costly. Lets store the dependency
json also in memcache.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-22 20:14:08 +01:00
e25b997d0b
Merge pull request #3497 from nextcloud/mount-shared-last
...
mount shared mounts last
2017-03-22 13:12:54 -06:00
f4ead7c7d3
Fix autoloader
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-22 12:08:41 -06:00
714f198a5d
mount shared mounts last
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-22 17:15:42 +01:00
4518a28924
Revert "Bundle vendor js"
2017-03-22 17:01:54 +01:00
0b5e1814be
Merge pull request #3977 from nextcloud/di_ng2
...
Make DI work for all apps
2017-03-22 15:36:52 +01:00
ec3f5aa6e2
Merge pull request #3795 from nextcloud/bundle_vendor_js
...
Bundle vendor js
2017-03-22 13:34:21 +01:00
9667ac2b8e
Register the namespace with the autoloading to allow reverse recovery
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-22 11:55:04 +01:00
3f86f1276f
Also cache the namespace from appinfo
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-22 11:50:31 +01:00
5695a4ec92
Don't do a recursive search
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-22 10:44:13 +01:00
9208f6379c
buildAppNamespace already has the fallback
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-22 10:13:14 +01:00
a427e130ae
When debug don't load the bundled file
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-22 08:58:28 +01:00
5a6e29e4a8
Remove ownCloud Root Authority as per todo
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-22 08:54:40 +01:00
98a14909e1
Bundle more default vendor js
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-22 08:49:03 +01:00
7195a9323d
Merge vendor js
...
There is a bunch of javascript we always load from vendors. This
combines this into 1 javascript file. Which reduces the number of
request by ~10.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-22 08:48:10 +01:00
3329f44a76
Address comments
...
* fix URL to documentation
* improve logic of UTF8mb4 check
* fix connection parameter creation - it's done already in ConnectionFactory::createConnectionParams
* remove unused attributes of MDB2SchemaReader
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-21 16:42:42 -06:00
713f684a8b
Adding tests for 4 byte unicode characters
...
* success on SQLite and Postgres
* failure on MySQL due to the limited charset that only supports up to 3 bytes
Add config option to update charset of mysql to utf8mb4
* fully optional
* requires additional options set in the database
only disable unicode test on mysql
Fixing ctor call
Adding docker based unit test execution for mysql utf8mb4
Add mysqlmb4 test configuration to Jenkinsfile
fix collation on utf8mb4
Properly setup charset and collation in the doctrine connection
Allow files containing 4-byte chars in case the database supports it
During setup of a mysql database we try to detect if charset 'utf8mb4' can be used
Fix mysql settings
Add console command to migrate the charset
Set ROW_FORMAT before setting collation to mb4
Also select tables with wrong collation
Faster MySQL docker
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-21 16:42:12 -06:00
67909cf87b
Make DI work for all apps
...
As stated in https://github.com/nextcloud/server/pull/3901#issuecomment-288135309
appid's don't have to match the namespace.
Work around this
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-21 20:53:37 +01:00
99bf437640
Remove test code
...
This seems to have been commited by mistake with 6dbe417c51
2017-03-21 16:59:10 +01:00
348d97dfd6
Merge pull request #3844 from nextcloud/unshare_event
...
Unshare event
2017-03-21 16:57:09 +01:00
92f50c7d87
Core is also a special app
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-21 10:42:33 +01:00
48c34522ed
Move a lot of stuff over to the ServerContainer
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-21 10:29:59 +01:00
c92b9ce2c4
Fix settings tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-21 08:52:20 +01:00
21641302a9
Add DI intergration tests
...
* Moved some interface definitions to Server.php (more to come)
* Build/Query only for existing classes in the AppContainer
* Build/Query only for classes of the App in the AppContainer
* Offload other stuff to the servercontainer
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-21 08:52:20 +01:00
7cece61ff6
Extend DI tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-21 08:52:20 +01:00
246e9ce547
More elegant handling of recursion
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-21 08:52:20 +01:00
df14684817
PoC of moving the interface classes to the servercontainer
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-21 08:52:20 +01:00
886202123c
Update query method for DIContainer
...
To align with https://github.com/nextcloud/server/issues/2043#issuecomment-287348294
This would mean that AppContainers only hold the AppSpecific services
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-21 08:52:17 +01:00
fd0e42e093
[tx-robot] updated from transifex
2017-03-21 01:08:16 +00:00
21cf1b22e9
Merge pull request #3530 from nextcloud/scss-variables
...
Implement scss variables
2017-03-20 19:49:53 +01:00
03a92eaf74
Merge pull request #3957 from nextcloud/downstream-27307
...
Follow up to #3949 (app exists on enable)
2017-03-20 18:10:05 +01:00
1565177fb5
Revert "Add a magic wrapper to allow phpunit4 to run the code again "
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-20 14:25:43 +01:00
29ec58f1b5
Add tests for SCSSCacher
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-03-20 14:12:35 +01:00
450a899f01
Merge pull request #3945 from nextcloud/downstream-27298
...
Adding file, line, class and function to the query logger (#27298 )
2017-03-20 13:16:10 +01:00
4fbf9a4feb
Add tests for SCSSCacher
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-03-20 12:49:08 +01:00
2bd06e0d37
Add variables.scss and import it for each scss file
...
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-03-20 12:49:05 +01:00
85a5c24934
Merge pull request #3939 from nextcloud/downstream-27159
...
Fix malformed logging in exception
2017-03-20 12:46:48 +01:00
257fbd85eb
Merge pull request #3929 from nextcloud/downstream-27068
...
cache loadUser if not exists
2017-03-20 12:44:54 +01:00
35f6b8716e
Merge pull request #3884 from nextcloud/downstream-26956
...
Skip null groups in group manager
2017-03-20 12:27:38 +01:00
a3739906f6
Merge pull request #3924 from nextcloud/preview_fixes
...
Do not generate the max preview twice
2017-03-20 11:45:51 +01:00
ac1aff7d92
Merge pull request #3950 from nextcloud/downstream-27149
...
Forbid to upload part files via web UI
2017-03-20 11:44:57 +01:00
ab9e3525cc
Move error message to log entry
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-20 11:06:08 +01:00
6d30b35ed7
Some more code fixes
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-20 10:45:27 +01:00
591e75df5c
Don't use a generic exception
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-20 10:33:16 +01:00
8b670b41f1
Merge pull request #3952 from nextcloud/downstream-27209
...
Log files:scan exception, add InterruptedException
2017-03-20 03:22:58 -06:00
c969d8005e
Merge pull request #3949 from nextcloud/downstream-27307
...
Check if app exists before enabling
2017-03-20 03:21:02 -06:00
81c1522ad0
Update autoloader
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-20 10:20:13 +01:00
373bfea427
Merge pull request #3940 from nextcloud/downstream-27048
...
Add postLogout hook to finish sessions from external session managers…
2017-03-20 10:15:34 +01:00
20c80cba6f
Add exception to PHPDoc
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-20 10:13:57 +01:00
20534e0d1e
Merge pull request #3943 from nextcloud/downstream-27318
...
Output maintenance mode message on STDERR
2017-03-20 02:42:31 -06:00
aacfef463c
Add tests for database user backend caching
...
Add comment, closeCursor in user DB query
Invalidate user in cache after successful creation
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-20 02:03:03 -06:00
592c04a9db
cache loadUser if not exists
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-20 02:01:41 -06:00
85d7e600c1
Merge pull request #3941 from nextcloud/downstream-27254
...
HTTP 1.1 used when giving 403 and 404 errors while attempting to down…
2017-03-20 01:53:05 -06:00
81647a58db
Merge pull request #3931 from nextcloud/downstream-27295
...
Don't store empty groupids
2017-03-20 08:48:09 +01:00
55df840bd9
Merge pull request #3935 from nextcloud/downstream-27293
...
log where a resource was not found
2017-03-20 01:31:20 -06:00
11f838f9e4
Add ignore_files to config,
...
test files against ignore_files list on upload
fix typo and indentation
Move blacklist declaration to lib/public/Files/FileInfo.php,
Rename *ignored to *blacklisted
Mocked blacklist_files for testing
Mocked blacklist_files for testing
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-20 01:17:12 -06:00
5481a9b84a
checking if app exists in the FileStream now
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-20 00:38:29 -06:00
45567572c8
Adding file, line, class and function to the query logger ( #27298 )
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-19 23:39:51 -06:00
590e98a659
ownC -> Nextc
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-19 23:20:24 -06:00
8948f66d0e
maintenance warning printed on STDERR rather than STDOUT
...
redundant check removed
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-19 23:19:54 -06:00
8c27437ac0
HTTP 1.1 used when giving 403 and 404 errors while attempting to download non-existent file
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-19 23:14:26 -06:00
e7dc1f4326
Add postLogout hook to finish sessions from external session managers ( #27048 )
...
* Add postLogout hook to finish sessions from external session managers like CAS
* Add postLogout hook to finish sessions from external session managers like CAS
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-19 23:00:12 -06:00
fc57d4b96c
Fix malformed logging in exception
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-19 22:56:35 -06:00
53b8330e6d
Defining App "cron" for "Invalidating tokens older than" message #27167 ( #27201 )
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-19 22:51:47 -06:00
6b71dd11b7
log where a resource was not found
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-19 22:21:19 -06:00
4e1aca4e3c
don't store empty groupids
...
gives an exception on oracle and shouldn't be added in the first place
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-19 22:01:37 -06:00
528a903a7b
[tx-robot] updated from transifex
2017-03-20 01:07:43 +00:00
edd55b0ea9
Use SystemConfig instead of AllConfig for DB stuff
...
* preparation for followup PRs to clean up the DB bootstrapping
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-19 15:53:49 -06:00
c02527e414
Merge pull request #3927 from nextcloud/minor-fixes
...
Namespace and array syntax fixes
2017-03-19 15:49:38 -06:00
d99ce3971b
Namespace and array syntax fixes
...
* minor fixes in preparation of a bigger DB and config PR
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-19 14:52:54 -06:00
ef789f8480
Merge pull request #3906 from nextcloud/shares-circles-2
...
Support Circles
2017-03-19 20:45:55 +01:00
0ad4b89d41
Some code cleanup
...
As suggested by the inspector
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-19 20:30:46 +01:00
4cd13e7668
Don't generate max preview twice
...
If you request a preview of X by Y. And after calculating X and Y are
equal to maxWidth and maxHeight then there is no reason to create a
preview of that size.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-19 20:23:23 +01:00
9e1e7dac47
[tx-robot] updated from transifex
2017-03-18 01:07:50 +00:00
3adee0f18b
Merge pull request #3898 from nextcloud/issue-3627-always-suggest-cli-url
...
Always suggest the overwrite.cli.url
2017-03-18 00:01:17 +01:00
69694012ab
shares-circles
...
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
2017-03-17 18:48:33 -01:00
26eda9dd58
Merge pull request #3892 from nextcloud/downstream-27101
...
Redirect unlink to rmdir
2017-03-17 13:56:36 +01:00
75b81c3e01
Always suggest the overwrite.cli.url
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-17 13:40:58 +01:00
a5c8016c8b
Merge pull request #3883 from nextcloud/downstream-26968
...
Ignore exception when deleting keys of deleted user
2017-03-17 11:33:50 +01:00
c65848effe
Merge pull request #3878 from nextcloud/downstream-26303
...
Fixed failing test which was ignoring a required (not null) column
2017-03-17 11:10:21 +01:00
bd97b7d130
Use DI
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-17 10:23:04 +01:00
e548d27d3a
Merge pull request #3885 from nextcloud/downstream-26529
...
Skip FailedStorage in background scan
2017-03-17 10:06:58 +01:00
51846c95d9
Merge pull request #3856 from nextcloud/escape-likes-in-database-user-backend
...
Escape like parameters in database user backend
2017-03-17 08:53:10 +01:00
57fc7f60d3
Update autoloader
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-17 08:51:03 +01:00
85601259fb
Add LegacyHooks
...
Use a helper class to listen to the eventDispatcher calls from the share
manager to emit the old \OC_Hooks
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-17 08:50:56 +01:00
5c9baf4ae2
Add unshare event
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-17 08:41:34 +01:00
9915aa6d9c
Merge pull request #3870 from nextcloud/add-base-uri-to-csp-policy
...
Add base-uri to CSP policy
2017-03-17 08:39:02 +01:00
2ccf544ad7
Fixed failing test which was ignoring a required (not null) column ( #26303 )
...
* Fixed failing test which was ignoring a required (not null) column
* restored test to original, catching DriverException which also catches ConstraintViolationException
* catch ConstraintViolationException again
* removed unnecessary field from this test
* clobfield should be nullable
* clobfield now is nullable
* removed autoincrement since whenever this strategy is enabled, oracle would not throw constraint violation exceptions (needed for setValues), which mysql still does
* this field does not auto increment anymore
* mark integerfield as primary, since it is not getting marked as such through auto increment anymore,
integerfield default always has been 0 instead of null
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-17 00:09:07 -06:00
aebb8c3639
Ignore exception when deleting keys of deleted user
...
Whenever a user was deleted for encryption where the keys are stored in
the home, we can ignore user existence exceptions because it means the
keys are already gone.
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-17 00:07:23 -06:00
377fdf3860
Skip null groups in group manager ( #26871 ) ( #26956 )
...
* Skip null groups in group manager (#26871 )
* Skip null groups in group manager
* Also skip null groups in group manager's search function
* Add more group null checks in sharing code
* Add unit tests for null group safety in group manager
* Add unit tests for sharing code null group checks
* Added tests for null groups handling in sharing code
* Ignore moveShare optional repair in mount provider
In some cases, data is inconsistent in the oc_share table due to legacy
data. The mount provider might attempt to make it consistent but if the
target group does not exist any more it cannot work. In such case we
simply ignore the exception as it is not critical. Keeping the
exception would break user accounts as they would be unable to use
their filesystem.
* Adjust null group handing + tests
* Fix new group manager tests
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-17 00:07:03 -06:00
cbebfaaf2b
Skip FailedStorage in background scan
...
The background job that scans storages must skip failed storages to
avoid potential exceptions, especially when the failed storage comes
from a shared storage where the source is not accessible.
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-17 00:06:48 -06:00
7256940524
Redirect unlink to rmdir ( #27101 )
...
Many API callers will call unlink even for directories and it can mess
up with some wrappers like the encryption wrapper
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-16 23:45:03 -06:00
ead9a10cc5
Merge pull request #3619 from nextcloud/fix-scss-for-apps
...
Fix SCSS usage in apps
2017-03-16 22:51:31 -06:00
5683365a2c
[tx-robot] updated from transifex
2017-03-17 01:07:41 +00:00
39afcbd49f
Merge pull request #3679 from nextcloud/socialsharing
...
Add social sharing
2017-03-16 23:08:47 +01:00
d134dea508
Don't call function in constructor
...
The constructor is iniitiated already very early in base.php, thus requiring this here will break the setup and some more. For now we probably have to live with a static function call here thus.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-16 21:59:47 +01:00
cd4ebe2777
Merge pull request #3008 from nextcloud/appmenu-experiment
...
Show apps in header
2017-03-16 13:03:41 -06:00
adfd1e63f6
Add base-uri to CSP policy
...
As per https://twitter.com/we1x/status/842032709543333890 a nice security hardening
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-16 15:16:20 +01:00
57c1be8633
Merge pull request #3802 from Ko-/master
...
Check that set_time_limit is not disabled before calling it
2017-03-16 12:27:26 +01:00
7eae6690ad
Make app management icon act like a normal app icon
...
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-03-16 11:55:09 +01:00
61dc78e6dc
Fix menu issues
...
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-03-16 11:55:09 +01:00
a630e4629f
Generate seperate menu list for header bar
...
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-03-16 11:55:09 +01:00
e3e4cb3e67
Move active app to the first slot
...
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-03-16 11:55:09 +01:00
085891a15d
Escape like parameters in database user backend
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-15 22:46:40 +01:00
f2d3704e97
Merge pull request #3843 from nextcloud/encryption-fix-mail-share
...
take share by mail into consideration if we calculate the access list
2017-03-15 15:23:17 +01:00
4da6b7e796
[tx-robot] updated from transifex
2017-03-15 01:07:49 +00:00
67faf7edc4
Merge pull request #3838 from Xuanwo/basename-fix
...
[OC/Files/Cache]: Fix wrong usage of basename
2017-03-14 21:00:24 +01:00
25553172f4
Merge pull request #3836 from nextcloud/do-not-double-check-app-update
...
Do not check for app update twice
2017-03-14 19:26:01 +01:00
8f92808caf
take share by mail into consideration if we calculate the access list
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-03-14 17:40:42 +01:00
6565533d3b
Merge pull request #3600 from coletivoEITA/master
...
added method needsPartFile() in Storage
2017-03-14 15:14:59 +01:00
3c2312fb09
Merge pull request #3783 from andrius-kulbis/master
...
Fix deleted objectstore shares
2017-03-14 15:14:39 +01:00
13e50cbcd7
added method needsPartFile() in Storage
...
Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>
2017-03-14 10:06:50 -03:00
210f4106c4
[OC/Files/Cache]: Fix wrong usage of basename
...
Fix https://github.com/nextcloud/server/issues/3837
Signed-off-by: Xuanwo <xuanwo@yunify.com>
2017-03-14 13:27:17 +08:00
252858ec5e
Do not double cherck app update
...
In base.php the apps are already checked for an update. No need to
repeat this during loading of the app.
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-13 18:07:41 -06:00
bb94b39745
Do not clear CSRF token on logout (fix for #1303 )
...
This is a hacky way to allow the use case of #1303 .
What happens is
1. User tries to login
2. PreLoginHook kicks in and figures out that the user need to change
their LDAP password or whatever => redirects user
3. While loading the redirect some logic of ours kicks in and logouts
the user (thus clearing the session).
4. We render the new page but now the session and the page disagree
about the CSRF token
This is kind of hacky but I don't think it introduces new attack
vectors.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-13 22:16:56 +01:00
6d0c756ff9
dont allow empty wildcard search
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-13 16:06:19 +01:00
4395cf4fa7
Merge pull request #3780 from GitHubUser4234/audit_log_agent
...
Audit log the User-Agent
2017-03-13 12:38:04 +01:00
f7cef9f702
Merge pull request #3772 from nextcloud/favorite-search
...
Allow searching for favorites
2017-03-13 00:55:12 -06:00
0024b67aaf
Check that set_time_limit is not disabled before calling it
...
Signed-off-by: Ko- <k.stoffelen@cs.ru.nl>
2017-03-11 17:04:21 +01:00
801b600ec3
Merge pull request #3739 from fti7/master
...
Serve robots.txt if the RewriteBase is configured
2017-03-11 09:56:38 +01:00
456cd81a20
[tx-robot] updated from transifex
2017-03-11 01:07:48 +00:00
f86b5c2ebb
Properly calculate webdir using the serverroot
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-10 20:00:34 +01:00
f7ebf1d47d
SCSS files don't exist on the default fs so just add them to the
...
resource list
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-10 19:13:44 +01:00
42ee401376
Merge pull request #3778 from nextcloud/verify_jpg_files
...
Test if a file is a valid jpg file
2017-03-10 18:17:51 +01:00
f74911b638
Merge pull request #3787 from nextcloud/ocs-cookie
...
dont require strict same site cookies for ocs requests
2017-03-10 18:14:38 +01:00
3ca9d53194
Fix SCSS usage in apps
...
* fix the web root detection of the ResourceLocator for apps
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-10 14:44:01 +01:00
35369ecc96
author update
...
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-03-10 17:24:37 +08:00
38d8492f30
improvement of userAgent variable assigment
...
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-03-10 17:20:19 +08:00
06a8ac6ff6
log user agent globally instead
...
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-03-10 16:50:15 +08:00
53640bbc47
MP3 without cover don't get a preview
...
* Fixes #2739
It tries to create an image from an SVG file. Which we don't support. So
this fails and prints an log line. Then we fall back anyways to the 404
and fetch the default icon.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-10 08:52:23 +01:00
a5ba1f7803
Remove legacy class OC_Group and OC_User
...
* basically a straight replacement of the wrapped code at the calling code parts
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-09 17:35:09 -06:00
6fd0e7e939
Merge pull request #3791 from nextcloud/combine_sass
...
Combine sass
2017-03-09 23:25:17 +01:00
0c22a66967
Add more styles to the server.scss
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-09 15:36:03 -06:00
f2cf85fad2
[PoC] combine 2 scss files!
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-09 20:42:34 +01:00
57be594f1f
Allow using import in sass files
...
This allows us to combine multiple sass files that we have to always
load together anyway.
Fixes #3389
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-09 20:29:50 +01:00
8626ccab1c
dont require strict same site cookies for ocs requests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-09 16:48:48 +01:00
15fa306ae8
Merge pull request #3785 from nextcloud/bump_autoloader
...
Bump autoloader
2017-03-09 09:27:12 -06:00
c23c062c89
Merge pull request #3611 from nextcloud/announce-trsuted-server-endpoints
...
Announce trusted server endpoints
2017-03-09 14:39:18 +01:00
d6ce7ac465
Bump autoloader
...
Composer was updated so lets update the autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-09 14:21:38 +01:00
708b62f223
Fix detecting deleted shares in object store
...
While using the object store, the shares, that are moved to trashbin were still detected as accessible and cause broken shares to be shown in file/folder listing.
2017-03-09 14:36:20 +02:00
6d10a2aece
Merge pull request #3754 from trustelem/user_saml-samesite-exclude
...
Extend Same Site cookie user_saml exemption rule
2017-03-09 12:53:21 +01:00
3584e54a89
announce public endpoints to sync trusted servers
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-03-09 10:07:52 +01:00
7dd760d737
Test is a file is a valid jpg file
...
During preview generation if we provide an invalid JPG file the system
errors out with a PHP Fatal Error. Now we can't catch Fatal Errors (in
5.6). I suspect that exif_imagetype to fall back to the extention.
However a valid jpg file has a size. So we request the size of the image
and just drop out if that returns false.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-08 21:48:30 +01:00
e61606a767
Allow searching for favorites
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-08 16:30:55 +01:00
2a8e922d67
Merge pull request #3360 from nextcloud/dav-search
...
Implement webdav SEARCH
2017-03-08 13:09:19 +01:00
be36513819
Extend Same Site cookie user_saml exemption rule
...
The current check does not trigger if $request->getRequestUri() does not return index.php as a prefix
(on my config this was occuring using nginx to serve Nextcloud)
Signed-off-by: Vincent Vanackere <vincent.vanackere@trustelem.com>
2017-03-07 16:22:57 +01:00
3c18096812
Serve robots.txt if the RewriteBase is configured
2017-03-06 21:55:29 +01:00
8e27b8197d
Merge pull request #3684 from nextcloud/run-lang-update-only-once
...
Execute UpdateLanguageCode only once
2017-03-03 13:51:32 +01:00
f8c459f1a4
Merge pull request #3607 from nextcloud/api-to-resend-welcome-message
...
OCS API endpoint to resend welcome message
2017-03-03 13:50:30 +01:00
fd71b8bde8
Move social buttons to menu
...
* If there are social sharing buttons move them and the copy action to a
menu
* If there are no social sharing buttons just leave the copy action
where it is directly
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-03 13:27:06 +01:00
0beb78517f
Fix DI
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-03 12:20:02 +01:00
9f82bb9b4f
Merge pull request #3689 from nextcloud/cleanup-legacy-classes
...
Cleanup not used legacy classes
2017-03-03 12:04:27 +01:00
a85327fe87
Add social sharing
...
* Add socialshare manager
* Add social share field under link share
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-03 10:19:41 +01:00
e648b8cb6d
Merge pull request #3682 from whitekiba/master
...
Remove deprecated OC_User::isLoggedIn
2017-03-03 09:23:42 +01:00
6174a514b7
Get rid of static OCS::notFound()
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-03 00:41:21 -06:00
d85a351e77
Cleanup not used legacy classes
...
* Person was removed via #2170
* other lcasses/interfaces are not used at all
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-03 00:31:33 -06:00
0b12eb0640
Execute UpdateLanguageCode only once
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-02 21:53:36 -06:00
b55ce43ba5
[tx-robot] updated from transifex
2017-03-03 01:07:45 +00:00
e399097e3a
Remove deprecated OC_User::isLoggedIn
...
Signed-off-by: Sebastian Wessalowski <sebastian@wessalowski.org>
2017-03-02 22:59:39 +01:00
53195b156c
[tx-robot] updated from transifex
2017-03-02 16:48:52 +00:00
ba472f7ce0
Fix table name and add a test for more than 1 entries
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-02 09:11:47 +01:00
1bcd396679
Change language code for languages with only one translation
...
* then the language is not that specific and get also matched for fi
* fallback from fi_FI to fi is supported - the other way around not
* contains repair script
* contains tests for repair script
* fixes #869
Order results to make postgres happy
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-01 22:35:28 -06:00
d8c89688f4
autoloader
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-01 14:06:40 +01:00
e6a896f2f0
add tests for searchQuery
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-01 14:06:40 +01:00
df2063ee7b
Implement webdav SEARCH
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-01 14:06:39 +01:00
7f54013fdb
Fix return type of share provider
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-01 13:45:04 +01:00
Morris Jobke
Joas Schilling
Bjoern Schiessle
Robin Appelman
Roeland Jago Douma
Juan Pablo Villafáñez
Piotr M
Lukas Reschke
Nextcloud bot
Roeland Jago Douma
Jörn Friedrich Dreyer
Arthur Schiwon
Kawohl
Philipp Schaffrath
Christoph Wurst
Christoph Wurst
Jan-Christoph Borchardt
Julius Härtl
Pierre Rudloff
Georg Ehrke
Robin McCorkell
Vincent Petry
Felix Heidecke
noveens
Thomas Müller
Felix Rupp
kdslkdsaldsal
Martin
Maxence Lange
Vinicius Cubas Brand
Xuanwo
Ko-
Roger Szabo
Andrius
Vincent Vanackere
Frank Isemann
Sebastian Wessalowski