]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
7 years agoSCSS colors in icons.scss
Julius Haertl [Sun, 19 Feb 2017 18:49:06 +0000 (19:49 +0100)]
SCSS colors in icons.scss

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoSCSS colors in apps.scss
Julius Haertl [Sun, 19 Feb 2017 18:48:51 +0000 (19:48 +0100)]
SCSS colors in apps.scss

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoSCSS colors in header.scss
Julius Haertl [Fri, 17 Feb 2017 16:15:24 +0000 (17:15 +0100)]
SCSS colors in header.scss

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoAdd variables of existing colors
Julius Haertl [Sun, 19 Feb 2017 18:47:13 +0000 (19:47 +0100)]
Add variables of existing colors

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoAdd variables.scss and import it for each scss file
Julius Haertl [Fri, 17 Feb 2017 10:45:08 +0000 (11:45 +0100)]
Add variables.scss and import it for each scss file

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoMerge pull request #3939 from nextcloud/downstream-27159
Joas Schilling [Mon, 20 Mar 2017 11:46:48 +0000 (12:46 +0100)]
Merge pull request #3939 from nextcloud/downstream-27159

Fix malformed logging in exception

7 years agoMerge pull request #3929 from nextcloud/downstream-27068
Joas Schilling [Mon, 20 Mar 2017 11:44:54 +0000 (12:44 +0100)]
Merge pull request #3929 from nextcloud/downstream-27068

cache loadUser if not exists

7 years agoMerge pull request #3884 from nextcloud/downstream-26956
Joas Schilling [Mon, 20 Mar 2017 11:27:38 +0000 (12:27 +0100)]
Merge pull request #3884 from nextcloud/downstream-26956

Skip null groups in group manager

7 years agoMerge pull request #3868 from nextcloud/issue-3834-escape-theming-footer
Joas Schilling [Mon, 20 Mar 2017 10:56:29 +0000 (11:56 +0100)]
Merge pull request #3868 from nextcloud/issue-3834-escape-theming-footer

Correctly escape the footer description from theming

7 years agoMerge pull request #3924 from nextcloud/preview_fixes
Lukas Reschke [Mon, 20 Mar 2017 10:45:51 +0000 (11:45 +0100)]
Merge pull request #3924 from nextcloud/preview_fixes

Do not generate the max preview twice

7 years agoMerge pull request #3950 from nextcloud/downstream-27149
Lukas Reschke [Mon, 20 Mar 2017 10:44:57 +0000 (11:44 +0100)]
Merge pull request #3950 from nextcloud/downstream-27149

Forbid to upload part files via web UI

7 years agoDon't use private api 3868/head
Joas Schilling [Mon, 20 Mar 2017 10:32:29 +0000 (11:32 +0100)]
Don't use private api

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoFix grammar 3950/head
Lukas Reschke [Mon, 20 Mar 2017 10:08:39 +0000 (11:08 +0100)]
Fix grammar

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMove error message to log entry 3939/head
Lukas Reschke [Mon, 20 Mar 2017 10:06:08 +0000 (11:06 +0100)]
Move error message to log entry

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #3946 from nextcloud/downstream-27263
Roeland Jago Douma [Mon, 20 Mar 2017 09:23:30 +0000 (10:23 +0100)]
Merge pull request #3946 from nextcloud/downstream-27263

Fix public link download button (unit test only)

7 years agoMerge pull request #3952 from nextcloud/downstream-27209
Morris Jobke [Mon, 20 Mar 2017 09:22:58 +0000 (03:22 -0600)]
Merge pull request #3952 from nextcloud/downstream-27209

Log files:scan exception, add InterruptedException

7 years agoMerge pull request #3949 from nextcloud/downstream-27307
Morris Jobke [Mon, 20 Mar 2017 09:21:02 +0000 (03:21 -0600)]
Merge pull request #3949 from nextcloud/downstream-27307

Check if app exists before enabling

7 years agoUpdate autoloader 3952/head
Lukas Reschke [Mon, 20 Mar 2017 09:20:13 +0000 (10:20 +0100)]
Update autoloader

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #3954 from nextcloud/downstream-27392
Morris Jobke [Mon, 20 Mar 2017 09:18:20 +0000 (03:18 -0600)]
Merge pull request #3954 from nextcloud/downstream-27392

Added logic and tests to remove everything inside a folder

7 years agoMerge pull request #3940 from nextcloud/downstream-27048
Lukas Reschke [Mon, 20 Mar 2017 09:15:34 +0000 (10:15 +0100)]
Merge pull request #3940 from nextcloud/downstream-27048

Add postLogout hook to finish sessions from external session managers…

7 years agoAdd exception to PHPDoc 3949/head
Lukas Reschke [Mon, 20 Mar 2017 09:13:57 +0000 (10:13 +0100)]
Add exception to PHPDoc

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoImprove the test case
Morris Jobke [Mon, 20 Mar 2017 08:47:32 +0000 (02:47 -0600)]
Improve the test case

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #3943 from nextcloud/downstream-27318
Morris Jobke [Mon, 20 Mar 2017 08:42:31 +0000 (02:42 -0600)]
Merge pull request #3943 from nextcloud/downstream-27318

Output maintenance mode message on STDERR

7 years agoFix public link download button 3946/head
Vincent Petry [Mon, 27 Feb 2017 09:32:20 +0000 (10:32 +0100)]
Fix public link download button

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoLog files:scan exception, add InterruptedException
Vincent Petry [Fri, 10 Feb 2017 14:24:25 +0000 (15:24 +0100)]
Log files:scan exception, add InterruptedException

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoAdded logic and tests to remove everything inside a folder 3954/head
Sergio Bertolin [Wed, 15 Mar 2017 14:31:48 +0000 (14:31 +0000)]
Added logic and tests to remove everything inside a folder

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoAdd tests for database user backend caching 3929/head
Vincent Petry [Wed, 15 Feb 2017 17:14:29 +0000 (18:14 +0100)]
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>
7 years agocache loadUser if not exists
Jörn Friedrich Dreyer [Wed, 1 Feb 2017 09:49:07 +0000 (10:49 +0100)]
cache loadUser if not exists

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #3947 from nextcloud/downstream-27323
Morris Jobke [Mon, 20 Mar 2017 07:53:28 +0000 (01:53 -0600)]
Merge pull request #3947 from nextcloud/downstream-27323

Disable empty password for user::resetpassword command using CLI

7 years agoMerge pull request #3941 from nextcloud/downstream-27254
Morris Jobke [Mon, 20 Mar 2017 07:53:05 +0000 (01:53 -0600)]
Merge pull request #3941 from nextcloud/downstream-27254

HTTP 1.1 used when giving 403 and 404 errors while attempting to down…

7 years agoMerge pull request #3917 from michaelletzgus/html5-fix_dup-IDs
Morris Jobke [Mon, 20 Mar 2017 07:51:20 +0000 (01:51 -0600)]
Merge pull request #3917 from michaelletzgus/html5-fix_dup-IDs

Fix duplicate id "apps-management"

7 years agoMerge pull request #3931 from nextcloud/downstream-27295
Roeland Jago Douma [Mon, 20 Mar 2017 07:48:10 +0000 (08:48 +0100)]
Merge pull request #3931 from nextcloud/downstream-27295

Don't store empty groupids

7 years agoMerge pull request #3930 from nextcloud/downstream-27227
Morris Jobke [Mon, 20 Mar 2017 07:35:17 +0000 (01:35 -0600)]
Merge pull request #3930 from nextcloud/downstream-27227

Added functions to add files in local_storage

7 years agoMerge pull request #3934 from nextcloud/downstream-27246
Morris Jobke [Mon, 20 Mar 2017 07:34:49 +0000 (01:34 -0600)]
Merge pull request #3934 from nextcloud/downstream-27246

Update the occ:encrypt-all prompt

7 years agoMerge pull request #3935 from nextcloud/downstream-27293
Morris Jobke [Mon, 20 Mar 2017 07:31:20 +0000 (01:31 -0600)]
Merge pull request #3935 from nextcloud/downstream-27293

log where a resource was not found

7 years agoMerge pull request #3936 from nextcloud/downstream-27253
Christoph Wurst [Mon, 20 Mar 2017 07:31:01 +0000 (08:31 +0100)]
Merge pull request #3936 from nextcloud/downstream-27253

Add extensionpoint to sharedialogview

7 years agoAdd ignore_files to config,
Felix Heidecke [Mon, 13 Feb 2017 15:51:23 +0000 (16:51 +0100)]
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>
7 years agoMerge pull request #3942 from nextcloud/downstream-27264
Morris Jobke [Mon, 20 Mar 2017 07:12:11 +0000 (01:12 -0600)]
Merge pull request #3942 from nextcloud/downstream-27264

Clear onpopstate handlers after unit tests

7 years agoMerge pull request #3933 from nextcloud/downstream-27258
Morris Jobke [Mon, 20 Mar 2017 07:10:16 +0000 (01:10 -0600)]
Merge pull request #3933 from nextcloud/downstream-27258

Add percentage to user's quota info

7 years agoMerge pull request #3932 from nextcloud/downstream-27273
Morris Jobke [Mon, 20 Mar 2017 07:09:39 +0000 (01:09 -0600)]
Merge pull request #3932 from nextcloud/downstream-27273

trigger event on input autofill

7 years agoMerge pull request #3938 from nextcloud/downstream-27201
Morris Jobke [Mon, 20 Mar 2017 07:09:14 +0000 (01:09 -0600)]
Merge pull request #3938 from nextcloud/downstream-27201

Defining App "cron" for "Invalidating tokens older than" message

7 years agoMerge pull request #3919 from michaelletzgus/layout-fix_avatar
Christoph Wurst [Mon, 20 Mar 2017 07:07:12 +0000 (08:07 +0100)]
Merge pull request #3919 from michaelletzgus/layout-fix_avatar

Fix avatar and caret position

7 years agochecking if app exists in the FileStream now
noveens [Wed, 8 Mar 2017 10:13:47 +0000 (15:43 +0530)]
checking if app exists in the FileStream now

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoDisable empty password for user::resetpassword command using CLI 3947/head
Sujith H [Tue, 7 Mar 2017 10:09:40 +0000 (15:39 +0530)]
Disable empty password for user::resetpassword command using CLI

Fixes issue: https://github.com/owncloud/core/issues/25206

Signed-off-by: Sujith H <sharidasan@owncloud.com>
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoownC -> Nextc 3943/head
Morris Jobke [Mon, 20 Mar 2017 05:20:24 +0000 (23:20 -0600)]
ownC -> Nextc

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agomaintenance warning printed on STDERR rather than STDOUT
noveens [Mon, 6 Mar 2017 13:13:03 +0000 (18:43 +0530)]
maintenance warning printed on STDERR rather than STDOUT

redundant check removed

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoClear onpopstate handlers after unit tests 3942/head
Vincent Petry [Mon, 27 Feb 2017 09:06:53 +0000 (10:06 +0100)]
Clear onpopstate handlers after unit tests

Fixes issue when running Karma tests in Firefox.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoHTTP 1.1 used when giving 403 and 404 errors while attempting to download non-existen... 3941/head
noveens [Fri, 24 Feb 2017 22:16:12 +0000 (03:46 +0530)]
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>
7 years agoAdd postLogout hook to finish sessions from external session managers (#27048) 3940/head
Felix Rupp [Mon, 6 Feb 2017 16:05:11 +0000 (17:05 +0100)]
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>
7 years agoFix malformed logging in exception
kdslkdsaldsal [Wed, 15 Feb 2017 08:50:36 +0000 (09:50 +0100)]
Fix malformed logging in exception

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoDefining App "cron" for "Invalidating tokens older than" message #27167 (#27201) 3938/head
Martin [Wed, 22 Feb 2017 16:24:27 +0000 (17:24 +0100)]
Defining App "cron" for "Invalidating tokens older than" message #27167 (#27201)

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoAdd extensionpoint to sharedialogview 3936/head
Felix Heidecke [Fri, 24 Feb 2017 14:45:47 +0000 (15:45 +0100)]
Add extensionpoint to sharedialogview

Write method overriding extension

Add a list of unknowns while inputting a search term

Rename OCA.Share extension point

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agolog where a resource was not found 3935/head
Jörn Friedrich Dreyer [Thu, 2 Mar 2017 09:50:54 +0000 (10:50 +0100)]
log where a resource was not found

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoAdded functions to add files in local_storage 3930/head
Sergio Bertolin [Wed, 1 Mar 2017 10:10:30 +0000 (10:10 +0000)]
Added functions to add files in local_storage

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoAdd percentage to user's quota info 3933/head
David Toledo [Mon, 27 Feb 2017 12:41:05 +0000 (13:41 +0100)]
Add percentage to user's quota info

* Add percentage to user's quota info

Fixes https://github.com/owncloud/core/issues/24011

* Do not show percentage if the quota is Unlimited

* translate quota

* correct condition and remove print_unescaped

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoownC -> Nextc 3934/head
Morris Jobke [Mon, 20 Mar 2017 03:58:12 +0000 (21:58 -0600)]
ownC -> Nextc

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoUpdate the occ:encrypt-all prompt
Matthew Setter [Fri, 24 Feb 2017 11:36:27 +0000 (12:36 +0100)]
Update the occ:encrypt-all prompt

The message isn't as clear, nor as succinct, as it could be.
Given that, this commit seeks to address both those points.
This commit was prompted by https://github.com/owncloud/documentation/pull/2835.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agotest setTagGroups with empty groupids 3931/head
Jörn Friedrich Dreyer [Thu, 2 Mar 2017 13:17:20 +0000 (14:17 +0100)]
test setTagGroups with empty groupids

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agodon't store empty groupids
Jörn Friedrich Dreyer [Thu, 2 Mar 2017 10:36:20 +0000 (11:36 +0100)]
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>
7 years agotrigger event on input autofill 3932/head
Felix Heidecke [Mon, 27 Feb 2017 21:49:42 +0000 (22:49 +0100)]
trigger event on input autofill

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

7 years agoMerge pull request #3907 from nextcloud/port-more-db-stuff
Morris Jobke [Sun, 19 Mar 2017 22:29:50 +0000 (16:29 -0600)]
Merge pull request #3907 from nextcloud/port-more-db-stuff

Use SystemConfig instead of AllConfig for DB stuff

7 years agoUse SystemConfig instead of AllConfig for DB stuff 3907/head
Morris Jobke [Fri, 17 Mar 2017 22:37:48 +0000 (16:37 -0600)]
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>
7 years agoMerge pull request #3927 from nextcloud/minor-fixes
Morris Jobke [Sun, 19 Mar 2017 21:49:38 +0000 (15:49 -0600)]
Merge pull request #3927 from nextcloud/minor-fixes

Namespace and array syntax fixes

7 years agoNamespace and array syntax fixes 3927/head
Morris Jobke [Sun, 19 Mar 2017 20:52:54 +0000 (14:52 -0600)]
Namespace and array syntax fixes

* minor fixes in preparation of a bigger DB and config PR

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoFix tests 3924/head
Roeland Jago Douma [Sun, 19 Mar 2017 20:15:54 +0000 (21:15 +0100)]
Fix tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoMerge pull request #3906 from nextcloud/shares-circles-2
Roeland Jago Douma [Sun, 19 Mar 2017 19:45:55 +0000 (20:45 +0100)]
Merge pull request #3906 from nextcloud/shares-circles-2

Support Circles

7 years agoSome code cleanup
Roeland Jago Douma [Sun, 19 Mar 2017 19:30:46 +0000 (20:30 +0100)]
Some code cleanup

As suggested by the inspector

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoDon't generate max preview twice
Roeland Jago Douma [Sun, 19 Mar 2017 19:23:23 +0000 (20:23 +0100)]
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>
7 years agoFix duplicate id "apps-management" 3917/head
Michael Letzgus [Sun, 19 Mar 2017 15:17:26 +0000 (16:17 +0100)]
Fix duplicate id "apps-management"

Change CSS from #apps-management to .apps-management

Signed-off-by: Michael Letzgus <michaelletzgus@users.noreply.github.com>
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 agoMerge pull request #3913 from cwickert/master
Roeland Jago Douma [Sun, 19 Mar 2017 13:08:34 +0000 (14:08 +0100)]
Merge pull request #3913 from cwickert/master

DummyGetResponsePlugin: ownCloud -> Nexcloud

7 years agoFix duplicate id "apps-management"
Michael Letzgus [Sun, 19 Mar 2017 11:23:20 +0000 (12:23 +0100)]
Fix duplicate id "apps-management"

Make duplicate id "apps-management" a class since IDs must be unique:

https://www.w3.org/TR/2011/WD-html5-20110525/elements.html#the-id-attribute
https://api.jquery.com/id-selector/

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 agoDummyGetResponsePlugin: ownCloud -> Nexcloud 3913/head
Christoph Wickert [Sat, 18 Mar 2017 11:59:25 +0000 (12:59 +0100)]
DummyGetResponsePlugin: ownCloud -> Nexcloud

Signed-off-by: Christoph Wickert <cwickert@suse.de>
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 agoshares-circles 3906/head
Maxence Lange [Fri, 17 Mar 2017 19:48:33 +0000 (18:48 -0100)]
shares-circles

Signed-off-by: Maxence Lange <maxence@nextcloud.com>
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 agoFix 5.6 duplicate class import 3884/head
Joas Schilling [Fri, 17 Mar 2017 12:54:58 +0000 (13:54 +0100)]
Fix 5.6 duplicate class import

Signed-off-by: Joas Schilling <coding@schilljs.com>
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 agoClean up the test
Joas Schilling [Fri, 17 Mar 2017 09:34:25 +0000 (10:34 +0100)]
Clean up the test

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoUse DI
Joas Schilling [Fri, 17 Mar 2017 09:23:04 +0000 (10:23 +0100)]
Use DI

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 agoCorrectly escape the footer description from theming
Joas Schilling [Thu, 16 Mar 2017 14:01:50 +0000 (15:01 +0100)]
Correctly escape the footer description from theming

Signed-off-by: Joas Schilling <coding@schilljs.com>