wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
50585 commits 157 branches 562 tags 714 MiB
Commit graph

4178 commits

Author SHA1 Message Date
Branko Kokanovic
7cef9b0248 Addressing comments, array() to [] 
Signed-off-by: Branko Kokanovic <branko@kokanovic.org>
 2018-12-17 23:34:55 +01:00
Roeland Jago Douma
514426e27d
Only trust the X-FORWARDED-HOST header for trusted proxies 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-12-17 15:54:45 +01:00
Joas Schilling
6788e6e75c
Merge pull request #12883 from nextcloud/appdata-performance 
try to grab the appdata folder directly without going trough the whole tree
 2018-12-17 15:11:28 +01:00
Joas Schilling
85a0e10b4f
Update the tests to the comparison logic 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-12-17 13:52:09 +01:00
Robin Appelman
d6bf5d4384
upload new files in objectstore to a .part path first 
This prevent the object store and cache from getting out of sync
when an objectstore silently fails or the php process get's killed
during the upload without giving us the chance to cleanup

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-12-12 15:24:40 +01:00
Robin Appelman
6c9f2644cf
Add objectExists to objectstore interface 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-12-12 14:17:19 +01:00
Roeland Jago Douma
372f3d2a60
Remove deprecated functions from SecureRandom 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-12-07 19:33:32 +01:00
Roeland Jago Douma
2bbfeea659
Merge pull request #12891 from nextcloud/theming-caching 
more caching for theming
 2018-12-07 10:09:31 +01:00
Robin Appelman
2051943487
more caching for theming 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-12-07 01:27:49 +01:00
Robin Appelman
036475fc91
use a fresh appdata factory in background job test 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-12-06 16:53:13 +01:00
Robin Appelman
740ea0d30e
try to grab the appdata folder directly without going trough the whole tree 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-12-06 15:10:08 +01:00
John Molakvoæ (skjnldsv)
2be63bcb6a
Log and continue on Dav reader failure 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-12-05 21:13:57 +01:00
Joas Schilling
ee545d6840
Fix typo in "incoming" 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-12-05 11:27:38 +01:00
Branko Kokanovic
72d97b44a7 Expose Swift Mailer streaming options in config, fixes #12702 
Signed-off-by: Branko Kokanovic <branko@kokanovic.org>
 2018-11-30 22:36:03 +01:00
Morris Jobke
331f3b2652
Merge pull request #12691 from nextcloud/storage-no-encryption-interface 
Add interface to allow storages from opting out of encryption
 2018-11-29 22:02:23 +01:00
Robin Appelman
67a46b5aa9
update encryption wrapper tests 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-11-29 16:34:49 +01:00
Daniel Kesselberg
4a2c56b714
Add testcases for pipe mode 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2018-11-29 16:02:37 +01:00
Robin Appelman
9d9f6903c9
Fix folder path containing leading slash when getting mount root by id 
This fixes collabora on public link shared groupfolders

Fixes https://github.com/nextcloud/groupfolders/issues/225

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-11-28 15:18:29 +01:00
Joas Schilling
b8fcf6e9b3
Allow empty strings in getAbsoluteURL 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-11-20 13:36:16 +01:00
Joas Schilling
2b18b9ae96
Update the URLGenerator test to current state of art 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-11-20 13:36:15 +01:00
Robin Appelman
aa6f7947ba
add test for non existing file by id 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-11-19 17:37:59 +01:00
Morris Jobke
fd8eeccb15
Merge pull request #11942 from nextcloud/techdebt/noid/use-count-function 
Use the defined func()->count() instead of manual counting
 2018-11-12 17:43:56 +01:00
Morris Jobke
859dd1e742
Merge pull request #12371 from nextcloud/bugfix/12369/catch-unique-constraint-violation-exception-in-insertIfNotExist 
Catch UniqueConstraintViolationException inside insertIfNotExist
 2018-11-12 13:41:00 +01:00
Morris Jobke
8e60006744
Exception is not thrown anymore 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-11-12 12:22:04 +01:00
Julius Härtl
26b160cc43
Make sure to always load the latest icons-vars.css file 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-11-12 11:00:56 +01:00
Joas Schilling
bb352fb667
Use the defined func()->count() instead of manual counting 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-11-08 15:44:45 +01:00
Roeland Jago Douma
25fe324f41
Merge pull request #12313 from nextcloud/generated-avatar-major-cleanup 
Clear avatar cache with frontend repair
 2018-11-08 10:28:09 +01:00
John Molakvoæ (skjnldsv)
a9eef37456
Clear avatar cache with frontend repair 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-11-08 08:31:21 +01:00
Morris Jobke
ab3543380c
Merge pull request #11836 from nextcloud/bugfix/2443/comment-mentions-with-spaces 
Comment mentions with spaces
 2018-11-07 16:27:36 +01:00
Joas Schilling
10ba0bed8a
Match mentions when the username is wrapped in quotes 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-11-07 12:33:44 +01:00
Daniel Kesselberg
04a316aa67
Add test that unique constraint is working 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2018-11-06 21:29:20 +01:00
Morris Jobke
cba3883410
Merge pull request #12185 from nextcloud/cleanup/dicontainer 
Cleanup the DIContainer
 2018-11-05 12:16:36 +01:00
Roeland Jago Douma
9d89f8bbac
Merge pull request #12071 from nextcloud/addressbook-uid-check-migration 
Addressbook uid check migration
 2018-11-02 19:37:48 +01:00
Roeland Jago Douma
0e5147f001
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-11-02 19:20:37 +01:00
Roeland Jago Douma
4ba709bb71
Merge pull request #11404 from flokli/sendmail-path 
Mailer: discover sendmail path instead of hardcoding it to /usr/sbin/sendmail
 2018-11-02 16:17:02 +01:00
Roeland Jago Douma
30a1237f81
Merge pull request #11875 from nextcloud/add-support-for-sending-the-password-for-a-link-share-by-nextcloud-talk 
Add support for sending the password for a link share by Nextcloud Talk
 2018-11-02 14:54:46 +01:00
Roeland Jago Douma
054056a8df
Fallback to default path is sendmail can't be found 
If the sendmail binary can't be found at all we fallback to the default
path.
It most likely is not there but then at least a proper error message
pops up.

Updated the tests to also properly pass.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-11-02 14:03:11 +01:00
Morris Jobke
248d95339d
Cleanup some unused sharing methods from the old sharing code 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-11-02 10:49:42 +01:00
Daniel Calviño Sánchez
fe8a67f517 Store "sendPasswordByTalk" property of link shares in the database 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-11-02 01:57:48 +01:00
Daniel Calviño Sánchez
00e4c8aee4 Fix update share tests 
The update share tests only checked that the share returned by
"update()" had the expected values. However, as "update()" returns the
same share that was given as a parameter the tests were not really
verifying that the values were updated in the database.

In a similar way, the test that checked that a password was removed did
not set a password first, so even if the database returned null it could
be simply returning the default value for the share; a password must be
set first to ensure that it is removed.

Besides that, a typo was fixed too that made the checks on the original
share instead of on the one returned by "update()"; right now it is the
same share, so the change makes no difference, but it is how the check
should be done anyway.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-11-02 01:09:01 +01:00
John Molakvoæ (skjnldsv)
98f30c2dab
Merge branch 'addressbook-uid-check-migration' of https://github.com/nextcloud/server into addressbook-uid-check-migration 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-11-01 17:33:58 +01:00
John Molakvoæ (skjnldsv)
abed75e5cb
Fix phpunit 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-11-01 17:32:21 +01:00
Morris Jobke
f5a1f4bc1b
Revert "Wait for cron to finish before running upgrade command" 
This reverts commit 18e9631810.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-11-01 15:23:40 +01:00
John Molakvoæ (skjnldsv)
06b3ade9ee
Tests 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-11-01 15:00:49 +01:00
Robin Appelman
9b3cc72f7c
fix writeStream for jail wrapper 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-10-31 21:10:57 +01:00
Robin Appelman
93de63777e
extend storage api to allow directly writing a stream to storage 
this removes the need for temporary storages with some external storage backends.
The new method is added to a separate interface to maintain compatibility with
storage backends implementing the storage interface directly (without inheriting common)

Currently the interface is implemented for objectstorage based storages and local storage
and used by webdav uploads

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-10-31 21:10:44 +01:00
Roeland Jago Douma
ce10f8b8c4
Only generate previews in powers of 4 and set min 
Before we'd round up all preview request to their nearest power of two.
This resulted still in a lot of possible images. Generating a lot of
server load and taking up a lot of space.

This moves it to previews to be powers of 4: 64, 256, 1024 and 4096
Also the first two powers are always skipped (4, 16) as it doesn't make
sense to generate previews for that.

We cache preview pretty agressively and I feel this is a better
tradeoff.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-31 19:34:42 +01:00
Roeland Jago Douma
674930da7f
Move ExpiredTokenException to the correct namespace 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-30 19:30:45 +01:00
Roeland Jago Douma
41ff001b77
Merge pull request #11899 from nextcloud/enhancement/noid/sharing-consolidation 
Sharing user consolidation
 2018-10-30 19:27:05 +01:00
John Molakvoæ (skjnldsv)
e2ec641c7b
Tests 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-10-30 13:05:10 +01:00
Julius Härtl
5a73a9b9de
Fix injection to get the user id 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 11:41:56 +01:00
Morris Jobke
dccfe4bf84
Merge pull request #12036 from olivermg/master 
Add capability of specifying "trusted_proxies" entries in CIDR notation (IPv4)
 2018-10-30 10:49:08 +01:00
Julius Härtl
a0d759b324
Add uuid/name entry to Remote/MailPlugin tests 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 10:19:36 +01:00
Julius Härtl
61af607525
Make enhancing entries with type property optional 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 10:19:35 +01:00
Julius Härtl
ce79e587e4
Filter out local users from address book remote searches 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 10:19:33 +01:00
Oliver Wegner
401ca28f07 Adding handling of CIDR notation to trusted_proxies for IPv4 
Signed-off-by: Oliver Wegner <void1976@gmail.com>
 2018-10-30 09:15:42 +01:00
Julius Härtl
34a71f57fc
Fix tests 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-29 13:06:55 +01:00
Julius Härtl
d21ded67a7
Keep list of icons in a separate file for use in the accessibility app 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-25 12:16:10 +02:00
Bjoern Schiessle
d76a87f3b0
skip already decrypted files on decrypt all command 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-10-24 16:53:39 +02:00
Morris Jobke
39338aaa67
Merge pull request #11914 from nextcloud/csp/report-uri 
Add report-uri to CSP
 2018-10-23 16:42:24 +02:00
John Molakvoæ (skjnldsv)
782927a05f
fixup! Fix comment and cap-height 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-10-23 14:30:23 +02:00
John Molakvoæ (skjnldsv)
1fb885638e
Fix comment and cap-height 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-10-23 14:22:55 +02:00
Jan-Christoph Borchardt
354b72b9d3
Use correct typeface for avatar generator 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2018-10-23 13:13:35 +02:00
Roeland Jago Douma
579822b6a5
Add report-uri to CSP 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-21 13:38:32 +02:00
Christoph Wurst
a1ea504edf
Merge pull request #11711 from nextcloud/feature/backgroundjobs_ocp 
Add proper backgroundjobs to OCP
 2018-10-19 07:40:35 +02:00
Arthur Schiwon
8e4ae23c48
Do not try to contact lookup server without internet connection or URL 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-10-18 17:49:28 +02:00
Morris Jobke
ad66b0f9ab
Merge pull request #11830 from nextcloud/bugfix/9326/make_sure_usermanager_getByEmail_only_returns_IUser 
filter null values for UserManager::getByEmail
 2018-10-16 09:14:25 +02:00
Julius Härtl
b9a87a69cf
Use IAccountManager constants 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-15 13:30:31 +02:00
Julius Härtl
9381e681a9
Add tests for new account api classes 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-15 13:30:31 +02:00
Georg Ehrke
2db26d87c4
filter null values for UserManager::getByEmail 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2018-10-15 13:27:58 +02:00
Björn Schießle
1ce8672276
Merge pull request #11714 from nextcloud/lookupserver-and-global-scale 
always query the lookup server in a global scale setup
 2018-10-15 12:14:04 +02:00
Christoph Wurst
83e994c11f
Make it possible to enforce mandatory 2FA for groups 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-10-15 08:22:52 +02:00
Roeland Jago Douma
5b61ef9213
Disallow unsafe-eval by default 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-14 20:45:34 +02:00
Bjoern Schiessle
1b0b159685
add more tests 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-10-12 16:11:48 +02:00
Bjoern Schiessle
fd5fc24da2
some small fixes and improvements 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-10-10 16:07:01 +02:00
Roeland Jago Douma
d5bf2c4523
Move normalizePath to regexes instead of looping 
This is IMO a bit more readable and it seems to make the code faster.
Tested it on the company instance where there are over 3k calls to this
function. It shaves off around 10ms.

The advantage here is that the pattern gets optimized by php itsel and
cached.
Also looking for all patterns at the same time and especially no longer
looping for /./ patterns should save time.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-10 13:23:59 +02:00
Bjoern Schiessle
9e76d4049a
adjust tests 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-10-09 18:31:33 +02:00
Roeland Jago Douma
c97b4274cc
Add function to generate urls for OCS routes 
fixes #11617

The OCS routes are only absolute for now as they are often exposed to
the outside anyway and are on a different endpoint than index.php in
anyway.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-09 15:41:50 +02:00
Roeland Jago Douma
8493f49211
fixup! fixup! Add backgroundjobs to OCP 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-09 15:25:56 +02:00
Christoph Wurst
3f2cd13beb
Remove HHVM check 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-10-09 10:12:15 +02:00
Morris Jobke
db345e4c6d
Deprecate unused, private OC_Helper::linkToPublic 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-10-08 18:29:52 +02:00
Morris Jobke
fe2a600823
Merge pull request #10839 from nextcloud/bugfix/10212/use_class_implementation 
adjust Calendar resource / room interfaces to use class implementation
 2018-10-08 17:00:50 +02:00
Morris Jobke
bae3ba3b25
Merge pull request #11671 from nextcloud/refactor/rename-admin-security-section 
Rename admin security section
 2018-10-08 13:57:38 +02:00
Christoph Wurst
b1b43aa7bc
Fix reference to template in tests 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-10-08 11:27:22 +02:00
Morris Jobke
7971ba5cc6
Merge pull request #10898 from nextcloud/feature/10684/default-logo-color-theme-colors 
Switches the default logo color depending on the primary color
 2018-10-08 10:33:22 +02:00
Christoph Wurst
5d2fdfe0b5
Rename admin security section 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-10-08 10:31:51 +02:00
Georg Ehrke
970242b6ca
RoomManager/ResourceManager: Inject IServerContainer instead of using OC Server 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2018-10-08 01:50:17 +02:00
Georg Ehrke
1c6f666bbf
adjust Calendar resource / room interfaces to use class implementation 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2018-10-08 01:25:20 +02:00
Roeland Jago Douma
60a34179c9
Remove deprecated publishActivity function 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-05 12:55:45 +02:00
Morris Jobke
8ede3f6346
Merge pull request #11446 from nextcloud/bugfix/10678/pretty-urls-dont-work 
Allow overwrite.cli.url without trailing slash
 2018-10-02 23:39:30 +02:00
Morris Jobke
6b730b4c47
Merge pull request #11390 from nextcloud/feature/11043/apptoken_v3 
Apptoken v3: imrpove token handling on external password change
 2018-10-02 21:45:10 +02:00
Roeland Jago Douma
19f84f7b54
Add tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-02 19:50:54 +02:00
Roeland Jago Douma
00e99af586
Mark token as invalid if the password doesn't match 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-02 19:50:44 +02:00
Morris Jobke
7005ff420e
Fix tests 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-10-02 18:37:57 +02:00
Michael Weimann
d855c38e07
Moves the logo files to logo 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2018-10-02 08:37:54 +02:00
Roeland Jago Douma
956fe1b867
Generate backups code notification if not enable but 2fa is 
Generate a notification to generate backup codes if you enable an other
2FA provider but backup codes are not yet generated.

* Add event listner
* Insert background job
* Background job tests and emits notification every 2 weeks
* If the backup codes are generated the next run will remove the job

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-01 15:35:25 +02:00
Daniel Kesselberg
9dae927b0c Add more test cases 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2018-09-30 12:24:38 +02:00
Christoph Wurst
259c0ce11d
Add mandatory 2FA service/class 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-09-30 11:47:29 +02:00
Daniel Kesselberg
c275beeceb
Allow url without / for overwrite.cli.url 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2018-09-28 22:32:19 +02:00
Christoph Wurst
f71ffc73db
Remove unused constructor argument 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-09-27 09:44:21 +02:00
Christoph Wurst
0259792614
Reduce settings manager complexity by loading sections via DI 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-09-27 09:44:21 +02:00
blizzz
ff55bcdad5
Merge pull request #11150 from nextcloud/feature/noid/unit-test-find-webroot 
Extract logic for webroot into method and add test
 2018-09-26 15:22:30 +02:00
Morris Jobke
ee73f6c416
Merge pull request #11240 from nextcloud/feature/noid/consider-openssl-settings-from-config.php 
Consider openssl settings from config.php
 2018-09-25 18:04:20 +02:00
Christoph Wurst
7586b19e52
Only allow 2FA state changs if providers support the operation 
Ref https://github.com/nextcloud/server/issues/11019.

Add `twofactorauth:cleanup` command

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-09-25 09:54:20 +02:00
Daniel Kesselberg
2440ee6b84
Add simple unit test for findLanguageFromLocale 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2018-09-23 20:12:00 +02:00
Daniel Kesselberg
6bdcec67ab
Add openssl to mock 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2018-09-16 12:38:08 +02:00
Daniel Kesselberg
3b7ac0c94d
Change visibility to private 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2018-09-13 12:24:06 +02:00
Daniel Kesselberg
fabd3e7ba1
Restore previous state for OC::$CLI 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2018-09-11 17:22:10 +02:00
Daniel Kesselberg
603a578a1c
Change return false to throw new 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2018-09-10 22:45:40 +02:00
Daniel Kesselberg
62c03beb1d
Extract logic for webroot into method and add test 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2018-09-10 22:33:35 +02:00
Christoph Wurst
ff58732c0d
Add breadcrumb support to crash reporters 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-09-05 20:58:39 +02:00
sualko
61370549f3 Allow same section class for multiple section types (fix #10764) 
Signed-off-by: Klaus Herberth <klaus@jsxc.org>
 2018-08-25 17:32:19 +02:00
Morris Jobke
bb2336f389
Merge pull request #10526 from steiny2k/HEICHEIF 
Support HEIC for previews
 2018-08-22 13:41:19 +02:00
Michael Weimann
2bab916c53
Adds license to files. Updates the branch. 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2018-08-20 20:46:23 +02:00
Michael Weimann
7aed47f776
Adds tests for the memory checks 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2018-08-20 15:24:10 +02:00
Michael Weimann
1d2bc9c45e
Adds tests for the setup memory limit checks 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2018-08-20 15:24:10 +02:00
blizzz
4b92a0986c
Merge pull request #10712 from nextcloud/fix/noid/check_if_provider_is_available_before_use 
Check if a preview provider is available before using it
 2018-08-20 13:21:16 +02:00
Roeland Jago Douma
5b103744c8
Check if a preview provider is available before using it 
Else if a preview provider is registerd but not available (for example
missing support in some external lib). It will do 💥. This way the
providers can at least do the sanity checks required.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-08-17 20:51:35 +02:00
Sebastian Steinmetz
5a996b5f87 Address comments from @rullzer: 
- implement isAvailable
 - run tests only if ImageMagick with HEIC support is available in the
   environment

Signed-off-by: Sebastian Steinmetz <me@sebastiansteinmetz.ch>
 2018-08-17 18:37:23 +02:00
Bjoern Schiessle
325e8bea16
add deck and mail to the groupware bundle, remove talk 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-08-17 13:27:48 +02:00
blizzz
8601bbc35d
Merge pull request #10621 from nextcloud/feature/noid/add-tos-to-enterprise-bundle 
Add the ToS app to the enterprise bundle
 2018-08-13 15:47:15 +02:00
Daniel Kesselberg
bfa49410a2
Drop support for xcache 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2018-08-12 17:14:08 +02:00
Sebastian Steinmetz
8a7bc3fb03 Testcase for HEIC image (similar to the ImageTest) 
Signed-off-by: Sebastian Steinmetz <me@sebastiansteinmetz.ch>
 2018-08-11 01:22:57 +02:00
Roeland Jago Douma
7aad5b7721
Merge pull request #10543 from nextcloud/ignore-deactivated-users 
Do not show deactivated users in sharees and contacts
 2018-08-10 15:01:14 +02:00
Christoph Wurst
5c70aa2a22
Remove unused import 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-08-10 09:30:17 +02:00
Christoph Wurst
1124b87bc0
Fix 2FA being enforced if only backup codes provider is active 
Fixes https://github.com/nextcloud/server/issues/10634.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-08-10 09:26:40 +02:00
Roeland Jago Douma
8c1e75e052
Do not use file as template parameter 
Using file will overwrite the $file parameter in the template base.
Leading to trying to include a file that is the exception message. Which
will of course fail.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-08-09 16:45:25 +02:00
Joas Schilling
e1d3965883
Add the ToS app to the enterprise bundle 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-08-09 16:12:48 +02:00
Christoph Wurst
8db66d5dfb
Fix double-inserts of the same provider state 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-08-09 13:56:04 +02:00
Christoph Wurst
85bc5edb5e
Add integration/unit test for the double-insert of same values 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-08-09 13:43:00 +02:00
Roeland Jago Douma
0757c52980
Merge pull request #10588 from nextcloud/fix/single-2fa-provider-login-redirect 
Fix login redirection if only one 2FA provider is active
 2018-08-09 12:27:29 +02:00
Björn Schießle
6aa6d2186c
Merge pull request #10255 from nextcloud/add-support-for-room-shares 
Add support for room shares
 2018-08-09 10:44:11 +02:00
Christoph Wurst
d8197f2b97
Rename providerset method to get primary providers 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-08-08 20:28:21 +02:00
Björn Schießle
11e99859ef
Merge pull request #10397 from nextcloud/encryption-s3-fix 
make file cache updates more robust
 2018-08-08 18:27:18 +02:00
Christoph Wurst
c6e47e8a51
Fix login redirection if only one 2FA provider is active 
Fixes https://github.com/nextcloud/server/issues/10500.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-08-08 15:25:59 +02:00
Daniel Calviño Sánchez
4b7fa4ac2e Add support for tokens in room shares 
Tokens will be used to give access to a share to guests in public rooms.
Although the token itself is created in the provider of room shares and
no changes are needed for that, due to the code structure it is
necessary to explicitly call the provider from the manager when getting
a room share by token.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-08-08 14:25:44 +02:00
Roeland Jago Douma
6b1ba9cdaf
Merge pull request #10553 from nextcloud/bugfix/10518/disable-oracle-enforcement-for-now 
Disable Oracle enforcement for now until the following issues are sol…
 2018-08-08 14:10:18 +02:00
Roeland Jago Douma
fe286e21ca
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-08-08 12:58:50 +02:00
Christoph Wurst
d248a0bd1e
Fix 2FA provider registry population on login 
If the 2FA provider registry has not been populated yet, we have to make
sure all available providers are loaded and queried on login. Otherwise
previously active 2FA providers aren't detected as enabled.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-08-08 06:57:52 +02:00
Thomas Citharel
03f1fef160 Ignore deactivated users in collaborators user search plugin 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-08-06 09:55:24 +02:00
Roeland Jago Douma
01298cfa72
Merge pull request #10480 from nextcloud/bugfix/10420/settings 
Settings design polishing
 2018-08-02 20:23:21 +02:00
Julius Härtl
0dd519cff1
Fix encryption admin section tests 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-08-02 10:26:09 +02:00
Julius Härtl
6ce474518c
Append cache bump parameter to scss files URL 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-08-01 12:42:49 +02:00
Julius Härtl
03971d3695
Move encryption settings to security 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-08-01 09:41:09 +02:00
Bjoern Schiessle
a9e22c5f1c
make file cache updates more robust 
only update the encrypted version after the write operation is finished and the stream is closed

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-31 12:24:38 +02:00
blizzz
c39bc1638b
Merge pull request #10444 from nextcloud/feature/noid/allow-to-filter-unread-count-by-verb 
Allow to filter the unread count by verb
 2018-07-31 12:05:52 +02:00
Christoph Wurst
fc149bab3c
Fix duplicate inserts in the 2fa provider registry DAO 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-07-31 06:43:44 +02:00
Joas Schilling
66945f9574
Allow to filter the unread count by verb 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-07-30 09:41:51 +02:00
Joas Schilling
008c8dde1a
Ignore custom prefixes which are longer 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-07-27 14:45:22 +02:00
Joas Schilling
960961148e
Fix calculation of default name 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-07-27 14:45:21 +02:00
Joas Schilling
14682dfa7c
Add unit tests 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-07-27 14:45:21 +02:00
Julius Härtl
f77cc11a28
Fix tests 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-07-26 22:26:05 +02:00
Morris Jobke
61397ee091
Merge pull request #9222 from nextcloud/feature/noid/search-for-files-by-comments 
Allow to search files by comments
 2018-07-25 20:30:00 +02:00
Joas Schilling
ac2314e3d0 Add pagination support 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-07-25 18:53:45 +02:00
Joas Schilling
8c7969e730 Allow to search by comments 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-07-25 18:53:44 +02:00
Morris Jobke
8255faada4
Merge pull request #10377 from nextcloud/sccs-cache-iscached 
cache isCached state for scss resources
 2018-07-25 17:33:01 +02:00
Morris Jobke
801e5a4523
Fix unit tests to pass the folder now via the appData dependency 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-07-25 16:57:36 +02:00
Robin Appelman
6686ca9b2a
cache isCached state for scss resources 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-07-24 17:30:39 +02:00
Morris Jobke
9b9d729acf
Merge pull request #10238 from nextcloud/add-support-for-sending-the-password-for-a-share-by-nextcloud-talk 
Add support for sending the password for a share by Nextcloud Talk
 2018-07-24 17:06:56 +02:00
Daniel Calviño Sánchez
d582a66bea Honour "sendPasswordByTalk" property in mail shares 
When a password was set for a mail share an e-mail was sent to the
recipient with the password. Now the e-mail is no longer sent if the
password is meant to be sent by Talk.

However, before the e-mail was not sent when the share was updated but
the password was not changed. Now an e-mail is sent in that case too if
switching from a password sent by Talk to a password sent by mail.

On the other hand, when switching from a password sent by mail to a
password sent by Talk it is mandatory to change the password; otherwise
the recipient would already have access to the share without having to
call the sharer to verify her identity.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-07-24 13:56:29 +02:00
John Molakvoæ (skjnldsv)
f62d4d174d
new tests 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-24 12:21:07 +02:00
Bjoern Schiessle
b81962e3e8
fix unit tests 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-21 15:02:19 +02:00
Roeland Jago Douma
9d94cc1697
Fix unit tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-07-19 23:18:35 +02:00
John Molakvoæ (skjnldsv)
37a4d2bbbc
Php code bump 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-19 22:46:32 +02:00
John Molakvoæ (skjnldsv)
14bc9ffda4
Fixed tests 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-19 08:16:59 +02:00
Morris Jobke
a155f80485
Merge pull request #10230 from nextcloud/feature/shareoverview 
Feature/shares overview
 2018-07-17 12:53:45 +02:00
Morris Jobke
82021b2b1b
Merge pull request #5280 from nextcloud/shared-with-display-name 
sharedWithDisplayName & sharedWithAvatar
 2018-07-13 17:29:57 +02:00
Morris Jobke
14314584ba
Merge pull request #10110 from nextcloud/feature/100500/whats-new-info-users 
Display What's New info to users
 2018-07-13 17:25:51 +02:00
John Molakvoæ (skjnldsv)
a349f2a9f5
Fixed phpunit 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-13 14:47:00 +02:00
Julius Härtl
6da2b7c4f6
Separate fopen into read and write methods 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-07-11 12:08:37 +02:00
Julius Härtl
f1469e34aa
Add fopen method to ISimpleFile 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-07-11 10:29:03 +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
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
Roeland Jago Douma
0cf0bcba61
Fix settings tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-07-04 08:28:33 +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
Bjoern Schiessle
511a34b08f
always enable cloud federation api 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-02 12:43:43 +02:00
blizzz
2f8ebe2b35
Merge pull request #10048 from nextcloud/feature/9760/systemd-logger 
Systemd Logger
 2018-06-30 00:57:30 +02:00
Julius Härtl
77f0633e59
Fix tests 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-06-29 13:35:07 +02:00
Arthur Schiwon
eded07f28f
whitelist audit.log 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-06-29 11:03:13 +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
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
Arthur Schiwon
241b59f458
adjust tests 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-06-29 09:11:04 +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
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
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
93011579fe
Add tests 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-06-27 13:17:43 +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
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
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
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
5455045a9b
Fix direct access to authen page 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-20 08:57:13 +02:00
Roeland Jago Douma
1bb8bc8ff9
Add AuthPublicShareControllerTest 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-20 08:53:38 +02:00
Roeland Jago Douma
61e445da88
Add PublicShareControllerTests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-20 08:53:38 +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