Commit Graph

41831 Commits

Author SHA1 Message Date
Roeland Jago Douma 53400a1972
Properly detect if fopen fails for txt previews
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-11 20:37:18 +01:00
Roeland Jago Douma 179be8d95c
Merge pull request #6637 from nextcloud/contactsstore_public_api
Make ContactsStore a public API
2017-12-11 20:04:28 +01:00
Roeland Jago Douma bd80795d59
Merge pull request #7431 from nextcloud/app-content-list-fixes
App content list fixes
2017-12-11 20:02:36 +01:00
Roeland Jago Douma f18ac08c20
Merge pull request #7450 from nextcloud/log_correct_self_signed
Catch the errors related to untrusted self signed certificates for federation
2017-12-11 19:15:31 +01:00
John Molakvoæ (skjnldsv) bb04e10651
Fixed width on app details
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-12-11 18:22:21 +01:00
Tobia De Koninck cecfc28ebd
Register ContactsStore using alias + run autoloaderchecker.sh
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
2017-12-11 18:19:24 +01:00
Tobia De Koninck 78049af02c
Add @since annotation and add missing new line
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
2017-12-11 18:18:58 +01:00
Tobia De Koninck f6ef779f97
Make ContactsStore a public API
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
2017-12-11 18:18:58 +01:00
Morris Jobke 45971879f5
Merge pull request #6668 from nextcloud/fix_6621
Remove avatar on user deletion
2017-12-11 18:16:14 +01:00
Roeland Jago Douma 2c2e1c4c7a
Catch the errors related to untrusted self signed certificates for federation
* Added tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-11 18:14:01 +01:00
John Molakvoæ (skjnldsv) a1b4869774
Fixed scrolling in app list
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-12-11 17:26:43 +01:00
John Molakvoæ (skjnldsv) d3c324cc9b
Fixed popover menu in entry
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-12-11 17:26:43 +01:00
Morris Jobke ba3c608a00
Merge pull request #6590 from nextcloud/dav-create-activities-for-publishing
Create activities for (un)publishing calendar events
2017-12-11 17:13:11 +01:00
blizzz 4fc8984d89
Merge pull request #6079 from nextcloud/fix-antivirus
Parse Sabre Exception in OC.Files.Client and file-upload
2017-12-11 17:12:02 +01:00
Robin Appelman 05d2f61a59
handle not found mounts when cleaning avatars
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-12-11 16:56:10 +01:00
Morris Jobke d0ec0ce71c
Merge pull request #6715 from go2sh/fix-freebusy
Fix the FreeBusy request handling for proper scheduling support
2017-12-11 16:51:15 +01:00
Roeland Jago Douma effde616eb
Fix tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-11 16:34:28 +01:00
Morris Jobke c76c7a96fc
Update wording
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-11 16:28:40 +01:00
Thomas Citharel 4c32de22bb
Create activities for (un)publishing calendar events
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-12-11 16:28:40 +01:00
Roeland Jago Douma 10aa287463
Remove avatar on user deletion
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-11 16:07:06 +01:00
Roeland Jago Douma 949fc50cc5
Dispatch event on User predelete
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-11 16:05:38 +01:00
Georg Ehrke 728248bd8d
updated autoloaders for dav
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-12-11 16:04:55 +01:00
Georg Ehrke 6802e2b59a
Principal search: Take sharing settings into account
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-12-11 16:04:55 +01:00
Georg Ehrke f543039858
exclude shared calendars from freeBusy
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-12-11 16:04:55 +01:00
Christoph Seitz 787e3d51b4
Fix functions to search for principals in the backend.
Add a "searchPrincipals" function to the NC principal backend.
Fix the "findByUri" function to respect the prefixPath.

Signed-off-by: Christoph Seitz <christoph.seitz@posteo.de>
2017-12-11 16:04:55 +01:00
blizzz 80b27fdb93
Merge pull request #7342 from nextcloud/fix_carddav_converter
CardDAV convertor check should not be to wide
2017-12-11 16:03:07 +01:00
Morris Jobke 07e6387b31
Merge pull request #7449 from nextcloud/fix-setup
Fix 500 on setup page
2017-12-11 16:00:11 +01:00
Morris Jobke 5bc8c94a11
Merge pull request #7249 from nextcloud/guest-flex
Guest flex instead of absolute
2017-12-11 15:41:53 +01:00
Morris Jobke 7fdc4b5262
Merge pull request #7418 from nextcloud/ldap-fix-cache-retrieved-user
ensure that users are cached when they are retrieved
2017-12-11 15:39:24 +01:00
Roeland Jago Douma e8acf448eb
Merge pull request #6651 from nextcloud/remote-cloud-client
Add api clients for talking to remote clouds
2017-12-11 15:28:39 +01:00
Roeland Jago Douma e47137c7d4
Merge pull request #6682 from nextcloud/dav-mimetype-fallback
Fallback to filename based detection if the remote dav server doesn't…
2017-12-11 15:28:05 +01:00
Roeland Jago Douma c1fcd6fc98
Merge pull request #7324 from nextcloud/no-sorters-no-instances
don't create sorter instances when none was requested
2017-12-11 15:27:44 +01:00
Morris Jobke 7c39711798
Merge pull request #7427 from nextcloud/fix-white-color-in-emails
Fix email buttons for white theme
2017-12-11 15:16:28 +01:00
Morris Jobke 5b20600da9
Merge pull request #7313 from nextcloud/ensure-that-x-oc-mtime-header-is-an-integer-with-chunked-uploads
Ensure that X-OC-MTime header is an integer with chunked uploads
2017-12-11 15:07:05 +01:00
Morris Jobke ce69d9ec71
Fix 500 on setup page
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-11 15:03:55 +01:00
Morris Jobke f4d7afc950
Merge pull request #7244 from nextcloud/css-file-suffix-with-apps-versions
Use apps versions to generate suffix when possible
2017-12-11 14:51:21 +01:00
Morris Jobke cce4c285db
Fix email buttons for white theme
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-11 14:33:54 +01:00
Morris Jobke 52e7d05163
Fix syntax error
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-11 14:24:23 +01:00
John Molakvoæ (skjnldsv) 1ac31260ac
Fixed phpdoc and function type
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-12-11 14:24:23 +01:00
John Molakvoæ (skjnldsv) f018bfc7de
Fixed md5 generation and added fallback for scss requests
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-12-11 14:24:23 +01:00
John Molakvoæ (skjnldsv) 820e7b5aba
Use apps versions to generate suffix when possible
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-12-11 14:24:23 +01:00
Roeland Jago Douma 40633c5e54
CardDAV convertor check should not be to wide
Case: email is set to null, but the avatar is set. In the old case the
email would set $emptyValue but $noImage would still be false. This we
would set the empty string as email.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-11 11:58:02 +01:00
Nextcloud bot 8ed728c1a2
[tx-robot] updated from transifex 2017-12-11 01:10:20 +00:00
Nextcloud bot a684f033bd
[tx-robot] updated from transifex 2017-12-10 01:10:25 +00:00
Nextcloud bot 855acc727b
[tx-robot] updated from transifex 2017-12-09 01:10:24 +00:00
Morris Jobke ed7beb929e
Merge pull request #6876 from nextcloud/always_img_avatar
Always generate avatar
2017-12-08 23:58:17 +01:00
Morris Jobke 79ed0d105d
Merge pull request #7426 from nextcloud/Abijeet-master
Allows adding of hex color to the theme-color
2017-12-08 23:49:52 +01:00
Morris Jobke 3f34861d58
Merge pull request #7433 from nextcloud/fix-constructor-spy-in-unit-test-with-sinon-4.1.3
Fix constructor spy in unit test with Sinon 4.1.3
2017-12-08 23:49:11 +01:00
Daniel Calviño Sánchez b70b38ce31 Fix constructor spy in unit test with Sinon 4.1.3
When a constructor is spied using Sinon it is wrapped by a proxy
function, which calls the original constructor when invoked. When "new
Foo()" is executed a "Foo" object is created, "Foo" is invoked with the
object as "this", and the object is returned as the result of the whole
"new" expression.

Before Sinon 4.1.3 the proxy called the original constructor directly
using the "thisValue" of the spied call; "thisValue" was the object
created by the "new" operator that called the proxy. The proxy assigned
"thisValue" to "returnValue", so it was also the value returned by the
proxy and, in turn, the value returned by the whole "new" expression.

Since Sinon 4.1.3 (see pull request 1626) the proxy calls the original
constructor using "new" instead of directly. The "thisValue" created by
the outermost "new" (the one that called the proxy) is no longer used by
the original constructor; the internal "new" creates a new object, which
is the one passed to the original constructor and returned by the
internal "new" expression. This object is also the value returned by the
proxy ("returnValue") and, in turn, the value returned by the whole
outermost "new" expression.

Thus, now "returnValue" should be used instead of "thisValue" to get the
object created by the spied constructor.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-12-08 21:26:45 +01:00
blizzz 83509b0fd3
Merge pull request #7334 from nextcloud/feature/noid/language-depending-skeleton-directory
Allow `{lang}` as a placeholder in the skeleton directory
2017-12-08 18:19:01 +01:00