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

9372 commits

Author SHA1 Message Date
Christoph Wurst
ad5a658e0c
Add isTokenLogin argument to post login hook/event 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-01-23 19:47:47 +01:00
Morris Jobke
d549954024
Merge pull request #13766 from nextcloud/fix/13757/urlencode_requesttoken 
Urlencode the requesttoken
 2019-01-23 18:29:18 +01:00
Roeland Jago Douma
e3de4edc51
Urlencode the requesttoken 
Followup of #13757

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-23 16:16:31 +01:00
Jan-Christoph Borchardt
9147a12ee1
Reduce text size of text file preview, fix #13720 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2019-01-23 15:37:08 +01:00
Roeland Jago Douma
ebd9f30d85
Request plain logout url 
By requesting the plain logout url we allow it to be properly cached by
the caching router. We just add the requesttoken manually.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-23 14:06:03 +01:00
Morris Jobke
90e985fe4f
Merge pull request #13739 from nextcloud/cache-cleanup-change 
cleanup shared lock if changing to exclusive lock failed
 2019-01-22 16:11:46 +01:00
Robin Appelman
f69c2d1e84
cleanup shared lock if changing to exclusive lock failed 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-01-22 15:32:48 +01:00
Joas Schilling
92edd40e51
Make RouteConfig strict 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-01-22 14:18:58 +01:00
Joas Schilling
f8b74cf0a5
Allow resources via OCS as well 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-01-22 14:18:58 +01:00
John Molakvoæ
b1d4c3f50b
Merge pull request #13642 from nextcloud/contacts-menu-url-fix 
Allow access to addressbook unique uri
 2019-01-22 13:00:07 +01:00
John Molakvoæ (skjnldsv)
22112bf71d
Allow access to addressbook unique uri 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Co-Authored-By: Joas Schilling <coding@schilljs.com>
 2019-01-22 10:03:56 +01:00
Michael Weimann
b8d25a1247
Remove debug setting 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2019-01-20 11:23:47 +01:00
b108@volgograd
bf167ad3ac Remove duplicate functionality 
This functionality implemented in the next line:

$requestUri = preg_replace('%/{2,}%', '/', $requestUri);
 2019-01-20 13:29:58 +04:00
Joas Schilling
adbeb42c2c
Fix colorizeSvg with transformations that contain a comma (,) 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-01-17 14:24:07 +01:00
Roeland Jago Douma
c77d7d6e79
Move merged-share-backend to webpack 
For #13608

Since we have webpack anyway it make sense to let webpack do the
bundling instead of ourselfs. This leads to minified code (so less
transfer). And the webserver can just handle the request.

As a bonus we get a map file so debugging is easier than with our
JSCombiner stuff.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-16 10:03:21 +01:00
Christoph Wurst
d5927e4d01
Fix integer background job id type error 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-01-15 14:36:03 +01:00
Morris Jobke
c3b22f05bb
Merge pull request #13468 from rummatee/issue13276 
don't close input stream when writing in encrypted file
 2019-01-14 16:21:08 +01:00
Morris Jobke
5a27e54f4b
Merge pull request #13032 from nextcloud/objectstore-write-exists 
upload new files in objectstore to a .part path first
 2019-01-14 11:26:29 +01:00
Michael Weimann
7562eddb69
Fix location source 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2019-01-14 00:12:23 +01:00
Michael Weimann
2cd3fd3dc2
Move server info to theming section 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2019-01-14 00:08:26 +01:00
Michael Weimann
813ff430f1
Implement storing and loading the server info 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2019-01-14 00:08:24 +01:00
Michael Weimann
6993faaf67
Add the "server info" settings 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2019-01-14 00:07:36 +01:00
Michael Weimann
107fab9dfa
Add the "where is your data?" frontend 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2019-01-14 00:07:34 +01:00
Robin Appelman
615fb8cd77
Cache tokens when using swift's v2 authentication 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-01-13 19:59:48 +01:00
Joas Schilling
d8e041a5a2
Don't log parameters on user creation in case of error/exception 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-01-10 10:46:58 +01:00
Florian Schunk
c2f8df0573 don't close input stream when writing in encrypted file 
Signed-off-by: Florian Schunk <florian.schunk@rwth-aachen.de>
 2019-01-10 00:25:07 +01:00
Christoph Wurst
83068c39e5
Update select2, include css 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-01-09 15:02:01 +01:00
Christoph Wurst
1e80259051
Remove core.js 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-01-09 15:02:00 +01:00
Christoph Wurst
208788173d
Npmize (vendor) scripts 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-01-09 15:01:59 +01:00
Roeland Jago Douma
08970aaee2
HttpClient getHeader can return empty string 
Fixes #11999

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-08 14:14:59 +01:00
Roeland Jago Douma
8e914c01c5
Use the real logger in the settings 
Fixes #13285
The wrapper logger should not be used here. But we need the real logger.
Since this in internal we can just pass that on directly.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-07 12:32:07 +01:00
Roeland Jago Douma
8b0f5e02c7
Merge pull request #12621 from nextcloud/td/12224/cleanup_middleware_registering 
Cleanup middleware registering
 2019-01-07 10:48:41 +01:00
Roeland Jago Douma
6980ecf7ab
Throttle with correct metadata 
Fixes #13202

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-04 21:45:44 +01:00
blizzz
aad32771f8
Merge pull request #13161 from nextcloud/perf/fix_comments_in_folder_function 
Rewrite getNumberOfUnreadCommentsForFolder query
 2019-01-03 17:08:52 +01:00
blizzz
68952306aa
Merge pull request #10555 from nextcloud/bugfix/10518/only-check-added-items 
Only enforce schema limits for supported apps
 2019-01-03 14:18:13 +01:00
Roeland Jago Douma
54ff913de6
Cleanup middleware registering 
Fixes #12224

Since we only use the middleware at 1 location it makes no sense to
register them in each and every container.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-03 11:50:01 +01:00
Thomas Citharel
c9b588774b
Allow bracket IPv6 address format inside IPAdress Normalizer 
When run with php's build-in server (for instance on localhost:8080), IP provided through $this->server['REMOTE_ADDR'] is [::1], which is not an acceptable format for \inet_pton. This removes the brackets if there's any.

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-01-03 10:03:46 +01:00
Morris Jobke
273849a7e7
Merge pull request #13074 from nextcloud/improve-decrypt-all 
improve decrypt all process: list files which could not be decrypted
 2019-01-02 16:35:48 +01:00
Julius Härtl
0f911e2d13
Add default values when parsing account data 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-12-23 16:33:02 +01:00
Roeland Jago Douma
d0956c9a42
Followup 12833, gracefully handle the getting of / 
Else this breaks the app page

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-12-21 11:08:19 +01:00
Roeland Jago Douma
f394bf356e
Rewrite getNumberOfUnreadCommentsForFolder query 
Before the joining and filtering removed unkown files. Resulting in
manual queries for all the files with no (unread) comments (the 99%).

Long story short. This will return a list of all the files in the parent
folder with their unread comment count (can be 0). But this makes sure
that the result is properly cached. In the dav handling.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-12-20 20:43:10 +01:00
Roeland Jago Douma
216ad29f05
SCSS cache buster is a combination of apps/theming/scc_vars 
Else on scss files we'd get <file>?v=<hash>?v=<hash2>
This is of course not valid. Now it becomes <file>?v=<hash>-<hash2>

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-12-20 20:33:21 +01:00
Roeland Jago Douma
03fe2b3b81
Use a case insensitive search for email 
Fixes #7084
Now entering wrongly cased email (roeland@ instead of Roeland@) for
password reset etc. Will also work.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-12-20 14:19:35 +01:00
Maxence Lange
5557485aba using the createIndex from FullTextSearchManager 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2018-12-20 08:34:17 +00:00
Roeland Jago Douma
a0ce0824bd
Merge pull request #13116 from nextcloud/fix/only_trust_xforwardedhost_for_trusted_proxies 
Only trust the X-FORWARDED-HOST header for trusted proxies
 2018-12-19 09:47:44 +01:00
John Molakvoæ
6f994be665
Merge pull request #12766 from stalker314314/streaming-options 
Expose Swift Mailer streaming options in config, fixes #12702
 2018-12-18 07:53:45 +01:00
Branko Kokanovic
7cef9b0248 Addressing comments, array() to [] 
Signed-off-by: Branko Kokanovic <branko@kokanovic.org>
 2018-12-17 23:34:55 +01:00
Branko Kokanovic
8101059062 Addressing comments, count to empty 
Signed-off-by: Branko Kokanovic <branko@kokanovic.org>
 2018-12-17 20:02:00 +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
c09fa1ee65
Only check the Oracle schema conditions if the app supports it 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-12-17 13:52:08 +01:00
Joas Schilling
f265657bc6
Only check changed items 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-12-17 13:52:08 +01:00
Bjoern Schiessle
a2eaf48f6f
list files which could not be decrypted 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-12-14 12:00:49 +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
5a9fc01ea6
Merge pull request #12896 from nextcloud/bugfix/12894-use-version-doclink 
Use version from config to generate doclink
 2018-12-10 15:03:42 +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
Daniel Kesselberg
5ee6e5b8c6
Use OC_Util::getVersion instead of getSystemValue 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2018-12-07 11:42:12 +01:00
Daniel Kesselberg
6016d45ca9
Use version to generate docversion 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2018-12-07 11:42:12 +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
Daniel Kesselberg
ec8aefc762
Read openssl error and log 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2018-12-06 21:27:57 +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
Morris Jobke
60681decdd
Merge pull request #12865 from nextcloud/fix/do_not_propogate_in_appdata 
No need to propogate changes in appdata
 2018-12-06 08:50:22 +01:00
Morris Jobke
ecc8068e66
Merge pull request #12857 from nextcloud/fix/emit_write_update_once_on_touch 
Emit write update only once on touch
 2018-12-05 22:54:47 +01:00
Morris Jobke
e808661ca2
Merge pull request #12854 from nextcloud/vcard-repair-uid-fix 
Log and continue on Dav reader failure (repair uid)
 2018-12-05 22:54:10 +01:00
Roeland Jago Douma
72f3882d4b
No need to propogate changes in appdata 
Right now we propogate a lof of changes in appdata. So for example we
propogate each and every preview that is added to the system. This has
no real added value as far as I can tell.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-12-05 22:06:19 +01:00
Roeland Jago Douma
2c6d36105c
Emit write update only once on touch 
When a touch is done (i.e. when creating a new file in the node API)
The hooks contain 'write' and 'touch' (and the operation is touch as
well). This would cause a double write update. Which doesn't make sense.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-12-05 21:29:48 +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
Roeland Jago Douma
f7a1ed8656
Only execute query in propagateChange once 
The second execute statement should be inside the if block. Else it gets
executed twice which makes no sense.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-12-05 20:32:02 +01:00
Morris Jobke
922fd4dd78
Merge pull request #12831 from nextcloud/fix/do_not_update_all_child_shares 
Do not update child all child shares on group share update
 2018-12-04 22:50:34 +01:00
Morris Jobke
d8314b102e
Merge pull request #12624 from nextcloud/bugfix/noid/validate-all-rich-objects 
Validate all rich objects
 2018-12-04 22:48:54 +01:00
Roeland Jago Douma
977e3959eb
Do not update child all child shares on group share update 
Else we overwrite the whole share for link shares. Basically breaking
them.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-12-04 20:55:14 +01:00
Morris Jobke
ea6ea7f4c3
PHP module is named mbstring 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-12-04 17:22:11 +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
Morris Jobke
8abde7702a
Merge pull request #12690 from peterkraume/bug-12689 
Set Referrer-Policy also in addSecurityHeaders()
 2018-11-29 17:46:53 +01:00
Robin Appelman
2c1f6331a4
Add interface to allow storages from opting out of encryption 
As opposed to hard-coding a list of excluded storages

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-11-29 16:31:34 +01:00
Daniel Kesselberg
92675a606e
Add sendmailmode to gui 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2018-11-29 16:02:36 +01:00
Carsten Wiedmann
446d96f3eb
Apply patch from @cwiedmann but drop -oi option for pipe 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2018-11-29 16:02:35 +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
Peter Kraume
79b8703f29 Set Referrer-Policy also in addSecurityHeaders() 
Fix: #12689
Signed-off-by: Peter Kraume <peter.kraume@gmx.de>
 2018-11-27 16:39:06 +01:00
Joas Schilling
695e60228d
Validate all rich objects not only the used ones 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-11-23 12:39:02 +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
Morris Jobke
53418f2795
Merge pull request #12543 from nextcloud/fix/12498/bearer_tokens_are_apptokens 
Bearer tokens are app token
 2018-11-20 11:49:33 +01:00
Morris Jobke
cc6c30e769
Merge pull request #12494 from nextcloud/cache-notfound-id 
return the correct value when trying to get a non existing item from cache by id
 2018-11-20 09:51:18 +01:00
Morris Jobke
8e65f08617
Merge pull request #12500 from nextcloud/swift-object-not-found 
forward object not found error in swift as dav 404
 2018-11-20 09:49:57 +01:00
Roeland Jago Douma
c2beb36bfc
Bearer tokens are app token 
Fixes #12498

This means that we set that it is a proper app token once it is
validated. This will allow the 2FA middleware to just run the same
check.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-11-20 09:23:57 +01:00
Morris Jobke
cef8eadf2a
Add PHPDoc for thrown exception 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-11-19 15:34:07 +01:00
Robin Appelman
35251928d5
forward object not found error in switch as dav 404 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-11-19 11:34:38 +01:00
Julius Härtl
b9f2ce2796
Fix loading of .woff2 files in .htaccess 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-11-18 11:02:20 +01:00
Robin Appelman
5d5cfefd35
return the correct value when trying to get a non existing item from cache by id 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-11-16 17:26:42 +01:00
Christoph Wurst
1b85ef4bf2
Fix string doc type casing 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-11-15 11:57:05 +01:00
Roeland Jago Douma
1783fa7176
Merge pull request #12455 from nextcloud/twofactor-backup-settings 
Don't register twofactor_backup settings as "regular" settings
 2018-11-14 19:35:13 +01:00
Robin Appelman
2482e8ee34
Log invalid settings class 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-11-14 18:04:52 +01:00
Roeland Jago Douma
be5c050acc
Throw exception if decryption fails 
For #11868

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-11-14 12:47:35 +01:00
Robin Appelman
e1a49a223b
Fix SetVcardDatabaseUID when using postgresql 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-11-13 14:26:33 +01:00
Morris Jobke
0c9e411f76
Merge pull request #12418 from nextcloud/bugfix/noid/do-not-show-integrity-warning-always 
Remove outdated integrity warning on each page
 2018-11-12 22:44:55 +01:00
Morris Jobke
3996210307
Merge pull request #12419 from nextcloud/bugfix/noid/group-creation-replace-insertIfNotExist 
Fix UniqueConstraintViolationException while insert into oc_groups
 2018-11-12 21:14:38 +01:00
Morris Jobke
f6fed4d54b
Merge pull request #12420 from nextcloud/bugfix/noid/icons-cacher-not-found 
Ignore icons if the file could not be found
 2018-11-12 21:13:19 +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
84fd81e33f
Fix UniqueConstraintViolationException while insert into oc_groups 
* fixes race condition in insert
* fixes potentiaol deadlock

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-11-12 17:36:35 +01:00
Julius Härtl
4acd053e4d
Do not fail if the icon file doesn't exists 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-11-12 17:31:54 +01:00
Morris Jobke
9e1ec0cf46
Merge pull request #12413 from nextcloud/bugfix/9305/oc_file_locks-unique-constraint 
Fix UniqueConstraintViolationException while insert into oc_file_locks
 2018-11-12 17:27:09 +01:00
Morris Jobke
761ba1801b
Remove outdated integrity warning on each page 
* integrity warning is shown during update and in the admin setup checks
* there is also the plan to retire this old way of notification

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-11-12 16:54:38 +01:00
Morris Jobke
f7e3cf2085
Fix UniqueConstraintViolationException while insert into oc_file_locks 
* fixes #9305 by not being prone to the race condition in insertIfNotExists
* fixes #6899 by not using a query that can result in a deadlock
* replaces the insertIfNotExists call with an insert which is wrapped into a try-catch block
* followup to #12371

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-11-12 15:13:10 +01:00
Morris Jobke
93c62d78db
Fix UniqueConstraintViolationException while insert into oc_filecache 
* fixes #6160 by not being prone to the race condition in insertIfNotExists
* fixes #12228 by not using a query that can result in a deadlock
* replaces the insertIfNotExists call with an insert which is wrapped into a try-catch block

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-11-12 14:43:28 +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
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
Morris Jobke
5273639d0e
Add deprecation message ofr insertIfNotExist 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-11-09 12:13:30 +01:00
Morris Jobke
230e93f575
Catch UniqueConstraintViolationException inside insertIfNotExist 
This is the most common case for the usage of this method.

See also https://github.com/nextcloud/server/issues/12369 and the linked tickets.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-11-09 10:38:20 +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
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
Morris Jobke
add35c7f31
Merge pull request #12284 from nextcloud/fix/1020/search_shared_external 
Properly search the root of a shared external storage
 2018-11-06 18:16:12 +01:00
Morris Jobke
411d2dece5
Merge pull request #11786 from nextcloud/feature/password_confirmation_backend 
Expose password confirmation capabilities in the user backend
 2018-11-06 00:44:18 +01:00
Roeland Jago Douma
0277cd7158
Properly search the root of a shared external storage 
Fixes #1020

When an external storage is shared with you in full the root is ''
(empty). This adds an extra check for an empty jail basically.

Because if the jail is on the empty string. It matches all paths.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-11-05 16:27:43 +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
72b7c9ffa0
Merge pull request #12105 from nextcloud/using-resharing-right-to-display-shares 
Shares are displayed to users with resharing rights
 2018-11-04 21:08:11 +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
2452a3ec73
Properly query the methodreflector 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-11-02 19:20:37 +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
bfb5ef4b29
The identityproof manager should be in Server 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-11-02 19:20:37 +01:00
Roeland Jago Douma
8f833a309a
No need to register it also in the DI Container 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-11-02 19:20:37 +01:00
Roeland Jago Douma
fbd0d0bdcf
The Encryption manager belongs in Server.php 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-11-02 19:20:37 +01:00
Roeland Jago Douma
9c28d2d7c4
SearchResult should be difined in Server as it is a core component 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-11-02 19:20:37 +01:00
Roeland Jago Douma
964ebed86c
The UserSession is constructed in the server 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-11-02 19:20:37 +01:00
Roeland Jago Douma
b2501dbf9a
TimeFactory is already regsitsered in the Server Container 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-11-02 19:20:37 +01:00
Roeland Jago Douma
61adb513fe
Request is already regsitered in the Server container 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-11-02 19:20:36 +01:00
Roeland Jago Douma
421a40e7db
Was already registered in Server 
The DIContainaer will query server anyways if it can't find it

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-11-02 19:20:35 +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
Morris Jobke
337cd25187
Merge pull request #12200 from nextcloud/tech-debt/noid/cleanup-legacy-sharing 
Cleanup some unused sharing methods from the old sharing code
 2018-11-02 14:03:51 +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
Florian Klink
7078a0e53e
Mailer: discover sendmail path instead of hardcoding it to /usr/sbin/sendmail 
`sendmail` can very well be in a path different from
`/usr/sbin/sendmail`.

We already search `$PATH` at `lib/private/Settings/Admin/Mail.php` to
detect whether we want to offer sendmail as a mail transfer method, so
let's be consistent and actually initialize `\Swift_SendmailTransport`
with this path to sendmail, instead of just hardcoding
`/usr/sbin/sendmail`.

Signed-off-by: Florian Klink <flokli@flokli.de>
 2018-11-02 13:57:43 +01:00
Roeland Jago Douma
60bcae55a9
Expose the info to the JS 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-11-02 13:44:45 +01:00
Roeland Jago Douma
603b672a11
Update password confirmation middleware 
If the userbackend doesn't allow validating the password for a given uid
then there is no need to perform this check.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-11-02 13:44:45 +01:00
Roeland Jago Douma
1fd640b40b
Expose the backend of IUser 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-11-02 13:44:45 +01:00
Maxence Lange
77b95ccd12
revert tests 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2018-11-02 12:10:49 +01:00
Maxence Lange
68c44bb642
shares are displayed to users with resharing rights 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2018-11-02 12:09:26 +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
Roeland Jago Douma
2cae91904c
Merge pull request #12194 from nextcloud/fix-path-as-dashboard-is-already-imported 
fix path to DashboardManager, as the class is already imported (minor)
 2018-11-02 08:22:05 +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
Morris Jobke
f28691c26e
Merge pull request #11844 from nextcloud/multiple-link-shares 
allow to create multiple link shares via share api
 2018-11-01 22:36:09 +01:00
Morris Jobke
35e3d40e80
Merge pull request #12188 from nextcloud/revert/9900/revert-wait-for-cron 
Revert "Wait for cron to finish before running upgrade command"
 2018-11-01 21:52:20 +01:00
Maxence Lange
1e2d19ae0d fix path 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2018-11-01 19:14:58 +01:00
Morris Jobke
35a7ea869e
Merge pull request #12152 from brad2014/bugfix/12151/fix-emailtemplate-list-formatting 
Fix issue #12151: fix list formatting by correcting malformed html
 2018-11-01 16:30:22 +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)
d89edb28c4
move migration 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-11-01 15:02:50 +01:00
John Molakvoæ (skjnldsv)
06b3ade9ee
Tests 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-11-01 15:00:49 +01:00
John Molakvoæ (skjnldsv)
56ad1fccc0
Repair registration and autoload bump 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-11-01 15:00:47 +01:00
John Molakvoæ (skjnldsv)
938c63e3a2
Repair Step 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-11-01 14:59:22 +01:00
Bjoern Schiessle
5e90711600 allow to update lables for public link shares 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-11-01 02:18:55 +01:00
Bjoern Schiessle
f377a61f90 allow to add labels to shares 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-11-01 02:15:07 +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
c6a48110bf
allways fall back to fopen for encryption wrapper 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-10-31 21:10:51 +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
3ee7597be0
Merge pull request #12166 from nextcloud/feature/limit_preview_sizes 
Only generate previews in powers of 4 and set min
 2018-10-31 20:25:53 +01:00
Maxence Lange
feeb62a496
wrong method called 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2018-10-31 19:43:18 +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
brad2014
3442ffeb54 Fix bug #12151: fix list formatting by correcting malformed html 
Signed-off-by: Brad Rubenstein <brad@wbr.tech>
 2018-10-30 15:28:55 -07:00
Roeland Jago Douma
a51c8377d4
Merge pull request #12140 from nextcloud/fix/expired_token_throttler 
Expired tokens should not trigger bruteforce protection
 2018-10-30 20:17:03 +01:00
Roeland Jago Douma
ddd39f9dc3
Merge pull request #12056 from nextcloud/interfaces-fulltextsearch-2 
Public interfaces FullTextSearch
 2018-10-30 19:53:01 +01:00
Roeland Jago Douma
2223d19997
Error out early on an expired token 
Fixes #12131

If we hit an expired token there is no need to continue checking. Since
we know it is a token.

We also should not register this with the bruteforce throttler as it is
actually a valid token. Just expired. Instead the authentication should
fail. And buisness continues as usual.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-30 19:30:45 +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
Maxence Lange
750196aa7f public interfaces FullTextSearch 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
-@return mixed

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
Merge remote-tracking branch 'origin/interfaces-fulltextsearch-2' into interfaces-fulltextsearch-2

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2018-10-30 18:24:15 +01:00
Roeland Jago Douma
abbb946bbb Propegate hide download state in share provider 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-30 15:18:55 +01:00
Roeland Jago Douma
bc960bae02 Extend IShare to show hide download state 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-30 15:18:55 +01:00
Roeland Jago Douma
c1698948b8
Merge pull request #12130 from nextcloud/fix/reset_bruteforce_oauth 
Reset bruteforce on token refresh OAuth
 2018-10-30 14:26:50 +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
Roeland Jago Douma
75456b057d
Reset bruteforce on token refresh OAuth 
When using atoken obtained via OAuth the token expires. Resulting in
brute force attempts hitting the requesting IP.

This resets the brute force attempts for that UID on a valid refresh of
the token.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-30 11:21:27 +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
cb463d73d5
Add name field to mail and remote results 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 10:19:36 +01:00
Julius Härtl
7a65779316
Add local share if remote cloud id matches a local user ones 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 10:19:35 +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
870e01518d
Add type to Remote and Mail plugins 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 10:19:34 +01:00
Julius Härtl
a1c6e44700
Add collaborators uuid to properly render the avatar and for later grouping 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 10:19:33 +01:00
Julius Härtl
d7caf841df
Filter out generic remote result for local users 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 10:19:33 +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
Morris Jobke
c9e6a99637
Merge pull request #12085 from nextcloud/add-gss-to-excluded-backends 
add global site selector as user back-end which doesn't support password confirmation
 2018-10-30 10:16:07 +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
Morris Jobke
0999f07964
Merge pull request #12052 from nextcloud/bugfix/11594/fix-setup-check-trusted-proxies 
Fix setup check trusted proxies
 2018-10-29 23:38:37 +01:00
Morris Jobke
963d968f06
Merge pull request #12113 from nextcloud/fileinfo-getextension 
Add getExtension() to FileInfo
 2018-10-29 17:23:27 +01:00
Robin Appelman
e5c3e4b76f
Add getExtension() to FileInfo 
this is a fairly common operation so it makes sense to prevent having
to repeatedly implement it.

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-10-29 15:24:02 +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
aec0a6c096
Fix icon cacher url matching 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-29 12:09:30 +01:00
Bjoern Schiessle
85d9f06cb8
add global site selector as user back-end which doesn't support password confirmation 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-10-27 15:43:51 +02:00
Daniel Kesselberg
986f4df2a5
Add REMOTE_ADDR to getHeader 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2018-10-25 22:26:49 +02: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
Julius Härtl
0b2ef7e608
Remove default which didn't work 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-25 11:58:00 +02:00
Julius Härtl
152fb08288
Properly track data urls as well 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-25 11:58:00 +02:00
Julius Härtl
845f1b67d5
Directly embed icons into the icon-vars css file 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-25 11:58:00 +02:00
Roeland Jago Douma
0fb070b5b4
Allow chunked uploads even if your quota is not sufficient 
Fixes #11485

This allows uploads to shared folders.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-24 20:29:00 +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
Julius Härtl
86f29ffdbc
Register IAccountManager as a service 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-24 12:53:43 +02:00
Julius Härtl
3b3824c486
Use empty string instead of null 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-24 12:53:18 +02:00
Morris Jobke
4ad27260a9
Merge pull request #11439 from nextcloud/trash-modular-api 
Modular trashbin api
 2018-10-23 17:11:16 +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
Morris Jobke
92b5b54fa6
Merge pull request #11966 from nextcloud/csp/safari12-support 
Add nonce for Safari 12+
 2018-10-23 16:22:58 +02:00
Morris Jobke
171fe69db7
Merge pull request #11932 from nextcloud/font-nunito 
Change typeface to Nunito
 2018-10-23 15:14:10 +02:00
Roeland Jago Douma
a11bef25a2
Merge pull request #11964 from nextcloud/bug/11919/do_not_always_fallback 
Forwarded ExpiredTokenException
 2018-10-23 15:07:19 +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
Jan-Christoph Borchardt
3259d427ee
Use correct typeface for txt previews 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2018-10-23 13:13:21 +02:00
Morris Jobke
2a17281cb6
Load apps/APP/l10n/*.js and themes/THEME/apps/APP/l10n/*.js 
Before it quit right after finding the theme version of the l10n file which results in a not translated part of the UI.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-10-22 11:02:25 +02:00
Roeland Jago Douma
0fdc65a15c
Add nonce for Safari 12+ 
As far as I can tell this should work now.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-21 20:48:12 +02:00
Roeland Jago Douma
34f5f4091e
Catch more occurences where ExpiredTokenException can be thrown 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-21 14:37:08 +02:00
Roeland Jago Douma
b3a92a4e39
Expired PK tokens should not fall back to legacy tokens 
Fixes #11919

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-21 14:34:29 +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
blizzz
5daa4f27e1
Merge pull request #11882 from nextcloud/feature/noid/consider-net-connection 
Do not try to contact lookup server without internet connection or URL
 2018-10-18 18:24:41 +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
Christoph Wurst
4f75173f11
Remove unreliable 2FA state message on personal 2FA settings page 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-10-18 09:51:08 +02:00
Robin Appelman
6c5ea0ceca
pass Cache::getMoveInfo along cache wrappers 
fixes cross storage move in some cases

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-10-17 14:57:33 +02:00
Robin Appelman
565d830c11
expose storagefactory in server container 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-10-17 14:57:30 +02:00
Robin Appelman
ea42474b31
use name in fileinfo if set 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-10-17 14:56:51 +02:00
Morris Jobke
b458ed9c82
Properly escape column name in "createFunction" call 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-10-16 15:24:02 +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
Roeland Jago Douma
5aaa8a8b58
Merge pull request #11740 from nextcloud/feature/noid/account-api 
Public API to get user acocunt data
 2018-10-15 21:46:09 +02:00
Maxence Lange
dfd4782dfc
include dashboard into core 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
Merge remote-tracking branch 'origin/interface-dashboard' into interface-dashboard

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
moving data object to OCP

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
update autoload files

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
+@since

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2018-10-15 19:59:27 +02:00
Roeland Jago Douma
6f835aff31
Merge pull request #11838 from nextcloud/bugfix/noid/fix-default-types-of-members 
Fix default types of activity event member variables
 2018-10-15 14:09:44 +02:00
Julius Härtl
d05080f56a
Add \OCP\Account public API 
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
Joas Schilling
909745acfd
Fix default types of activity event member variables 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-10-15 11:45:17 +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
Joas Schilling
16817f3743
Make activity events strict 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-10-12 12:12:12 +02:00
Roeland Jago Douma
51e96dc3f6
Normalize getUnjailedPath 
Fixes #11637

If we do not normalize the unjailed path we might end up with a path
like files/user/folder/. which can break on objectstores

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-11 14:43: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
Morris Jobke
0acae1d4aa
Merge pull request #11719 from nextcloud/techdebt/noid/allow-to-mock-new-datetime 
Allow to inject/mock `new \DateTime()` similar to time()
 2018-10-10 14:54:15 +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
Roeland Jago Douma
a9f4817b65
Merge pull request #11622 from nextcloud/feature/11617 
Add function to generate urls for OCS routes
 2018-10-09 20:50:37 +02:00
Bjoern Schiessle
9e76d4049a
adjust tests 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-10-09 18:31:33 +02:00
Bjoern Schiessle
3fa13e791e
always query the lookup server in a global scale setup and have a nicer label 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-10-09 17:47:29 +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
Joas Schilling
840dd4b39c
Allow to inject/mock new \DateTime() similar to time() 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-10-09 15:38:31 +02:00
Joas Schilling
ea21aa3f7a
Use numeric placeholders if there are multiple, so that RTL languages can operate better 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-10-09 14:32:14 +02:00
Morris Jobke
ea411ccec4
Merge pull request #11677 from nextcloud/feature/appdata_previews 
Allow the creationg of previews of files stored in appdata
 2018-10-09 11:47:14 +02:00
Roeland Jago Douma
ade61d8b43
Allow the creationg of previews of files stored in appdata 
To allow us to create previews of files stored in appdata we need to
construct the view differently.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-08 19:37:45 +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
f29189f200
Rename admin security settings template 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-10-08 10:45:28 +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