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

41661 commits

This branch
This branch
All branches
Author SHA1 Message Date
Morris Jobke
45971879f5
Merge pull request #6668 from nextcloud/fix_6621 
Remove avatar on user deletion
 2017-12-11 18:16:14 +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
Robin Appelman
5ce69e7c42
Add some more tests for ocs remote api 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-12-08 16:37:14 +01:00
Robin Appelman
f1eb55fad7
refuse to use http if we know a remote has https 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-12-08 16:37:14 +01:00
Robin Appelman
78a24e3b81
validate user response 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-12-08 16:37:14 +01:00
Robin Appelman
8b01176f60
add more typehints 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-12-08 16:37:14 +01:00
Robin Appelman
5133a31d3c
Add public api for remote api 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-12-08 16:37:14 +01:00
Robin Appelman
74b5ce8fd4
Some tests for the remote cloud api 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-12-08 16:34:33 +01:00
Robin Appelman
ac2c26ffcb
Add api clients for talking to remote clouds 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-12-08 16:34:33 +01:00
Morris Jobke
66f523e13f
Better center the letter and use semibold font type 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-12-08 16:24:31 +01:00
Morris Jobke
6aac1ffa33
Merge pull request #7115 from nextcloud/fix-flow 
Fix flow
 2017-12-08 16:01:57 +01:00
Morris Jobke
4c19e75f5d
Merge pull request #7390 from nextcloud/update-php-info 
Show hint that PHP 5.6 will not be supported in Nextcloud 14 anymore
 2017-12-08 15:33:27 +01:00
Morris Jobke
5724e75827
Merge pull request #7252 from nextcloud/send-comment-on-enter 
Submit comments with Enter and use Shift+Enter for new lines
 2017-12-08 15:31:10 +01:00