Commit Graph

7025 Commits

Author SHA1 Message Date
Roeland Jago Douma ef789f8480 Merge pull request #3906 from nextcloud/shares-circles-2
Support Circles
2017-03-19 20:45:55 +01:00
Roeland Jago Douma 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
Roeland Jago Douma 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
Lukas Reschke 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
Maxence Lange 69694012ab shares-circles
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
2017-03-17 18:48:33 -01:00
Joas Schilling 26eda9dd58 Merge pull request #3892 from nextcloud/downstream-27101
Redirect unlink to rmdir
2017-03-17 13:56:36 +01:00
Joas Schilling 75b81c3e01
Always suggest the overwrite.cli.url
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-17 13:40:58 +01:00
blizzz 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
Joas Schilling 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
Joas Schilling bd97b7d130
Use DI
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-17 10:23:04 +01:00
Joas Schilling e548d27d3a Merge pull request #3885 from nextcloud/downstream-26529
Skip FailedStorage in background scan
2017-03-17 10:06:58 +01:00
Roeland Jago Douma 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
Roeland Jago Douma 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
Roeland Jago Douma 5c9baf4ae2
Add unshare event
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-17 08:41:34 +01:00
Philipp Schaffrath 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
Vincent Petry 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
Vincent Petry 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
Vincent Petry 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
Vincent Petry 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
Morris Jobke ead9a10cc5 Merge pull request #3619 from nextcloud/fix-scss-for-apps
Fix SCSS usage in apps
2017-03-16 22:51:31 -06:00
Lukas Reschke 39afcbd49f Merge pull request #3679 from nextcloud/socialsharing
Add social sharing
2017-03-16 23:08:47 +01:00
Lukas Reschke 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
Morris Jobke cd4ebe2777 Merge pull request #3008 from nextcloud/appmenu-experiment
Show apps in header
2017-03-16 13:03:41 -06:00
Roeland Jago Douma 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
Julius Haertl 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
Julius Haertl 61dc78e6dc
Fix menu issues
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-03-16 11:55:09 +01:00
Julius Haertl a630e4629f
Generate seperate menu list for header bar
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-03-16 11:55:09 +01:00
Julius Haertl e3e4cb3e67
Move active app to the first slot
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-03-16 11:55:09 +01:00
Lukas Reschke 085891a15d
Escape like parameters in database user backend
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-15 22:46:40 +01:00
Joas Schilling 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
Roeland Jago Douma 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
Roeland Jago Douma 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
Bjoern Schiessle 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
Roeland Jago Douma 6565533d3b Merge pull request #3600 from coletivoEITA/master
added method needsPartFile() in Storage
2017-03-14 15:14:59 +01:00
Roeland Jago Douma 3c2312fb09 Merge pull request #3783 from andrius-kulbis/master
Fix deleted objectstore shares
2017-03-14 15:14:39 +01:00
Vinicius Cubas Brand 13e50cbcd7 added method needsPartFile() in Storage
Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>
2017-03-14 10:06:50 -03:00
Xuanwo 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
Morris Jobke 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
Robin Appelman 6d0c756ff9
dont allow empty wildcard search
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-13 16:06:19 +01:00
Lukas Reschke 4395cf4fa7 Merge pull request #3780 from GitHubUser4234/audit_log_agent
Audit log the User-Agent
2017-03-13 12:38:04 +01:00
Morris Jobke f7cef9f702 Merge pull request #3772 from nextcloud/favorite-search
Allow searching for favorites
2017-03-13 00:55:12 -06:00
Ko- 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
Lukas Reschke 801b600ec3 Merge pull request #3739 from fti7/master
Serve robots.txt if the RewriteBase is configured
2017-03-11 09:56:38 +01:00
Roeland Jago Douma f86b5c2ebb
Properly calculate webdir using the serverroot
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-10 20:00:34 +01:00
Roeland Jago Douma 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
Lukas Reschke 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
Lukas Reschke 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
Morris Jobke 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
Roger Szabo 35369ecc96 author update
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-03-10 17:24:37 +08:00
Roger Szabo 38d8492f30 improvement of userAgent variable assigment
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-03-10 17:20:19 +08:00
Roger Szabo 06a8ac6ff6 log user agent globally instead
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-03-10 16:50:15 +08:00
Roeland Jago Douma 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
Morris Jobke 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
Lukas Reschke 6fd0e7e939 Merge pull request #3791 from nextcloud/combine_sass
Combine sass
2017-03-09 23:25:17 +01:00
Morris Jobke 0c22a66967
Add more styles to the server.scss
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-09 15:36:03 -06:00
Roeland Jago Douma f2cf85fad2
[PoC] combine 2 scss files!
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-09 20:42:34 +01:00
Roeland Jago Douma 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
Roeland Jago Douma 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
Björn Schießle c23c062c89 Merge pull request #3611 from nextcloud/announce-trsuted-server-endpoints
Announce trusted server endpoints
2017-03-09 14:39:18 +01:00
Andrius 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
Bjoern Schiessle 3584e54a89
announce public endpoints to sync trusted servers
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-03-09 10:07:52 +01:00
Roeland Jago Douma 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
Robin Appelman e61606a767
Allow searching for favorites
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-08 16:30:55 +01:00
Robin Appelman 2a8e922d67 Merge pull request #3360 from nextcloud/dav-search
Implement webdav SEARCH
2017-03-08 13:09:19 +01:00
Frank Isemann 3c18096812 Serve robots.txt if the RewriteBase is configured 2017-03-06 21:55:29 +01:00
Roeland Jago Douma 8e27b8197d Merge pull request #3684 from nextcloud/run-lang-update-only-once
Execute UpdateLanguageCode only once
2017-03-03 13:51:32 +01:00
Roeland Jago Douma 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
Roeland Jago Douma 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
Joas Schilling 0beb78517f
Fix DI
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-03 12:20:02 +01:00
Joas Schilling 9f82bb9b4f Merge pull request #3689 from nextcloud/cleanup-legacy-classes
Cleanup not used legacy classes
2017-03-03 12:04:27 +01:00
Roeland Jago Douma 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
Morris Jobke 6174a514b7
Get rid of static OCS::notFound()
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-03 00:41:21 -06:00
Morris Jobke 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
Morris Jobke 0b12eb0640
Execute UpdateLanguageCode only once
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-02 21:53:36 -06:00
Sebastian Wessalowski e399097e3a Remove deprecated OC_User::isLoggedIn
Signed-off-by: Sebastian Wessalowski <sebastian@wessalowski.org>
2017-03-02 22:59:39 +01:00
Joas Schilling 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
Morris Jobke 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
Robin Appelman df2063ee7b
Implement webdav SEARCH
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-01 14:06:39 +01:00
Joas Schilling 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 552921d429
Fix injection of defaults
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-28 16:30:34 -06:00
Morris Jobke 50f3efad6f
OCS API endpoint to resend welcome message
* send a POST request to ocs/v1.php/cloud/users/USERNAME/resendWelcomeMessage to trigger
  the welcome message to be send
* fixes #3367

example curl statement:

  curl -i https://example.org/ocs/v1.php/cloud/users/USERNAME/welcome -H  "OCS-APIRequest: true" -u admin:password -X POST

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-28 16:30:33 -06:00
Robin Appelman 706131b394
add icewind/searchdav
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-02-28 14:24:18 +01:00
Maxence Lange cfb40941c4
Fix condition
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-26 11:45:17 -06:00
Lukas Reschke dd6d2893a6 Merge pull request #3588 from GreenArchon/issue_#3461
Typecast shared mount's storage_id to int as documented + some refactor to avoid similar bugs
2017-02-24 17:25:21 +01:00
KB7777 7347849bf9 Update Setup.php 2017-02-24 12:13:26 +01:00
Morris Jobke f3bfacc976
Fix unit tests and improve appstore logic
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-24 08:34:14 +01:00
Steffen Lindner cfb6223de7
Add back appstoreenabled config switch
Signed-off-by: Steffen Lindner <mail@steffen-lindner.de>
2017-02-24 08:31:56 +01:00
Morris Jobke ee52313e76 Merge pull request #3589 from nextcloud/remove-unneeded-repair-step
Remove unneeded repair steps
2017-02-23 15:57:21 -06:00
Morris Jobke 254c98bb9e Merge pull request #3576 from robert-scheck/timezone
According to issue #3553, the default logtimezone is always UTC
2017-02-23 15:36:50 -06:00
Joas Schilling 8bfa50bd12 Merge pull request #3575 from nextcloud/better-thumbnail-quality
Use 90% JPEG quality for thumbnails and previews by default
2017-02-23 09:54:32 +01:00
Morris Jobke 2bbf3b18d9
cleanup old and not needed repair steps to speed up the update
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-22 22:35:18 -06:00
Morris Jobke c2d3e12e23
Remove unneeded UpdateCertificateStore.
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-22 21:26:59 -06:00
Frédéric Fortier 55a37c1db9 Refactor files' CacheEntry object creation to call cacheEntryFromData() all the time thus allowing proper casts to be done
Signed-off-by: Frédéric Fortier <frederic.fortier@oronospolytechnique.com>
2017-02-22 20:03:32 -05:00
Robert Scheck 568ff4ba38 According to issue #3553, the default logtimezone is always UTC
Signed-off-by: Robert Scheck <robert@fedoraproject.org>
2017-02-23 00:15:45 +01:00
Björn Schießle 621f920d68 Merge pull request #3567 from nextcloud/autocomplete-settings
some sharing settings
2017-02-22 16:30:21 +01:00
Joas Schilling 079888f918
Fix code quality a bit
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-22 14:53:15 +01:00
Joas Schilling 1e281bc616
Use 90% JPEG quality for thumbnails and previews by default
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-22 14:53:15 +01:00
Joas Schilling 899af7831e
Catch exception from path info
We don't really care when the path info can not be gathered correctly.
we will simply not use SCSS then but the CSS fallback.

Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-22 11:08:58 +01:00
Morris Jobke 8e3d0fecd2
Use intval() for validation of config options
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-21 17:22:06 -06:00
Morris Jobke 3284efd199
Improve the UX for sharing settings
* shows a info when list is potentially truncated
* shows a warning when characters length is not enough

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-21 17:07:07 -06:00