877a8f09b4
Merge pull request #24574 from owncloud/stable9_24568
...
[Stable 9] Fix etag propegation test race condition
2016-05-11 16:29:08 +02:00
8aebab9853
Fix test race condition
...
E-tag propagation replies on the mtime of the file. Order of events:
1. add file 'foo.txt' with content 'bar'
2. Set mtime to now() - 1
3. Check if etag changed.
Now this goes right often when 1 and 2 happen in the same second.
However imagine
1. add file 'foo.txt' with content 'bar' (at t=0.999)
2. Set mtime to now() - 1 (at t=1.001)
Now the mtime will be set to the same time. Thus not chaning the etag.
2016-05-11 14:54:21 +02:00
750aeda8b7
Yo-ho-oh - Murder all band 'o pirates - backport of #24550
2016-05-11 11:22:08 +02:00
a70d6f6a62
Disable pastezone for jquery.fileupload
...
jquery.fileupload offers the [`pastezone`](https://github.com/blueimp/jQuery-File-Upload/wiki/Options#pastezone ) functionality. This functionality is enabled by default and if somebody copy-pastes something into Chrome it will automatically trigger an upload of the content to any configured jquery.fileupload element embedded in the JS.
This implementation triggers some problems:
1. The pastezone is defined globally by default (🙈 ). So if there are multiple fileupload's on a page (such as in the personal settings) then stuff is going to be uploaded to all embedded uploads.
2. Our server code is not able to parse the data. For example for uploads in the files app we expect a file name which is not specified => Just an error is thrown. You can reproduce this by taking a file into your clipboard and in Chrome then pressing <kbd>CTRL + V</kbd>.
3. When copy-pasting some string from MS Office on the personal page a temporary avatar with said content is created.
Considering that this is anyways was never working at all and causes bugs I've set the `pastezone` to `null`. This mens that upload via copy and paste will be disabled.
Lesson learned: Third-party JS libraries can have some weird details.
2016-04-26 14:37:40 +02:00
1087385cae
Merge pull request #24259 from owncloud/stable9-mount-unique
...
[stable9] don't get the config for the same mount multiple times
2016-04-26 14:35:12 +02:00
80a31b7565
Merge pull request #24242 from owncloud/stable9-backport-24052
...
[stable9] Fix LDAP race conditions
2016-04-26 14:34:57 +02:00
b425a0e307
Merge pull request #24236 from owncloud/backport-24214-stable9
...
[stable9] on clone Connection, do not take over the existing LDAP resource
2016-04-25 23:03:05 +02:00
b375086c47
add test
2016-04-25 17:43:52 +02:00
d436326e19
don't get the config for the same mount multiple times
2016-04-25 17:43:40 +02:00
dd415b62f5
Add missing use statement
2016-04-25 13:34:20 +02:00
5b126cde48
Fix LDAP race conditions
...
* getFromCache is wrapped in isCached
* inbetween the two calls the cache entry hits it's TTL
* getFromCache returns null
* this fix only checkes if the returned value is null and
return only non-null values
2016-04-25 13:32:40 +02:00
8ebde1e74d
on clone Connection, do not take over the existing LDAP resource
...
For one, it solves potential conflicts when using the resource. For the
other, one on the login check (the only place where a clone happens
currently) we do not need to rebind after confirming the user's login
was successful.
2016-04-25 12:41:52 +02:00
d2b4bf7682
Merge pull request #24158 from owncloud/encryped-size-progation-9
...
[9.0] dont do optimized size propagation for encrypted files
2016-04-22 15:24:38 +02:00
711641e4a9
Personal calendar should be generated even if the birthday calendar already exists - fixes #24082
2016-04-22 13:03:31 +02:00
27d6852b3e
Merge pull request #24131 from owncloud/dont-transfer-files-to-not-ready-user-stable9
...
[9.0] Introduce isReadyForUser and verify in file transfer ownership
2016-04-22 10:33:18 +02:00
7a2a6ce609
Merge pull request #24163 from owncloud/fix-birthday_calendar-acl-stable9
...
[stable9] Birthday calendar should never have write acl
2016-04-21 23:21:05 +02:00
4e50dd87d5
Birthday calendar should never have write acl - fixes #24154
2016-04-21 16:44:06 +02:00
ed746a7ec2
Merge pull request #24112 from owncloud/backport-24111-chunking-users-in-background-jobs
...
[9.0] Chunk the users correctly in the trashbin and versions background job
2016-04-21 16:21:12 +02:00
440cf335ad
Add unit tests for shared size propagation with encryption
2016-04-21 14:24:49 +02:00
fcebd32e37
Merge pull request #24099 from owncloud/fix_23632_9.0
...
[stable9] init users mount point before recovery
2016-04-20 20:41:35 +02:00
e2a274fdd3
Merge pull request #23831 from owncloud/backport-23511
...
[9.0] sidebar click modification
2016-04-20 20:41:03 +02:00
df544e8dbe
Introduce isReadyForUser and verify in file transfer ownership - fixes #23786
2016-04-20 20:25:22 +02:00
21970c1b19
Chunk the users correctly in the trashbin and versions background job
2016-04-20 10:39:14 +02:00
288b4e21d0
we need to initialize the mount points of the given user before we recover
...
access to his files
2016-04-19 17:17:39 +02:00
1d4d45e91f
Adding VCFExportPlugin
2016-04-10 20:41:44 +02:00
c929c4db84
Merge pull request #23801 from owncloud/fix-23496-master-stable9
...
[stable9] Avoid fatal php error dring cron execution
2016-04-08 14:50:32 +02:00
35d044c121
sidebar click modification
2016-04-07 05:07:15 -04:00
dca6869a89
Merge pull request #23574 from owncloud/sabre-plugin-browser-error-page-stable9
...
[stable9] Sabre plugin browser error page
2016-04-06 15:32:12 +02:00
19541dd1ce
fixes #23496
2016-04-05 14:01:23 +02:00
dd5f38e351
Inject the Mount Manager
2016-04-04 09:10:43 +02:00
d857f7caf2
Unmount the share before deleting it, so we don't try to use it later on
2016-04-04 09:10:33 +02:00
e3cc82df38
Merge pull request #23518 from owncloud/stable9-gdrive-stream-download
...
[stable9] GDrive stream download with RetryWrapper
2016-03-31 23:14:49 +02:00
05fd4f2da0
Merge pull request #23522 from owncloud/stable9-dropbox-stream-download
...
[stable9] Dropbox stream download with RetryWrapper
2016-03-31 21:18:29 +02:00
b6fb3148c2
Revert "Explicitly add the current principal to the acl in case of group sharing"
...
This reverts commit 52f4acf23d
2016-03-31 11:22:47 +02:00
cfe0a6450e
Merge pull request #23673 from owncloud/stable9-fix-sftp-retry-wrapper
...
[stable9] Use RetryWrapper for SFTP storage
2016-03-31 11:12:29 +02:00
ef8b75960c
Handle group shares of addressbooks on v1 as well ... now FINALLY ....
2016-03-31 09:07:36 +02:00
f28817aed5
Fix acls for calendar objects and cards - fixes #23273
2016-03-31 09:07:36 +02:00
cb300d164e
Return proper current-user-principal on v1 endpoints - fixes #23306
2016-03-31 09:05:39 +02:00
e664e582fb
Fix group shares on v1 caldav and carddav - fixes #23328
2016-03-31 09:05:39 +02:00
9bd5fd23e7
Merge pull request #23629 from owncloud/fix-group-sharing-access-stable9
...
Explicitly add the current principal to the acl in case of group sharing
2016-03-31 09:04:07 +02:00
1f7b037a59
Use RetryWrapper for SFTP storage
...
Equivalent to https://github.com/owncloud/core/pull/23442
Required for making encryption work with external storage reliable.
2016-03-30 23:01:42 +02:00
99843c06f9
GDrive stream download with RetryWrapper
2016-03-30 18:43:01 +02:00
ed88f7b8b5
Merge pull request #23664 from owncloud/stable9-share-displayownerfix
...
[stable9] Fix displaying owner before share icon in file list
2016-03-30 18:42:49 +02:00
f981661195
Fix displaying owner before share icon in file list
...
Initial display of owner was missing
2016-03-30 18:10:56 +02:00
57596e1415
Use the shipped cacerts.pem instead of the global one
...
The one we ship may cause problems since Equifax is not included anymore (SHA-1 certs) are deprecated. We should just be consistent here and also use the certificate file which is used by the other calls in the library.
2016-03-30 16:55:26 +02:00
8c9842fbd9
Fix unit test
2016-03-30 10:01:17 +02:00
52f4acf23d
Explicitly add the current principal to the acl in case of group sharing
2016-03-29 19:09:31 +02:00
1f4e824d0b
Add magical regex to catch browsers
2016-03-24 19:03:21 +01:00
7a6d4a3287
In case of exception we return an html page in case the client is a browser
2016-03-24 19:03:21 +01:00
1f4738c372
Return remote shares in oc:share-types Webdav property
...
Fixes web UI to properly display the share status icon when an outgoing
remote share exists
2016-03-24 17:22:09 +01:00
Thomas Müller
Roeland Jago Douma
Thomas Müller
Lukas Reschke
Robin Appelman
Joas Schilling
Morris Jobke
Arthur Schiwon
Björn Schießle
Erik Pellikka
Frank Karlitschek
Vincent Petry