]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
7 years agoHandlebars is already loaded by core.js 3795/head
Roeland Jago Douma [Wed, 22 Mar 2017 08:01:47 +0000 (09:01 +0100)]
Handlebars is already loaded by core.js

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoWhen debug don't load the bundled file
Roeland Jago Douma [Wed, 22 Mar 2017 07:58:28 +0000 (08:58 +0100)]
When debug don't load the bundled file

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoNo need to exit
Roeland Jago Douma [Wed, 22 Mar 2017 07:52:49 +0000 (08:52 +0100)]
No need to exit

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoBump core.js
Roeland Jago Douma [Wed, 22 Mar 2017 07:49:39 +0000 (08:49 +0100)]
Bump core.js

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoAdd CI step to verify merged vendor js
Roeland Jago Douma [Fri, 10 Mar 2017 09:45:27 +0000 (10:45 +0100)]
Add CI step to verify merged vendor js

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoBundle more default vendor js
Roeland Jago Douma [Fri, 10 Mar 2017 08:48:53 +0000 (09:48 +0100)]
Bundle more default vendor js

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoMerge vendor js
Roeland Jago Douma [Fri, 10 Mar 2017 08:34:29 +0000 (09:34 +0100)]
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>
7 years agoMerge pull request #3937 from nextcloud/downstream-27234
Morris Jobke [Tue, 21 Mar 2017 19:18:19 +0000 (13:18 -0600)]
Merge pull request #3937 from nextcloud/downstream-27234

fix typo in sftp public key

7 years agoMerge pull request #3975 from nextcloud/remove-dead-code
Morris Jobke [Tue, 21 Mar 2017 19:17:11 +0000 (13:17 -0600)]
Merge pull request #3975 from nextcloud/remove-dead-code

Remove test code

7 years agoRemove test code 3975/head
Lukas Reschke [Tue, 21 Mar 2017 15:59:10 +0000 (16:59 +0100)]
Remove test code

This seems to have been commited by mistake with https://github.com/nextcloud/server/commit/6dbe417c51125419516dd29ebe4e529926c41a0f

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #3844 from nextcloud/unshare_event
Joas Schilling [Tue, 21 Mar 2017 15:57:09 +0000 (16:57 +0100)]
Merge pull request #3844 from nextcloud/unshare_event

Unshare event

7 years agoMerge pull request #3968 from nextcloud/fix-branding
Lukas Reschke [Tue, 21 Mar 2017 12:54:58 +0000 (13:54 +0100)]
Merge pull request #3968 from nextcloud/fix-branding

[master] Fix branding and show Nextcloud

7 years ago[master] Fix branding 3968/head
Lukas Reschke [Tue, 21 Mar 2017 11:20:22 +0000 (12:20 +0100)]
[master] Fix branding

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #3955 from nextcloud/downstream-27113
Roeland Jago Douma [Tue, 21 Mar 2017 10:27:00 +0000 (11:27 +0100)]
Merge pull request #3955 from nextcloud/downstream-27113

Can we get some faster phpunit execution?

7 years agoMerge pull request #3901 from nextcloud/di_ng
Lukas Reschke [Tue, 21 Mar 2017 10:06:16 +0000 (11:06 +0100)]
Merge pull request #3901 from nextcloud/di_ng

Move Interface Definitions to the ServerContainer

7 years agoCore is also a special app 3901/head
Roeland Jago Douma [Tue, 21 Mar 2017 09:42:33 +0000 (10:42 +0100)]
Core is also a special app

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoMove a lot of stuff over to the ServerContainer
Roeland Jago Douma [Tue, 21 Mar 2017 09:00:02 +0000 (10:00 +0100)]
Move a lot of stuff over to the ServerContainer

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoFix NODB tests etc
Roeland Jago Douma [Mon, 20 Mar 2017 13:53:57 +0000 (14:53 +0100)]
Fix NODB tests etc

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoFix settings tests
Roeland Jago Douma [Mon, 20 Mar 2017 09:16:56 +0000 (10:16 +0100)]
Fix settings tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoAdd DI intergration tests
Roeland Jago Douma [Sun, 19 Mar 2017 22:14:47 +0000 (23:14 +0100)]
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>
7 years agoExtend DI tests
Roeland Jago Douma [Sun, 19 Mar 2017 21:20:56 +0000 (22:20 +0100)]
Extend DI tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoMore elegant handling of recursion
Roeland Jago Douma [Sun, 19 Mar 2017 21:09:47 +0000 (22:09 +0100)]
More elegant handling of recursion

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoPoC of moving the interface classes to the servercontainer
Roeland Jago Douma [Fri, 17 Mar 2017 13:30:46 +0000 (14:30 +0100)]
PoC of moving the interface classes to the servercontainer

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoUpdate query method for DIContainer
Roeland Jago Douma [Fri, 17 Mar 2017 13:25:35 +0000 (14:25 +0100)]
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>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 21 Mar 2017 01:08:16 +0000 (01:08 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #3963 from nextcloud/logs-access-to-previews
Roeland Jago Douma [Mon, 20 Mar 2017 20:41:25 +0000 (21:41 +0100)]
Merge pull request #3963 from nextcloud/logs-access-to-previews

Log access to preview images

7 years agoMerge pull request #3530 from nextcloud/scss-variables
Lukas Reschke [Mon, 20 Mar 2017 18:49:53 +0000 (19:49 +0100)]
Merge pull request #3530 from nextcloud/scss-variables

Implement scss variables

7 years ago[CI] Can we get some faster phpunit execution? (#27113) 3955/head
Thomas Müller [Fri, 10 Feb 2017 15:20:25 +0000 (16:20 +0100)]
[CI] Can we get some faster phpunit execution? (#27113)

* Don't backup globals and static attributes

* Unset global variable to remove impact on followup tests

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoLog access to preview images 3963/head
Lukas Reschke [Mon, 20 Mar 2017 17:36:36 +0000 (18:36 +0100)]
Log access to preview images

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #3957 from nextcloud/downstream-27307
Christoph Wurst [Mon, 20 Mar 2017 17:10:05 +0000 (18:10 +0100)]
Merge pull request #3957 from nextcloud/downstream-27307

Follow up to #3949 (app exists on enable)

7 years agoMerge pull request #3961 from nextcloud/revert-2137-make-sure-tests-run-on-phpunit...
Robin Appelman [Mon, 20 Mar 2017 14:32:34 +0000 (15:32 +0100)]
Merge pull request #3961 from nextcloud/revert-2137-make-sure-tests-run-on-phpunit-4-again

Revert "Add a magic wrapper to allow phpunit4 to run the code again "

7 years agoRevert "Add a magic wrapper to allow phpunit4 to run the code again " 3961/head
Roeland Jago Douma [Mon, 20 Mar 2017 12:38:52 +0000 (13:38 +0100)]
Revert "Add a magic wrapper to allow phpunit4 to run the code again "

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoFix tests 3530/head
Julius Härtl [Mon, 20 Mar 2017 13:20:34 +0000 (14:20 +0100)]
Fix tests

Signed-off-by: Julius Härtl <jus@bitgrid.net>
7 years agoFix sass compile tests
Julius Härtl [Mon, 20 Mar 2017 12:59:21 +0000 (13:59 +0100)]
Fix sass compile tests

Signed-off-by: Julius Härtl <jus@bitgrid.net>
7 years agoAdd tests for SCSSCacher
Julius Härtl [Mon, 20 Mar 2017 11:31:29 +0000 (12:31 +0100)]
Add tests for SCSSCacher

Signed-off-by: Julius Härtl <jus@bitgrid.net>
7 years agoMerge pull request #3945 from nextcloud/downstream-27298
Lukas Reschke [Mon, 20 Mar 2017 12:16:10 +0000 (13:16 +0100)]
Merge pull request #3945 from nextcloud/downstream-27298

Adding file, line, class and function to the query logger (#27298)

7 years agoMerge pull request #3951 from nextcloud/menu-firefox-fixes
Lukas Reschke [Mon, 20 Mar 2017 12:15:43 +0000 (13:15 +0100)]
Merge pull request #3951 from nextcloud/menu-firefox-fixes

Fix new app menu on firefox

7 years agoMerge pull request #3915 from michaelletzgus/html5-fix_autocapitalize
Roeland Jago Douma [Mon, 20 Mar 2017 12:13:33 +0000 (13:13 +0100)]
Merge pull request #3915 from michaelletzgus/html5-fix_autocapitalize

Fix value of attribute "autocapitalize"

7 years agoAdd variables.scss to sass compile test
Julius Haertl [Sun, 5 Mar 2017 23:08:21 +0000 (00:08 +0100)]
Add variables.scss to sass compile test

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoAdd tests for SCSSCacher
Julius Haertl [Sun, 5 Mar 2017 22:28:59 +0000 (23:28 +0100)]
Add tests for SCSSCacher

Signed-off-by: Julius Härtl <jus@bitgrid.net>
7 years agoReplace old color occurences with calculations
Julius Haertl [Sun, 5 Mar 2017 21:38:59 +0000 (22:38 +0100)]
Replace old color occurences with calculations

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoMake remaining colors depending on $color-main-text and $color-main-background
Julius Haertl [Sun, 5 Mar 2017 21:09:36 +0000 (22:09 +0100)]
Make remaining colors depending on $color-main-text and $color-main-background

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoRemove legacy CSS
Julius Haertl [Sun, 5 Mar 2017 14:37:17 +0000 (15:37 +0100)]
Remove legacy CSS

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoMerge color tones aaaaaa, bebebe, cccccc in bbbbbb
Julius Haertl [Sun, 5 Mar 2017 14:36:50 +0000 (15:36 +0100)]
Merge color tones aaaaaa, bebebe, cccccc in bbbbbb

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoRemove grey tints
Julius Haertl [Wed, 1 Mar 2017 20:42:32 +0000 (21:42 +0100)]
Remove grey tints

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoRemove separate error colors
Julius Haertl [Tue, 21 Feb 2017 16:33:07 +0000 (17:33 +0100)]
Remove separate error colors

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoExtra variable for loading icons
Julius Haertl [Tue, 21 Feb 2017 16:28:48 +0000 (17:28 +0100)]
Extra variable for loading icons

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoMerge #666 and #777 to #555
Julius Haertl [Tue, 21 Feb 2017 16:22:16 +0000 (17:22 +0100)]
Merge #666 and #777 to #555

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoUse one box-shadow color
Julius Haertl [Tue, 21 Feb 2017 16:19:23 +0000 (17:19 +0100)]
Use one box-shadow color

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoReplace #222 with #333
Julius Haertl [Tue, 21 Feb 2017 15:56:31 +0000 (16:56 +0100)]
Replace #222 with #333

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoRemove unused old #999
Julius Haertl [Tue, 21 Feb 2017 15:55:31 +0000 (16:55 +0100)]
Remove unused old #999

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoMerge colors
Julius Haertl [Tue, 21 Feb 2017 15:50:45 +0000 (16:50 +0100)]
Merge colors

- #fafafa/#f8f8f8/#f5f5f5 to #f8f8f8
- #f0f0f0/#eeeeee/#e8e8e8 to #eeeeee

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoRemove rgb color values
Julius Haertl [Tue, 21 Feb 2017 15:42:56 +0000 (16:42 +0100)]
Remove rgb color values

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoSimplify colors
Julius Haertl [Mon, 20 Feb 2017 15:15:53 +0000 (16:15 +0100)]
Simplify colors

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

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

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

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

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

Signed-off-by: Julius Haertl <jus@bitgrid.net>
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 agocreateMock 3957/head
Joas Schilling [Mon, 20 Mar 2017 10:14:14 +0000 (11:14 +0100)]
createMock

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 agoFix the test
Joas Schilling [Mon, 20 Mar 2017 09:21:08 +0000 (10:21 +0100)]
Fix the test

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoSome more code fixes
Joas Schilling [Mon, 20 Mar 2017 09:11:49 +0000 (10:11 +0100)]
Some more code fixes

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoAdd integration tests
Joas Schilling [Mon, 20 Mar 2017 09:44:40 +0000 (10:44 +0100)]
Add integration tests

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoFix provisioning API call
Joas Schilling [Mon, 20 Mar 2017 09:30:46 +0000 (10:30 +0100)]
Fix provisioning API call

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoDon't use a generic exception
Joas Schilling [Mon, 20 Mar 2017 09:02:05 +0000 (10:02 +0100)]
Don't use a generic exception

Signed-off-by: Joas Schilling <coding@schilljs.com>
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