]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
7 years agoFix avatar and caret position 3919/head
Michael Letzgus [Sun, 19 Mar 2017 14:19:11 +0000 (15:19 +0100)]
Fix avatar and caret position

* Avatar image was not vertcially aligned
* The caret was below the avatar
* The surrounding <div> exceeded the title bar

Signed-off-by: Michael Letzgus <michaelletzgus@users.noreply.github.com>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 19 Mar 2017 01:08:20 +0000 (01:08 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #3899 from nextcloud/issue-3662-not-sending-is-an-error
Lukas Reschke [Sat, 18 Mar 2017 09:47:57 +0000 (10:47 +0100)]
Merge pull request #3899 from nextcloud/issue-3662-not-sending-is-an-error

Fail when the test mail could not be sent

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 18 Mar 2017 01:07:50 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #3898 from nextcloud/issue-3627-always-suggest-cli-url
Lukas Reschke [Fri, 17 Mar 2017 23:01:17 +0000 (00:01 +0100)]
Merge pull request #3898 from nextcloud/issue-3627-always-suggest-cli-url

Always suggest the overwrite.cli.url

7 years agoMerge pull request #3904 from nextcloud/revert-3893-downstream-27069
Morris Jobke [Fri, 17 Mar 2017 18:06:46 +0000 (12:06 -0600)]
Merge pull request #3904 from nextcloud/revert-3893-downstream-27069

Revert "Add integration test for trashbin"

7 years agoRevert "Add integration test for trashbin" 3904/head
Morris Jobke [Fri, 17 Mar 2017 18:06:16 +0000 (12:06 -0600)]
Revert "Add integration test for trashbin"

7 years agoMerge pull request #3887 from nextcloud/downstream-26379
Morris Jobke [Fri, 17 Mar 2017 15:16:19 +0000 (09:16 -0600)]
Merge pull request #3887 from nextcloud/downstream-26379

Add CleanupRemoteStorages command

7 years agoMerge pull request #3892 from nextcloud/downstream-27101
Joas Schilling [Fri, 17 Mar 2017 12:56:36 +0000 (13:56 +0100)]
Merge pull request #3892 from nextcloud/downstream-27101

Redirect unlink to rmdir

7 years agoMerge pull request #3881 from nextcloud/downstream-26842
Joas Schilling [Fri, 17 Mar 2017 12:53:04 +0000 (13:53 +0100)]
Merge pull request #3881 from nextcloud/downstream-26842

Backbone Webdav Adapter MKCOL support

7 years agoFail when the test mail could not be sent 3899/head
Joas Schilling [Fri, 17 Mar 2017 12:45:25 +0000 (13:45 +0100)]
Fail when the test mail could not be sent

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoAlways suggest the overwrite.cli.url 3898/head
Joas Schilling [Fri, 17 Mar 2017 12:34:23 +0000 (13:34 +0100)]
Always suggest the overwrite.cli.url

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge pull request #3883 from nextcloud/downstream-26968
blizzz [Fri, 17 Mar 2017 10:33:50 +0000 (11:33 +0100)]
Merge pull request #3883 from nextcloud/downstream-26968

Ignore exception when deleting keys of deleted user

7 years agoMerge pull request #3878 from nextcloud/downstream-26303
Joas Schilling [Fri, 17 Mar 2017 10:10:21 +0000 (11:10 +0100)]
Merge pull request #3878 from nextcloud/downstream-26303

Fixed failing test which was ignoring a required (not null) column

7 years agoCleanup test 3892/head
Joas Schilling [Fri, 17 Mar 2017 09:59:53 +0000 (10:59 +0100)]
Cleanup test

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoFix unit test
Joas Schilling [Fri, 17 Mar 2017 09:39:08 +0000 (10:39 +0100)]
Fix unit test

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge pull request #3893 from nextcloud/downstream-27069
Roeland Jago Douma [Fri, 17 Mar 2017 09:10:00 +0000 (10:10 +0100)]
Merge pull request #3893 from nextcloud/downstream-27069

Add integration test for trashbin

7 years agoMerge pull request #3885 from nextcloud/downstream-26529
Joas Schilling [Fri, 17 Mar 2017 09:06:58 +0000 (10:06 +0100)]
Merge pull request #3885 from nextcloud/downstream-26529

Skip FailedStorage in background scan

7 years agoMerge pull request #3886 from nextcloud/downstream-26995
Joas Schilling [Fri, 17 Mar 2017 09:05:25 +0000 (10:05 +0100)]
Merge pull request #3886 from nextcloud/downstream-26995

Chunking NG: Assemble in natural sort order of files

7 years agoSafer queries 3887/head
Joas Schilling [Fri, 17 Mar 2017 08:59:56 +0000 (09:59 +0100)]
Safer queries

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoBetter output
Joas Schilling [Fri, 17 Mar 2017 08:59:25 +0000 (09:59 +0100)]
Better output

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge pull request #3894 from nextcloud/downstream-27008
Joas Schilling [Fri, 17 Mar 2017 08:17:36 +0000 (09:17 +0100)]
Merge pull request #3894 from nextcloud/downstream-27008

Integration test check download without saving file locally

7 years agoMerge pull request #3856 from nextcloud/escape-likes-in-database-user-backend
Roeland Jago Douma [Fri, 17 Mar 2017 07:53:10 +0000 (08:53 +0100)]
Merge pull request #3856 from nextcloud/escape-likes-in-database-user-backend

Escape like parameters in database user backend

7 years agoMerge pull request #3870 from nextcloud/add-base-uri-to-csp-policy
Roeland Jago Douma [Fri, 17 Mar 2017 07:39:02 +0000 (08:39 +0100)]
Merge pull request #3870 from nextcloud/add-base-uri-to-csp-policy

Add base-uri to CSP policy

7 years agoMerge pull request #3874 from nextcloud/harden-js-by-disabling-eval-execution
Roeland Jago Douma [Fri, 17 Mar 2017 07:31:12 +0000 (08:31 +0100)]
Merge pull request #3874 from nextcloud/harden-js-by-disabling-eval-execution

Harden JS by disabling jQuery eval

7 years agoMerge pull request #3875 from nextcloud/use-new-short-urls
Roeland Jago Douma [Fri, 17 Mar 2017 07:30:07 +0000 (08:30 +0100)]
Merge pull request #3875 from nextcloud/use-new-short-urls

Use cleaner social media URLs

7 years agoAdd CleanupRemoteStorages command
Jörn Friedrich Dreyer [Wed, 12 Oct 2016 10:59:13 +0000 (12:59 +0200)]
Add CleanupRemoteStorages command

cleanup files, address review

Fix CleanupRemoteStoragesTest tests

Fix test expectation.
Added files count to check filecache deletion.

Sort by numeric id for deterministic test results

Removed precise order test and added storage check

Remove inaccurate removal message check which has a different order on
Oracle.

Added more checks to confirm that existing storages still exist.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoFixed failing test which was ignoring a required (not null) column (#26303) 3878/head
Philipp Schaffrath [Tue, 10 Jan 2017 11:10:36 +0000 (12:10 +0100)]
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>
7 years agoBackbone Webdav Adapter MKCOL support 3881/head
Vincent Petry [Thu, 15 Dec 2016 14:11:56 +0000 (15:11 +0100)]
Backbone Webdav Adapter MKCOL support

Usually Backbone collections cannot be created and just simply exists.
But in the Webdav world they need to be creatable.

This enhancement makes it possible to use a Backbone Model to represent
such collections and when creating it, it will use MKCOL instead of PUT.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoIgnore exception when deleting keys of deleted user 3883/head
Vincent Petry [Wed, 18 Jan 2017 16:42:07 +0000 (17:42 +0100)]
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>
7 years agoSkip FailedStorage in background scan 3885/head
Vincent Petry [Wed, 2 Nov 2016 17:04:17 +0000 (18:04 +0100)]
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>
7 years agoChunking NG: Assemble in natural sort order of files 3886/head
Markus Goetz [Fri, 20 Jan 2017 16:46:04 +0000 (17:46 +0100)]
Chunking NG: Assemble in natural sort order of files

For https://github.com/owncloud/client/pull/5476

Before this, the assembly could be bogusly in the order 0,1,10,11,2,3 etc.

As per the spec "The name of every chunk should be its chunk number."
https://github.com/cernbox/smashbox/blob/master/protocol/chunking.md

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoIntegration test check download without saving file locally 3894/head
Vincent Petry [Tue, 24 Jan 2017 06:32:47 +0000 (07:32 +0100)]
Integration test check download without saving file locally

Use Guzzle stream mode to download the contents instead of using a
temporary local file.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoAdd drone.yml config 3893/head
Morris Jobke [Fri, 17 Mar 2017 05:54:13 +0000 (23:54 -0600)]
Add drone.yml config

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoAdd integration test for trashbin
Vincent Petry [Wed, 1 Feb 2017 09:54:10 +0000 (10:54 +0100)]
Add integration test for trashbin

Add test for basic deletion.
Add test when deleting from shared folder as recipient.
Add test to check that metadata stays when moving out of shared folder
as recipient.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoRedirect unlink to rmdir (#27101)
Vincent Petry [Wed, 8 Feb 2017 14:56:34 +0000 (15:56 +0100)]
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>
7 years agoMerge pull request #2824 from nextcloud/ext-storage-expireversions
Morris Jobke [Fri, 17 Mar 2017 05:00:55 +0000 (23:00 -0600)]
Merge pull request #2824 from nextcloud/ext-storage-expireversions

Properly expire ext storage versions (#26601)

7 years agoMerge pull request #3619 from nextcloud/fix-scss-for-apps
Morris Jobke [Fri, 17 Mar 2017 04:51:31 +0000 (22:51 -0600)]
Merge pull request #3619 from nextcloud/fix-scss-for-apps

Fix SCSS usage in apps

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 17 Mar 2017 01:07:41 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years agoUse cleaner social media URLs 3875/head
Lukas Reschke [Thu, 16 Mar 2017 22:45:49 +0000 (23:45 +0100)]
Use cleaner social media URLs

We now have nice cleaner URLs since a longer time, let's use them.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #3679 from nextcloud/socialsharing
Lukas Reschke [Thu, 16 Mar 2017 22:08:47 +0000 (23:08 +0100)]
Merge pull request #3679 from nextcloud/socialsharing

Add social sharing

7 years agoHarden JS by disabling jQuery eval 3874/head
Lukas Reschke [Thu, 16 Mar 2017 22:03:02 +0000 (23:03 +0100)]
Harden JS by disabling jQuery eval

Disable execution of eval in jQuery. We do require an allowed eval CSP
configuration at the moment for handlebars et al. But for jQuery there is
not much of a reason to execute JavaScript directly via eval.

This thus mitigates some unexpected XSS vectors. As example try to insert
`$('.fileinfo').html('<a href="asd"><script>alert(1)</script></a>');`
with and without this patch in your browsers JS console when the file list
is opened.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #3862 from nextcloud/dont-set-the-status-twice
Lukas Reschke [Thu, 16 Mar 2017 21:05:47 +0000 (22:05 +0100)]
Merge pull request #3862 from nextcloud/dont-set-the-status-twice

Don't set the HTTP status twice

7 years agoDon't call function in constructor 3856/head
Lukas Reschke [Thu, 16 Mar 2017 20:59:47 +0000 (21:59 +0100)]
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>
7 years agoAdjust integration test 3870/head
Lukas Reschke [Thu, 16 Mar 2017 19:51:40 +0000 (20:51 +0100)]
Adjust integration test

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #3008 from nextcloud/appmenu-experiment
Morris Jobke [Thu, 16 Mar 2017 19:03:41 +0000 (13:03 -0600)]
Merge pull request #3008 from nextcloud/appmenu-experiment

Show apps in header

7 years agoAdjust tests to include base-uri
Lukas Reschke [Thu, 16 Mar 2017 17:12:10 +0000 (18:12 +0100)]
Adjust tests to include base-uri

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #3863 from nextcloud/additional-hardening-of-t
Roeland Jago Douma [Thu, 16 Mar 2017 14:54:04 +0000 (15:54 +0100)]
Merge pull request #3863 from nextcloud/additional-hardening-of-t

Harden t() with DOMPurify

7 years agoAdd base-uri to CSP policy
Lukas Reschke [Thu, 16 Mar 2017 14:16:20 +0000 (15:16 +0100)]
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>
7 years agoHarden t() with DOMPurify 3863/head
Lukas Reschke [Thu, 16 Mar 2017 12:47:27 +0000 (13:47 +0100)]
Harden t() with DOMPurify

This mitigates issues where developers pass untrusted user-input through t() which may lead to XSS issues.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #3860 from nextcloud/fix_master_after_3802
Lukas Reschke [Thu, 16 Mar 2017 13:08:32 +0000 (14:08 +0100)]
Merge pull request #3860 from nextcloud/fix_master_after_3802

Fix unit tests of master

7 years agoDon't set the HTTP status twice 3862/head
Joas Schilling [Thu, 16 Mar 2017 12:35:41 +0000 (13:35 +0100)]
Don't set the HTTP status twice

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoFix unit tests of master 3860/head
Roeland Jago Douma [Thu, 16 Mar 2017 11:30:21 +0000 (12:30 +0100)]
Fix unit tests of master

Follow up to #3802

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoMerge pull request #3802 from Ko-/master
Roeland Jago Douma [Thu, 16 Mar 2017 11:27:26 +0000 (12:27 +0100)]
Merge pull request #3802 from Ko-/master

Check that set_time_limit is not disabled before calling it

7 years agoMerge pull request #3857 from nextcloud/issue-3901-legacy-caldav-endpoint-email-invit...
Joas Schilling [Thu, 16 Mar 2017 11:14:32 +0000 (12:14 +0100)]
Merge pull request #3857 from nextcloud/issue-3901-legacy-caldav-endpoint-email-invitations

Fix scheduling plugin on legacy caldav endpoint

7 years agoFix html formating issues 3008/head
Julius Haertl [Fri, 3 Mar 2017 14:09:21 +0000 (15:09 +0100)]
Fix html formating issues

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoRebuild menu to keep order of icons correct
Julius Haertl [Fri, 3 Mar 2017 14:09:08 +0000 (15:09 +0100)]
Rebuild menu to keep order of icons correct

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoReduce device width and hide app name when menu is open
Julius Haertl [Fri, 3 Mar 2017 12:16:30 +0000 (13:16 +0100)]
Reduce device width and hide app name when menu is open

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoMake enabling/disabling apps work with the new menu
Julius Haertl [Fri, 3 Mar 2017 12:00:37 +0000 (13:00 +0100)]
Make enabling/disabling apps work with the new menu

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoFix positioning of popovermenu
Julius Haertl [Fri, 3 Mar 2017 12:00:10 +0000 (13:00 +0100)]
Fix positioning of popovermenu

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoFix popover positioning after window resize
Julius Haertl [Fri, 3 Mar 2017 01:09:49 +0000 (02:09 +0100)]
Fix popover positioning after window resize

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoCleanup SCSS for app menu and fix mobile view
Julius Haertl [Fri, 3 Mar 2017 01:09:24 +0000 (02:09 +0100)]
Cleanup SCSS for app menu and fix mobile view

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoMake app management icon act like a normal app icon
Julius Haertl [Wed, 1 Mar 2017 22:57:16 +0000 (23:57 +0100)]
Make app management icon act like a normal app icon

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoFix menu issues
Julius Haertl [Wed, 1 Mar 2017 22:21:38 +0000 (23:21 +0100)]
Fix menu issues

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoGenerate seperate menu list for header bar
Julius Haertl [Wed, 1 Mar 2017 22:04:27 +0000 (23:04 +0100)]
Generate seperate menu list for header bar

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoMove active app to the first slot
Julius Haertl [Wed, 11 Jan 2017 11:34:49 +0000 (12:34 +0100)]
Move active app to the first slot

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoShow app icons in the header
Julius Haertl [Sun, 18 Dec 2016 14:05:39 +0000 (15:05 +0100)]
Show app icons in the header

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoAdd warning on admin screen when set_time_limit is unavailable 3802/head
Ko- [Thu, 16 Mar 2017 10:48:28 +0000 (11:48 +0100)]
Add warning on admin screen when set_time_limit is unavailable

7 years agoFix scheduling plugin on legacy caldav endpoint 3857/head
Joas Schilling [Thu, 16 Mar 2017 08:55:15 +0000 (09:55 +0100)]
Fix scheduling plugin on legacy caldav endpoint

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge pull request #3624 from marncz/master
Roeland Jago Douma [Thu, 16 Mar 2017 06:56:51 +0000 (07:56 +0100)]
Merge pull request #3624 from marncz/master

Update.js: countdown feedback before redirect

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 16 Mar 2017 01:07:36 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years agoEscape like parameters in database user backend
Lukas Reschke [Wed, 15 Mar 2017 21:46:40 +0000 (22:46 +0100)]
Escape like parameters in database user backend

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #3788 from nextcloud/fed-share-modify
Roeland Jago Douma [Wed, 15 Mar 2017 16:32:35 +0000 (17:32 +0100)]
Merge pull request #3788 from nextcloud/fed-share-modify

Add api to change the remote of an incoming federated share

7 years agoMerge pull request #3843 from nextcloud/encryption-fix-mail-share
Joas Schilling [Wed, 15 Mar 2017 14:23:17 +0000 (15:23 +0100)]
Merge pull request #3843 from nextcloud/encryption-fix-mail-share

take share by mail into consideration if we calculate the access list

7 years agoMerge pull request #3848 from nextcloud/remove-single-quotes-around-search-query
Roeland Jago Douma [Wed, 15 Mar 2017 14:05:15 +0000 (15:05 +0100)]
Merge pull request #3848 from nextcloud/remove-single-quotes-around-search-query

Remove single quotes around search query like in user search

7 years agoRemove single quotes around search query like in user search 3848/head
Joas Schilling [Wed, 15 Mar 2017 11:53:44 +0000 (12:53 +0100)]
Remove single quotes around search query like in user search

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge pull request #3841 from nextcloud/encyryption-trash-bin
Björn Schießle [Wed, 15 Mar 2017 08:07:07 +0000 (09:07 +0100)]
Merge pull request #3841 from nextcloud/encyryption-trash-bin

Delete files on encryption error

7 years agoSpacing 3624/head
Marcin Czarnecki [Wed, 15 Mar 2017 06:35:40 +0000 (06:35 +0000)]
Spacing

Signed-off-by: marncz <M.Czarnecki1@uni.brighton.ac.uk>
7 years agoFix layout of sharing buttons 3679/head
Morris Jobke [Wed, 15 Mar 2017 04:50:32 +0000 (22:50 -0600)]
Fix layout of sharing buttons

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 15 Mar 2017 01:07:49 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years agoUpdate: feedback before redirect
Marcin Czarnecki [Tue, 14 Mar 2017 20:36:17 +0000 (20:36 +0000)]
Update: feedback before redirect

Signed-off-by: marncz <M.Czarnecki1@uni.brighton.ac.uk>
7 years agoMerge pull request #3838 from Xuanwo/basename-fix
Roeland Jago Douma [Tue, 14 Mar 2017 20:00:24 +0000 (21:00 +0100)]
Merge pull request #3838 from Xuanwo/basename-fix

[OC/Files/Cache]: Fix wrong usage of basename

7 years agoMerge pull request #3829 from nextcloud/reshares-in-folder
Roeland Jago Douma [Tue, 14 Mar 2017 19:13:09 +0000 (20:13 +0100)]
Merge pull request #3829 from nextcloud/reshares-in-folder

switch reshares to true (display reshares in the folder/filelist)

7 years agofix mock 3829/head
Maxence Lange [Tue, 14 Mar 2017 15:28:45 +0000 (14:28 -0100)]
fix mock

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoswitch reshares to true
Maxence Lange [Mon, 13 Mar 2017 18:24:12 +0000 (17:24 -0100)]
switch reshares to true

Signed-off-by: Maxence Lange <maxence@nextcloud.com>
7 years agoMerge pull request #3836 from nextcloud/do-not-double-check-app-update
Roeland Jago Douma [Tue, 14 Mar 2017 18:26:01 +0000 (19:26 +0100)]
Merge pull request #3836 from nextcloud/do-not-double-check-app-update

Do not check for app update twice

7 years agotake share by mail into consideration if we calculate the access list 3843/head
Bjoern Schiessle [Tue, 14 Mar 2017 16:40:42 +0000 (17:40 +0100)]
take share by mail into consideration if we calculate the access list

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
7 years agoMerge pull request #3600 from coletivoEITA/master
Roeland Jago Douma [Tue, 14 Mar 2017 14:14:59 +0000 (15:14 +0100)]
Merge pull request #3600 from coletivoEITA/master

added method needsPartFile() in Storage

7 years agoMerge pull request #3783 from andrius-kulbis/master
Roeland Jago Douma [Tue, 14 Mar 2017 14:14:39 +0000 (15:14 +0100)]
Merge pull request #3783 from andrius-kulbis/master

Fix deleted objectstore shares

7 years agoMerge pull request #3824 from nextcloud/dav-search-getlastmodified
Robin Appelman [Tue, 14 Mar 2017 13:42:57 +0000 (14:42 +0100)]
Merge pull request #3824 from nextcloud/dav-search-getlastmodified

fix searching and ordering on getlastmodified

7 years agosafer casting of datetime 3824/head
Robin Appelman [Tue, 14 Mar 2017 13:12:40 +0000 (14:12 +0100)]
safer casting of datetime

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoadded method needsPartFile() in Storage 3600/head
Vinicius Cubas Brand [Thu, 23 Feb 2017 16:32:16 +0000 (13:32 -0300)]
added method needsPartFile() in Storage

Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>
7 years agodelete files right away in case of a encryption exception 3841/head
Bjoern Schiessle [Tue, 14 Mar 2017 11:05:25 +0000 (12:05 +0100)]
delete files right away in case of a encryption exception

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
7 years agoalways throw a encryption exception
Bjoern Schiessle [Tue, 14 Mar 2017 10:31:46 +0000 (11:31 +0100)]
always throw a encryption exception

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
7 years ago[OC/Files/Cache]: Fix wrong usage of basename 3838/head
Xuanwo [Tue, 14 Mar 2017 05:27:17 +0000 (13:27 +0800)]
[OC/Files/Cache]: Fix wrong usage of basename

Fix https://github.com/nextcloud/server/issues/3837

Signed-off-by: Xuanwo <xuanwo@yunify.com>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 14 Mar 2017 01:07:46 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years agoDo not double cherck app update 3836/head
Morris Jobke [Tue, 14 Mar 2017 00:07:41 +0000 (18:07 -0600)]
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>
7 years agoMerge pull request #3827 from nextcloud/issue-3826-remove-double-password-confirmation
Morris Jobke [Mon, 13 Mar 2017 22:03:11 +0000 (16:03 -0600)]
Merge pull request #3827 from nextcloud/issue-3826-remove-double-password-confirmation

Remove the double password confirmation on changing cron

7 years agofix unit test
Morris Jobke [Mon, 13 Mar 2017 21:59:04 +0000 (15:59 -0600)]
fix unit test

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #3828 from nextcloud/no-no-empty-wildcard-search
Lukas Reschke [Mon, 13 Mar 2017 18:28:00 +0000 (19:28 +0100)]
Merge pull request #3828 from nextcloud/no-no-empty-wildcard-search

dont allow empty wildcard search