Morris Jobke
a1a29d14c8
Unlock failed cron jobs and set a high "last_checked" value to avoid continous re-check
...
* fixes issue where cronjobs of a not-loaded app are marked as "still running" because there is a "reserved_at" value stored
* fixed #9992
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-07-09 14:51:02 +02:00
Morris Jobke
103c8c373a
Merge pull request #10120 from nextcloud/allow-to-disable-encryption
...
allow to disable encryption
2018-07-09 13:39:57 +02:00
Joas Schilling
5541d3dd84
Add visio mimetypes
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-07-06 15:16:21 +02:00
Morris Jobke
422c805e26
Merge pull request #10116 from nextcloud/lock-negative
...
prevent lock values from going negative with memcache backend
2018-07-06 14:50:18 +02:00
Joas Schilling
3ade347b0d
Merge pull request #9791 from nextcloud/3rdparty/noid/bump_swiftmailer
...
Upgrade to swiftmailer-6
2018-07-06 10:39:09 +02:00
Bjoern Schiessle
5d0fa12e12
allow to disable encryption
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-05 17:24:44 +02:00
Robin Appelman
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
Arthur Schiwon
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
John Molakvoæ (skjnldsv)
6a0552224d
getDeletedSharedWith method
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-07-05 12:43:57 +02:00
Roeland Jago Douma
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
Roeland Jago Douma
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
Roeland Jago Douma
e6e6b5648a
Make swift 6 compatible
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-04 08:28:33 +02:00
Roeland Jago Douma
0dd4a3e0cf
Kill php mail from settings
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-04 08:28:33 +02:00
Morris Jobke
7025f16017
Merge pull request #9345 from nextcloud/federation20
...
Federation 2.0
2018-07-03 23:13:47 +02:00
Morris Jobke
10b8a4a8b1
Revert "Fix undeclared method warning in phan"
...
This reverts commit f3093b2401
.
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-07-03 17:46:11 +02:00
Morris Jobke
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
Morris Jobke
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
Morris Jobke
f3093b2401
Fix undeclared method warning in phan
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-07-02 15:38:49 +02:00
Robin Appelman
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
Bjoern Schiessle
7ff74ae8ed
cache results from ocm end-point discovery
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 12:43:43 +02:00
Bjoern Schiessle
411bae5163
fix return type from send share
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 12:43:43 +02:00
Bjoern Schiessle
cdf8abb060
look for correct OCM permissions
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:31 +02:00
Bjoern Schiessle
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
Bjoern Schiessle
84fc188dfc
some minor fixes and clode cleanup
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:29 +02:00
Bjoern Schiessle
fab4e561f4
send reshare over OCM API
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:28 +02:00
Bjoern Schiessle
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
Bjoern Schiessle
bbce8c3ea1
adjust to latest api version
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:28 +02:00
Bjoern Schiessle
af178ef19a
check API Version
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:27 +02:00
Bjoern Schiessle
db428ea547
send accept share notification (WIP)
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:27 +02:00
Bjoern Schiessle
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
Bjoern Schiessle
6208f250e8
check if cloud federation api is ready
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:27 +02:00
Bjoern Schiessle
5cfe20675d
start implementing federated sharing 2.0
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:27 +02:00
Michael Weimann
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
blizzz
2f8ebe2b35
Merge pull request #10048 from nextcloud/feature/9760/systemd-logger
...
Systemd Logger
2018-06-30 00:57:30 +02:00
Morris Jobke
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
Morris Jobke
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
Julius Härtl
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
Julius Härtl
97c13debdc
Remove unneeded param from personal settings
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-06-29 13:35:07 +02:00
Julius Härtl
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
Morris Jobke
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
Morris Jobke
326f07e756
Merge pull request #8854 from nextcloud/drop-old-sharing-code
...
Get rid of shareItem
2018-06-29 10:40:32 +02:00
Johannes Ernst
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
Johannes Ernst
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
Morris Jobke
17a9024fac
Improved wording
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-06-29 10:33:12 +02:00
Arthur Schiwon
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
Arthur Schiwon
1e0761c6b8
adjust tests
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-06-29 09:08:33 +02:00
Arthur Schiwon
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
Morris Jobke
61842f66ee
Merge pull request #5623 from nextcloud/locale-setting
...
Add user locale/region setting
2018-06-29 08:03:43 +02:00
Morris Jobke
89b6ee1a45
Merge pull request #9773 from nextcloud/feature/noid/resource_booking
...
resource booking
2018-06-29 06:51:49 +02:00
Georg Ehrke
4c1e581f47
docblock version fixes
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-06-28 17:37:16 +02:00
Robin Appelman
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
Roeland Jago Douma
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
Morris Jobke
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
Georg Ehrke
8c73b13ac8
move locales file to /resources/
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-06-27 21:52:19 +02:00
Georg Ehrke
b17d256761
fix use of findLocale
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-06-27 21:52:19 +02:00
Georg Ehrke
9157086c23
properly handle force_locale setting
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-06-27 21:52:19 +02:00
Georg Ehrke
b3921c65a6
cache available locales to minimize fs access
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-06-27 21:52:19 +02:00
Georg Ehrke
51a35c23f6
fix camelCase for localesForLanguage
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-06-27 21:52:18 +02:00
Julius Härtl
f3949cf1a8
Add groupware settings section
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-06-27 19:16:21 +02:00
Thomas Citharel
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
Thomas Citharel
abab7eb7f0
handle config.php values
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-06-27 13:19:23 +02:00
Thomas Citharel
4a9f8623b5
Fix review & tests
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-06-27 13:19:21 +02:00
Thomas Citharel
ea380b2918
Allow apps to specify locale for localisation
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-06-27 13:17:26 +02:00
Thomas Citharel
d8921ccd85
Allow user to choose locale
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-06-27 13:15:19 +02:00
Morris Jobke
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
Morris Jobke
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
Robin Appelman
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
Morris Jobke
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
Julius Härtl
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
Morris Jobke
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
Morris Jobke
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
Eric Masseran
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
Joas Schilling
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
Morris Jobke
9444a3fad1
Merge pull request #9632 from nextcloud/enhancement/stateful-2fa-providers
...
Stateful 2fa providers
2018-06-25 15:49:58 +02:00
Robin Appelman
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
Christoph Wurst
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
Georg Ehrke
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
Georg Ehrke
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
Georg Ehrke
c83629674e
update resource booking interfaces and add managers
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-06-25 04:58:08 +02:00
Roeland Jago Douma
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
Roeland Jago Douma
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
Roeland Jago Douma
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
Roeland Jago Douma
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
John Molakvoæ (skjnldsv)
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
Morris Jobke
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
Roeland Jago Douma
e7338173e8
Add PublicShareMiddlewareTest
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-20 08:53:37 +02:00
Roeland Jago Douma
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
Roeland Jago Douma
366981fba6
Move public preview endpoint over
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-20 08:53:37 +02:00
Roeland Jago Douma
f36ef8ca80
Add the new PublicShareController and PublicShareMiddleware
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-20 08:53:35 +02:00
Christoph Wurst
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
John Molakvoæ (skjnldsv)
21441fad9b
Added new search standard
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-19 23:53:20 +02:00
John Molakvoæ (skjnldsv)
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
Robin Appelman
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
Morris Jobke
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
Robin Appelman
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
Morris Jobke
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
Roeland Jago Douma
82959ca93e
Comments
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-19 07:46:43 +02:00
Roeland Jago Douma
970dea9264
Add getProvider helper function
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-18 22:11:55 +02:00
Roeland Jago Douma
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
Roeland Jago Douma
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
Roeland Jago Douma
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
Roeland Jago Douma
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
Roeland Jago Douma
d03d16a936
Add publickey provider to manager
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-18 22:11:55 +02:00
Roeland Jago Douma
4bbc21cb21
SetPassword on PublicKeyTokens
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-18 22:11:55 +02:00
Roeland Jago Douma
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
Roeland Jago Douma
1f17010e0b
Add first tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-18 22:11:54 +02:00
Roeland Jago Douma
02e0af1287
Initial PKT implementation
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-18 22:11:54 +02:00
Roeland Jago Douma
3dd5f3d5f6
Abstract the Provider via a manager
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-18 22:11:53 +02:00
Julius Härtl
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
blizzz
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
John Molakvoæ (skjnldsv)
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
Morris Jobke
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
Morris Jobke
d82ef72161
Merge pull request #9197 from nextcloud/fix-avatar-center
...
Fix avatar generator centering
2018-06-15 16:16:13 +02:00
Robin Appelman
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
Morris Jobke
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
Mark Berezovsky
ad66c6bf08
Fix #9864 : Decrease $maxDelay in Throttler.php
...
Signed-off-by: Mark Berezovsky <xpnf@yandex.ru>
2018-06-15 04:58:08 +03:00
Daniel Calviño Sánchez
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
Julius Härtl
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
Robin Appelman
3047ef31bd
Add count to function builder
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-06-14 14:32:22 +02:00
Roeland Jago Douma
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
Roeland Jago Douma
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
John Molakvoæ (skjnldsv)
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
John Molakvoæ (skjnldsv)
156da29cea
Avatar imagick bump
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-13 18:46:05 +02:00
John Molakvoæ (skjnldsv)
4432cfd445
Embedded font
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-13 18:46:05 +02:00
John Molakvoæ (skjnldsv)
ed4309ce41
Unify colour algorithm output
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-13 18:46:04 +02:00
John Molakvoæ (skjnldsv)
eea6f74ca4
Controller tests fixes
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-13 18:46:04 +02:00
John Molakvoæ (skjnldsv)
c1766b2abc
Use base image size
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-13 18:46:04 +02:00
John Molakvoæ (skjnldsv)
adf3856d35
Return Svg avatars
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-13 18:46:04 +02:00
John Molakvoæ (skjnldsv)
8e3382ceda
Fix avatar generator centering
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-13 18:46:04 +02:00
Morris Jobke
dc4c158ea7
Background job to clean up old backups of the updater
...
* a one-time job gets scheduled after each update via a repair job
* the job remove all directories inside data/updater-INSTANCEID/backups except the 3 most recent ones (determined by mtime of the folder)
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-06-13 17:43:29 +02:00
Morris Jobke
9c4aecb539
Merge all setup checks into one controller
...
* renamed hasMissingIndexes to missingIndexes
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-06-13 15:25:08 +02:00
Morris Jobke
cd87a40eb3
Merge pull request #9836 from nextcloud/feature/noid/merge-tips-and-tricks-into-setup-checks
...
Merge tips & tricks section into setup checks
2018-06-13 13:18:40 +02:00
Morris Jobke
4a0b7aaf6c
Merge tips & tricks section into setup checks
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-06-13 12:05:38 +02:00
Morris Jobke
624d191ef6
Fix wrong hint about missing indexes
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-06-13 11:56:43 +02:00
Robin Appelman
47fd3499a3
Fix listing s3 objects when using google cloud aws compatibility
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-06-11 17:10:57 +02:00
Morris Jobke
0c2f016b67
Merge pull request #9802 from nextcloud/bugfix/noid/token_check_expire_better
...
Make the token expiration also work for autocasting 0
2018-06-09 11:25:58 +02:00
Roeland Jago Douma
480864b3e3
Make the token expiration also work for autocasting 0
...
Some bad databases don't respect the default null apprently.
Now even if they cast it to 0 it should work just fine.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-08 16:20:43 +02:00
Mario Danic
47769d2640
New regex to match mentions
...
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-06-08 10:21:19 +02:00
Mario Danic
dc7beda308
Remove unsupported modifier
...
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-06-08 00:59:31 +02:00
Mario Danic
6bf8fca574
Fix mentions regex
...
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-06-08 00:35:51 +02:00
Roeland Jago Douma
49145a78e9
Make sure initial files can be properly created
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-07 12:07:37 +02:00
Morris Jobke
b49f8e43bd
Merge pull request #9565 from nextcloud/feature/noid/app-settings
...
Migrate apps management to Vue.js
2018-06-06 18:05:04 +02:00
Morris Jobke
393d9aae74
Add a hint that some indexes are not added yet
...
* gives the admin a chance to discover the missing indexes and improve the performance of the instance without digging through the manual
* nicely integrated in the setup checks where this kind of hints belong to
* also adds an option to integrate this from an app based on events
* fix style of setting warnings
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-06-06 16:55:01 +02:00
Morris Jobke
f13c2b20b6
Merge pull request #9692 from nextcloud/bugfix/noid/logsecret_fix_file_put
...
Make sure the log doesn't try to read from PUT if it can't
2018-06-06 16:01:24 +02:00
Julius Härtl
f30c14a6a2
Keep AppConfig for now
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-06-06 11:49:40 +02:00
Julius Härtl
facce73c7f
Remove unused import
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-06-06 11:40:09 +02:00
Julius Härtl
29f1c9b7a2
Remove unneeded class
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-06-06 11:40:09 +02:00
Julius Härtl
b4a7be20c8
Properly clear cache
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-06-06 11:40:09 +02:00
Julius Härtl
1a034ce699
Implement update functionality
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-06-06 11:40:09 +02:00
Julius Härtl
cd60e5b634
Move logic to app management mixin
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-06-06 11:40:09 +02:00
Julius Härtl
23462275ba
Add AppStore Manager
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-06-06 11:40:09 +02:00
Julius Härtl
4a5826cddb
Generate PNG version of the theming app logo for mails
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-06-05 16:47:38 +02:00
Morris Jobke
bc008f8d5f
Merge pull request #9483 from nextcloud/azure-blob
...
add azure object storage backend
2018-06-04 16:54:21 +02:00
Robin Appelman
ac26175a17
add azure unit tests with azurite
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-06-04 16:18:03 +02:00
Morris Jobke
8c3ec5f589
Merge pull request #9725 from nextcloud/fix/contacts-menu-local-null-check
...
Fix local users check in contacts menu
2018-06-04 14:58:23 +02:00
Robin Appelman
60b7cbc0f0
add azure object storage backend
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-04 10:57:52 +02:00
Morris Jobke
367b1be15c
Merge pull request #9425 from nextcloud/db-reconnect-timeout
...
Check connection status and attempt to reconnect each each minute
2018-06-04 10:40:12 +02:00
Christoph Wurst
9f8617a439
Fix local users check in contacts menu
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2018-06-04 08:45:04 +02:00
Morris Jobke
5aca062100
Remove not needed change
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-05-31 17:23:36 +02:00
Robin Appelman
b40629ac8c
Add human readable description to migration steps
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-05-30 21:28:05 +02:00
Roeland Jago Douma
a52d206684
Make sure the log doesn't try to read from PUT if it can't
...
If a PUT request comes in that is not JSON or from encoded. Then we can
only read it (exactly) once. If that is the case we must assume no
shared secret is set.
If we don't then we either are the first to read it, thus causing the
real read of the data to fail.
Or we are later and then it throws an exception (also failing the
request).
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-30 20:18:19 +02:00
Roeland Jago Douma
14acded171
Make sure the file is readable before attempting to create a preview
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-30 11:34:02 +02:00
Morris Jobke
1924fed83e
Merge pull request #9589 from nextcloud/bugfix/noid/allow-empty-route-navigation
...
Allow empty route for navigation entries
2018-05-29 16:26:32 +02:00
Morris Jobke
9ddff6ff35
Merge pull request #9617 from nextcloud/users-sort-case-fix
...
Ignore case when sorting users
2018-05-28 15:52:37 +02:00
Morris Jobke
0947ddb33e
Merge pull request #9268 from nextcloud/bugfix/6711
...
Do not load calendar/addressbook plugins if not needed
2018-05-28 13:52:12 +02:00
Roeland Jago Douma
26c1e33d11
Move repairstep to a custom command
...
People that have issues can run it manually
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-28 13:26:55 +02:00
Morris Jobke
188b96d521
Merge pull request #9584 from nextcloud/file-cache-gc-isdir
...
remove unneeded is_dir from file cache gc
2018-05-28 11:36:19 +02:00
John Molakvoæ (skjnldsv)
0bfe3da664
Ignore case when sorting users
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-05-26 12:01:13 +02:00
Morris Jobke
a27e2bfcfd
Merge pull request #9585 from nextcloud/feature/noid/rename-syncclients
...
Rename sync clients section to mobile & desktop
2018-05-26 11:18:47 +02:00
John Molakvoæ (skjnldsv)
7b57c1a905
Tabs fix
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-05-25 14:46:11 +02:00
John Molakvoæ (skjnldsv)
c55cf79453
Added total count for subadmins
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-05-24 17:52:15 +02:00
John Molakvoæ (skjnldsv)
10c135ca34
Added disabled count per groups
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-05-24 17:52:15 +02:00
Julius Härtl
354c6e95d5
Allow empty route for navigation entries
...
Navigation entries might be handled by javascript, as the about section
from https://github.com/nextcloud/firstrunwizard/pull/64 so we don't
need a route for that.
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-05-24 16:28:05 +02:00
Julius Härtl
e1af2f4766
Rename sync clients section to mobile & desktop
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-05-24 15:06:28 +02:00
Robin Appelman
07e5b30b90
remove unneeded is_dir from file cache gc
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-05-24 14:24:10 +02:00
Roeland Jago Douma
84482eb25a
Merge pull request #9435 from nextcloud/bugfix/noid/fix_force_language_html_attr
...
make sure force language is reflected in html lang attribute
2018-05-23 23:45:24 +02:00
Roeland Jago Douma
4286e17777
Always set the request language to the force language
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-23 21:19:46 +02:00
Morris Jobke
6b6d522969
Merge pull request #9395 from nextcloud/scanner-error-lock-cleanup
...
cleanup locks in scanner on error
2018-05-23 20:05:01 +02:00
Morris Jobke
bc34a7f4e9
Get rid of shareItem
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-05-23 19:51:37 +02:00
Morris Jobke
a2c518ee5a
Merge pull request #8824 from nextcloud/settings-vue
...
Vue migration: settings
2018-05-23 00:32:46 +02:00
Georg Ehrke
2a21471c74
make sure force language is reflected in html lang attribute
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-05-22 19:30:25 +02:00
Maxence Lange
0009adae80
SharedWithDisplayName + SharedWithAvatar
...
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-05-21 01:24:45 +02:00
Blaok
21b9ad3978
feat: allow files:scan --shallow
...
Signed-off-by: Yuze Chi <i@blaok.me>
2018-05-18 14:50:32 -07:00
Roeland Jago Douma
03a6f8e14e
Merge pull request #9490 from marco44/faster_large_filehelper_32bits
...
Make LargeFileHelper.php faster by avoiding execs as much as possible
2018-05-18 21:09:17 +02:00
Roeland Jago Douma
6b7cf46727
Certain tokens can expire
...
However due to the nature of what we store in the token (encrypted
passwords etc). We can't just delete the tokens because that would make
the oauth refresh useless.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-17 16:10:19 +02:00
marco44
32fd0919c1
Make LargeFileHelper.php faster by avoiding execs as much as possible
...
Signed-off-by: Marc Cousin <cousinmarc@gmail.com>
2018-05-17 14:28:32 +02:00
Roeland Jago Douma
aba255997a
Allow the rotation of tokens
...
This for example will allow rotating the apptoken for oauth
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-16 19:27:19 +02:00
Morris Jobke
0011bfb64b
Merge pull request #9475 from nextcloud/bug/9469/delete_preview_on_version_restore
...
Delete the previews when a version is restored
2018-05-16 11:37:12 +02:00
John Molakvoæ (skjnldsv)
72a76060bf
Fixed settings menu entry and group deletion
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-05-16 09:50:22 +02:00
John Molakvoæ (skjnldsv)
6ada8254c9
Added language support in users list
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-05-16 09:50:21 +02:00
Roeland Jago Douma
4ea2daf04d
Refix scope
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-15 11:41:27 +02:00
Roeland Jago Douma
466297829e
Fix tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-15 10:56:40 +02:00
Roeland Jago Douma
47388e1cfe
Make the Token Auth code strict
...
In preparation for #9441
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-15 10:32:30 +02:00
Roeland Jago Douma
497a4facdf
Merge pull request #9444 from nextcloud/techdep/noid/appframework_mapper_to_qb
...
Add a QueryBuilder based Mapper
2018-05-14 21:12:12 +02:00
Roeland Jago Douma
39bb9c06d1
Delete the previews when a version is restored
...
Fixes #9469
When a version of a file is restored the previews are no longer valid.
Thus we should remove them so they are regenerated.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-14 19:58:19 +02:00
Roeland Jago Douma
047cf5de07
Move to join
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-14 13:30:22 +02:00
Roeland Jago Douma
3e07c4f73a
Kill the dete preview watcher
...
This code had the potential to time out. If a huge folder with pictures
for example was deleted then this could easily grow the number of files
to clean with a factor 5 (or more).
Now the previews just get cleaned up in the background. Which is good
enough for the 99% case
As a bonus this now also keeps the previews when in the trashbin so you
don't have a spiking server load when a user opens the trashbin view.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-14 13:30:06 +02:00
Roeland Jago Douma
253f962241
Add the job
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-14 13:25:55 +02:00
Roeland Jago Douma
3bfa031f38
Add backgroundcleanup job
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-14 13:25:55 +02:00
Roeland Jago Douma
575dc29c27
Make Appdata static
...
* Add fileid for simpleroot folders (only internal)
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-14 13:25:54 +02:00