a9b8fb090c
Fix remnants of refactoring
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-07-05 17:09:38 +02:00
3d5acbb1d0
prevent lock values from going negative with memcache backend
...
This can be caused by the code releasing more locks then it acquires,
once the lock value becomes negative it's likely that it will never be able
to change into an exclusive lock again.
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-07-05 14:39:10 +02:00
772bbd99be
Backend work to provide NC whats New info to users
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-07-05 14:33:08 +02:00
ced8789f5c
Fix PHPDoc
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-07-05 12:43:57 +02:00
6a0552224d
getDeletedSharedWith method
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-07-05 12:43:57 +02:00
d805959e81
Add API to undelete delete group shares
...
When a group share is deleted we keep track of this in the DB.
Right now it is only possible for a recipient to get back the share by
asking the sharer to delete it and to share it again. This doesn't
scale.
This endpoint makes it possible to get back the share.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-05 12:43:56 +02:00
be7db1573d
Swift to \Swift_Mailer as abstraction
...
* \Swift_Mailer handles starting the transport etc properly
* Fixed tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-04 08:28:33 +02:00
e6e6b5648a
Make swift 6 compatible
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-04 08:28:33 +02:00
0dd4a3e0cf
Kill php mail from settings
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-04 08:28:33 +02:00
7025f16017
Merge pull request #9345 from nextcloud/federation20
...
Federation 2.0
2018-07-03 23:13:47 +02:00
10b8a4a8b1
Revert "Fix undeclared method warning in phan"
...
This reverts commit f3093b2401
2018-07-03 17:46:11 +02:00
aa64584d67
Merge pull request #10080 from nextcloud/bugfix/noid/fix-phan-warning
...
Fix undeclared method warning in phan
2018-07-02 17:40:39 +02:00
48b7499fa4
Merge pull request #10079 from nextcloud/search-double-slash
...
fix double slash in search result path when the result is in a submount
2018-07-02 15:49:27 +02:00
f3093b2401
Fix undeclared method warning in phan
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-07-02 15:38:49 +02:00
922c851494
fix double slash in search result path when the result is in a submount
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-07-02 14:17:38 +02:00
7ff74ae8ed
cache results from ocm end-point discovery
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 12:43:43 +02:00
411bae5163
fix return type from send share
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 12:43:43 +02:00
cdf8abb060
look for correct OCM permissions
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:31 +02:00
8d4da30bf5
add support for different share types
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:31 +02:00
e251b34a8c
cleanup variable naming, it is actually a resource type
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:31 +02:00
84fc188dfc
some minor fixes and clode cleanup
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:29 +02:00
957b27f282
replace \OCP\Federation\Exception\ShareNotFoundException with the generic \OCP\Share\Exception\ShareNotFound exception
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:29 +02:00
fab4e561f4
send reshare over OCM API
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:28 +02:00
c572e84ad9
detect correctly if a share was send successful
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:28 +02:00
8889e14c7c
implement accept share notification
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:28 +02:00
bbce8c3ea1
adjust to latest api version
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:28 +02:00
af178ef19a
check API Version
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:27 +02:00
db428ea547
send accept share notification (WIP)
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:27 +02:00
a3948e8a12
use new API to send a federated share if possible
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:27 +02:00
6208f250e8
check if cloud federation api is ready
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:27 +02:00
21e64ec7f4
implement receiving of federated shares
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:27 +02:00
5cfe20675d
start implementing federated sharing 2.0
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:27 +02:00
03a5856541
Disables the maintenance warning for the maintenance command itself.
...
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2018-07-01 20:54:19 +02:00
2f8ebe2b35
Merge pull request #10048 from nextcloud/feature/9760/systemd-logger
...
Systemd Logger
2018-06-30 00:57:30 +02:00
e4c3c481a2
Merge pull request #10038 from nextcloud/files-scan-home-only
...
Add option to only scan the home storage
2018-06-29 15:23:15 +02:00
69e92ea71a
Merge pull request #10053 from nextcloud/feature/7378/password-security-move
...
Move password change to security settings
2018-06-29 14:53:09 +02:00
78e1d9fbd5
Bump autoloader and fix tests
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-06-29 14:12:06 +02:00
ff2c819ed3
Move social buttons to the personal settings
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-06-29 14:12:05 +02:00
97c13debdc
Remove unneeded param from personal settings
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-06-29 13:35:07 +02:00
3f77b0fc8b
Move user password form to security settings
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-06-29 13:35:07 +02:00
478b95cc20
Try to not run into the white page of death and still log something in the web server error log
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-06-29 11:22:05 +02:00
326f07e756
Merge pull request #8854 from nextcloud/drop-old-sharing-code
...
Get rid of shareItem
2018-06-29 10:40:32 +02:00
72340b2230
Added Systemd.log documentation to config.sample.php
...
Changed name of default system (not systemd) logger from ownCloud to Nextcloud, to be consistent
Fixed license per https://github.com/nextcloud/server/pull/9760#discussion_r195026784
Pulled upstream updates
Signed-off-by: Johannes Ernst <jernst@indiecomputing.com>
2018-06-29 10:37:46 +02:00
0a65e62f29
Added a logger for systemd/journald
...
Added a unit test
Signed-off-by: Johannes Ernst <jernst@indiecomputing.com>
2018-06-29 10:37:45 +02:00
17a9024fac
Improved wording
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-06-29 10:33:12 +02:00
25d9c3e529
adjust backend and gui to update and changelog server
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-06-29 09:11:04 +02:00
1e0761c6b8
adjust tests
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-06-29 09:08:33 +02:00
bafb6b3c29
display whats new info in admin settings
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-06-29 09:08:33 +02:00
61842f66ee
Merge pull request #5623 from nextcloud/locale-setting
...
Add user locale/region setting
2018-06-29 08:03:43 +02:00
c1682f4228
Update PHPDoc
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-06-29 08:02:50 +02:00
89b6ee1a45
Merge pull request #9773 from nextcloud/feature/noid/resource_booking
...
resource booking
2018-06-29 06:51:49 +02:00
ab1b848268
[tx-robot] updated from transifex
2018-06-29 00:12:08 +00:00
4c1e581f47
docblock version fixes
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-06-28 17:37:16 +02:00
b9e685236f
Add option to only scan the home storage
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-06-28 16:09:25 +02:00
388ea2234f
Merge pull request #10036 from nextcloud/feature/9221/show-path-in-log
...
Log path of file that failed to be parsed
2018-06-28 11:36:24 +02:00
d4692d1fbe
Log path of file that failed to be parsed
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-06-28 11:09:50 +02:00
1bf486d93f
[tx-robot] updated from transifex
2018-06-28 00:12:20 +00:00
8c73b13ac8
move locales file to /resources/
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-06-27 21:52:19 +02:00
b17d256761
fix use of findLocale
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-06-27 21:52:19 +02:00
9157086c23
properly handle force_locale setting
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-06-27 21:52:19 +02:00
b3921c65a6
cache available locales to minimize fs access
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-06-27 21:52:19 +02:00
51a35c23f6
fix camelCase for localesForLanguage
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-06-27 21:52:18 +02:00
f3949cf1a8
Add groupware settings section
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-06-27 19:16:21 +02:00
bf6bfad76b
OC.getLocale() now returns Locale and no longer Language
...
Added OC.getLanguage() to get Language
<html lang=''> still gets language, though according to IETF BCP47 locale should be good.
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-06-27 13:19:40 +02:00
7d8124ad66
add findLocale() to public interface
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-06-27 13:19:23 +02:00
abab7eb7f0
handle config.php values
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-06-27 13:19:23 +02:00
4a9f8623b5
Fix review & tests
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-06-27 13:19:21 +02:00
ea380b2918
Allow apps to specify locale for localisation
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-06-27 13:17:26 +02:00
d8921ccd85
Allow user to choose locale
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-06-27 13:15:19 +02:00
e4e3387417
Merge pull request #10009 from nextcloud/techdebt/noid/replace-headers-with-http_response_code-calls
...
Replace hard coded HTTP status codes with proper calls to http_response_code
2018-06-27 12:14:52 +02:00
46b62ff579
[tx-robot] updated from transifex
2018-06-27 10:06:12 +00:00
b0a296e2e1
Do not use HTTP code OC_Response constants anymore
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-06-26 16:14:15 +02:00
79d9841bce
Replace hardcoded status headers with calls to http_response_code()
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-06-26 16:14:15 +02:00
605ba57086
Fix groupExists when a backend provides group details
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-06-26 15:00:08 +02:00
43f7ea5852
Merge pull request #10002 from nextcloud/docs/noid/phpdoc-putContent-resource
...
Add resource type phpDoc for putContent methods
2018-06-26 13:59:21 +02:00
73cf71a20f
Add resource type phpDoc for putContent methods
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-06-26 13:58:58 +02:00
1399f6bece
Server exception error pages by default with a 500 status code
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-06-26 11:44:24 +02:00
8c155cd51c
Server error/hint pages with a 500 error code to avoid it being seen instead of the actual resource
...
* found while reviewing #7205
* allow to specify a special status code
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-06-26 11:44:24 +02:00
a34f70ce0a
Change status code when config is write protected
...
Add hint msg, you can make config file read only
If the config.php is not writable, print an error message: #6893
- set config writable
- or set option to keep it read only
Signed-off-by: Eric Masseran <rico.masseran@gmail.com>
2018-06-26 09:36:17 +02:00
4b49f810b7
Re-enable apps that got automatically disabled while updating
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-06-26 09:15:52 +02:00
9444a3fad1
Merge pull request #9632 from nextcloud/enhancement/stateful-2fa-providers
...
Stateful 2fa providers
2018-06-25 15:49:58 +02:00
587d7cc7d2
Merge pull request #9526 from Blaok/files-scan-shallow
...
allow shallow (non-recursive) scan when scanning file storage
2018-06-25 13:01:22 +02:00
7be465febe
Make new classes strict and fix license header
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2018-06-25 07:38:52 +02:00
cba783f5df
Calendar resource booking: unit tests / adding missing annotations
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-06-25 04:59:04 +02:00
da533d7470
update classloader/classmap for calendar resource booking changes
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-06-25 04:59:03 +02:00
8f061f5407
periodically query calendar resource / room backends for updated resource / room information
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-06-25 04:59:01 +02:00
9aca92c441
hook up calendar resource managers/backends with server container
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-06-25 04:58:08 +02:00
c83629674e
update resource booking interfaces and add managers
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-06-25 04:58:08 +02:00
29b777e7d1
add resource and room interfaces
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-06-25 04:58:07 +02:00
082646f7e5
Merge pull request #9955 from nextcloud/bug/noid/onedrive_propfind
...
Request a valid property for DAV opendir
2018-06-22 15:02:20 +02:00
ed29984501
Merge pull request #9868 from nextcloud/user-backend-table
...
make table name configurable for db user backend
2018-06-21 19:23:23 +02:00
54c4d95a11
Request a valid property for DAV opendir
...
Apperently Sabre and Onedrive are not friends when requesting a single
404 property. I need to dig deeper on why this is. Anyways requesting a
valid property makes it work like a charm.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-21 19:01:27 +02:00
8ebc3d90a0
Merge pull request #9518 from nextcloud/feature/5986/public_share_controller_middleware
...
Public share middleware & controller
2018-06-21 10:09:20 +02:00
f9c98d8621
[tx-robot] updated from transifex
2018-06-21 00:12:47 +00:00
71ce8f3107
Split css variables and fix url variables
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-20 19:17:06 +02:00
50df29ded0
Merge pull request #9900 from nextcloud/feature/noid/wait-for-cron-to-finish
...
Wait for cron to finish before running upgrade command
2018-06-20 14:14:07 +02:00
5455045a9b
Fix direct access to authen page
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-20 08:57:13 +02:00
6de656e435
Update token on regeneration for public login
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-20 08:53:38 +02:00
1bb8bc8ff9
Add AuthPublicShareControllerTest
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-20 08:53:38 +02:00
61e445da88
Add PublicShareControllerTests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-20 08:53:38 +02:00
e7338173e8
Add PublicShareMiddlewareTest
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-20 08:53:37 +02:00
20e514690c
Don't allow public share pages if link sharing is disabled
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-20 08:53:37 +02:00
31392c2443
Move public auth page over
...
Now this is in core so the basics (that 99% of the app will want to
use) looks always the same.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-20 08:53:37 +02:00
366981fba6
Move public preview endpoint over
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-20 08:53:37 +02:00
f36ef8ca80
Add the new PublicShareController and PublicShareMiddleware
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-20 08:53:35 +02:00
13d93f5b25
Make 2FA providers stateful
...
This adds persistence to the Nextcloud server 2FA logic so that the server
knows which 2FA providers are enabled for a specific user at any time, even
when the provider is not available.
The `IStatefulProvider` interface was added as tagging interface for providers
that are compatible with this new API.
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2018-06-20 08:30:26 +02:00
cad8824a8e
[tx-robot] updated from transifex
2018-06-20 00:12:26 +00:00
21441fad9b
Added new search standard
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-19 23:53:20 +02:00
e5f08620d4
Better design for core search, fixes and style to scss
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-19 23:53:19 +02:00
8a1cbbd90e
Don't pretend we can add/remove users to/from groups when we can't
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-06-19 16:23:02 +02:00
18e9631810
Wait for cron to finish before running upgrade command
...
* fixes #9562
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-06-19 14:22:45 +02:00
3392302d22
make table name configurable for db user backend
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-06-19 14:14:44 +02:00
8646f01320
Merge pull request #9881 from nextcloud/user-db-backend-querybuilder
...
use query builder in all places in the db user backend
2018-06-19 14:12:22 +02:00
7ef722e7a6
Merge pull request #9485 from nextcloud/feature/9441/multiple_token_providers
...
Add new public key token provider (tokens survive password change)
2018-06-19 10:11:09 +02:00
82959ca93e
Comments
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-19 07:46:43 +02:00
b8c728de6d
[tx-robot] updated from transifex
2018-06-19 00:12:55 +00:00
970dea9264
Add getProvider helper function
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-18 22:11:55 +02:00
df34571d1d
Use constant for token version
...
And don't set the version in the constructor. That would possible cause
to many updates.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-18 22:11:55 +02:00
9e7a95fe58
Add more tests
...
* Add a lot of tests
* Fixes related to those tests
* Fix tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-18 22:11:55 +02:00
1999f7ce7b
Generate the new publicKey tokens by default!
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-18 22:11:55 +02:00
f168ecfa7a
Actually convert the token
...
* When getting the token
* When rotating the token
* Also store the encrypted password as base64 to avoid weird binary
stuff
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-18 22:11:55 +02:00
d03d16a936
Add publickey provider to manager
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-18 22:11:55 +02:00
4bbc21cb21
SetPassword on PublicKeyTokens
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-18 22:11:55 +02:00
4c0d710479
Just pass uid to the Token stuff
...
We don't have user objects in the code everywhere
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-18 22:11:54 +02:00
1f17010e0b
Add first tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-18 22:11:54 +02:00
02e0af1287
Initial PKT implementation
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-18 22:11:54 +02:00
8eec3a9c9a
Add new authtoken v2 columns to the authtoken table
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-18 22:11:54 +02:00
3dd5f3d5f6
Abstract the Provider via a manager
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-18 22:11:53 +02:00
6b6c43bf79
Merge pull request #9884 from nextcloud/groups-search-use-proper-keys
...
Add search to users details groups
2018-06-18 16:43:06 +02:00
60adc92eb5
Merge pull request #9823 from nextcloud/bufgix/noid/update_token_on_session_id_regenerate
...
Update the token on session regeneration
2018-06-18 13:25:18 +02:00
5e5671983c
[tx-robot] updated from transifex
2018-06-17 00:12:48 +00:00
db9ad32d75
[tx-robot] updated from transifex
2018-06-16 00:13:15 +00:00
cc2d58a850
Keep userids as keys on group search
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-15 22:54:28 +02:00
8f6acbff62
Merge pull request #9258 from nextcloud/theming-logo-png
...
Convert theming app logo to PNG to show it properly in emails
2018-06-15 17:02:14 +02:00
d82ef72161
Merge pull request #9197 from nextcloud/fix-avatar-center
...
Fix avatar generator centering
2018-06-15 16:16:13 +02:00
4187d2cdb3
use query builder in all places in the db user backend
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-06-15 14:16:10 +02:00
a0496b2a78
Merge pull request #9875 from wiyh12nf89x/Issue#9864_WebDAV_timeout_fix_maxDelay
...
Fix #9864 : Decrease $maxDelay in Throttler.php
2018-06-15 07:34:28 +02:00
3ea9f18871
Merge pull request #9873 from nextcloud/fix-http-client-given-options-being-overriden-by-default-options
...
Fix HTTP client given options being overriden by default options
2018-06-15 07:27:31 +02:00
ad66c6bf08
Fix #9864 : Decrease $maxDelay in Throttler.php
...
Signed-off-by: Mark Berezovsky <xpnf@yandex.ru>
2018-06-15 04:58:08 +03:00
84a1c915e6
[tx-robot] updated from transifex
2018-06-15 00:12:49 +00:00
00c3a7eb4c
Fix HTTP client given options being overriden by default options
...
According to the array_merge documentation, "If the input arrays have
the same string keys, then the later value for that key will overwrite
the previous one." Thus, the default options must be the first parameter
passed to array_merge.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-06-14 21:36:04 +02:00
ceee91d9d4
Add info message if an exception occurs during the svg to png conversion
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-06-14 17:36:02 +02:00
3047ef31bd
Add count to function builder
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-06-14 14:32:22 +02:00
8c47a632e0
Allow updating the token on session regeneration
...
Sometimes when we force a session regeneration we want to update the
current token for this session.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-14 08:09:36 +02:00
479e31997f
[tx-robot] updated from transifex
2018-06-14 00:13:06 +00:00
90f9e0a88e
Merge pull request #9846 from nextcloud/feature/noid/add_stricter_csps
...
Add stricter CSPs
2018-06-13 23:19:10 +02:00
699049be1b
Merge pull request #9855 from nextcloud/feature/noid/cleanup-old-updater-backup-dirs
...
Background job to clean up old backups of the updater
2018-06-13 22:16:24 +02:00
fd4330c38f
Fix indent
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-13 22:07:40 +02:00
16ec9d9670
Removed old route, fix tests and fix var type
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-13 18:46:05 +02:00
156da29cea
Avatar imagick bump
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-13 18:46:05 +02:00
Morris Jobke
Robin Appelman
Arthur Schiwon
John Molakvoæ (skjnldsv)
Roeland Jago Douma
Bjoern Schiessle
Michael Weimann
Julius Härtl
Johannes Ernst
Nextcloud bot
Georg Ehrke
Roeland Jago Douma
Thomas Citharel
Eric Masseran
Joas Schilling
Christoph Wurst
Mark Berezovsky
Daniel Calviño Sánchez
John Molakvoæ