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

41539 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nextcloud bot
49ec86a81f
[tx-robot] updated from transifex 2017-11-30 01:13:19 +00:00
Morris Jobke
87aa0723f8
Merge pull request #7343 from nextcloud/fix_exception_on_unreachable_server_take2 
Actually set the status so we don't cause another exception
 2017-11-29 21:13:55 +01:00
Roeland Jago Douma
d24b6866b1
Actually set the status so we don't cause another exception 
* And add tests so I don't mess up again

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-11-29 16:37:54 +01:00
Roeland Jago Douma
a9eb0d4a40
Merge pull request #7338 from nextcloud/fix_exception_on_unreachable_server 
Do not log Exception if a connection error occured
 2017-11-29 16:03:23 +01:00
Roeland Jago Douma
f03aa0480a
Merge pull request #7316 from nextcloud/fix-silent-conflicts-due-to-merging-7256-after-7251 
Fix silent conflicts due to merging #7256 after #7251
 2017-11-29 15:38:24 +01:00
Roeland Jago Douma
6097b74970
Merge pull request #7333 from nextcloud/mario-readme-patch 
Update README.md
 2017-11-29 14:19:09 +01:00
Roeland Jago Douma
79554a29e0
Do not log Exception if a connection error occured 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-11-29 13:06:32 +01:00
Mario Đanić
3c0d6ccbed
Update README.md 
authentification is not a real word :)
 2017-11-29 09:09:11 +01:00
Nextcloud bot
095eba0aa3
[tx-robot] updated from transifex 2017-11-29 01:10:12 +00:00
blizzz
0597cca596
Merge pull request #7327 from nextcloud/bugfix/7325/access-list-regression-for-not-current-accesss 
Only in case of $currentAccess the array uses the user id as index
 2017-11-28 17:57:44 +01:00
Joas Schilling
80b34f5f7d
Only in case of $currentAccess the array uses the id as index 
Otherwise its a normal string[] with the user ids, in that
case the array_merge did it's job just fine, apart from it
not being deduplicated.
The array+array is only needed when the user id is the key,
so integer only user ids are kept as they are instead of being
reindexed.

Regression from 3820d6883d

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-11-28 17:17:51 +01:00
Joas Schilling
2a01c0f3f6
Fix current access list test and add one for $currentAccess === false 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-11-28 17:17:34 +01:00
Daniel Calviño Sánchez
0c45778219 Fix silent conflicts due to merging #7256 after #7251 
Although #7256 was merged cleanly some of the changes really conflicted
with those introduced by the last commit of #7251, and this broke the
appearance of the author row of comments. This commit fixes those silent
conflicts and restores the appearance of the author row.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-11-28 02:35:39 +01:00
Nextcloud bot
a0ce2c1204
[tx-robot] updated from transifex 2017-11-28 01:09:52 +00:00
Morris Jobke
7d9e475434
Merge pull request #7303 from nextcloud/fix-contact-menu 
Fix contacts menu height for Safari
 2017-11-27 18:30:06 +01:00
Morris Jobke
3f7267e0e9
Merge pull request #6901 from nextcloud/bugfix/4014/catch_parsing_error 
catch errors when parsing calendar data for calendar query requests
 2017-11-27 17:50:37 +01:00
Morris Jobke
3e1860e3d6
Merge pull request #7305 from nextcloud/log-level-for-log-extending 
Pass log level to log reporters
 2017-11-27 17:49:46 +01:00
Lukas Reschke
4d200851f9
Merge pull request #7292 from Neraste/fix/4789_disabled_users 
Fix #4789: Group admins cannot see disabled users
 2017-11-27 17:29:59 +01:00
Morris Jobke
573551253e
Merge pull request #7308 from nextcloud/do-not-log-InvalidSyncToken 
Log InvalidSyncToken on DAV in debug level
 2017-11-27 17:27:41 +01:00
Lukas Reschke
5cc8ea8feb
Merge pull request #7307 from nextcloud/do-not-log-not-implemented-dav 
Log NotImplementedException on DAV in debug level
 2017-11-27 17:25:56 +01:00
Georg Ehrke
ea117bac31
catch errors when parsing calendar data for calendar query requests 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-11-27 17:14:18 +01:00
Morris Jobke
132764bff5
Pass log level to log reporters 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-27 16:46:47 +01:00
blizzz
f700cd14fa
Merge pull request #7222 from nextcloud/fix-filerow-avatars 
Fix filerow avatars
 2017-11-27 16:46:11 +01:00
Morris Jobke
4a63727ed9
Merge pull request #7210 from nextcloud/pg10 
add postgresql 10 compatibility to dbal
 2017-11-27 16:40:58 +01:00
Morris Jobke
88905c6293
Log InvalidSyncToken on DAV in debug level 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-27 16:37:11 +01:00
Morris Jobke
26a5fff423
Log NotImplementedException on DAV in debug level 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-27 16:17:01 +01:00
Lukas Reschke
b331c67859
Bump thirdparty ref 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-11-27 15:20:42 +01:00
blizzz
e428ef9d75
Merge pull request #7256 from nextcloud/fix-cursor-for-avatar-and-user-names-in-comments 
Fix cursor for avatar and user names in comments
 2017-11-27 15:14:40 +01:00
Morris Jobke
cfae590ac9
Merge pull request #7266 from nextcloud/fix-input-field-not-disabled-while-a-comment-is-being-sent 
Fix input field not disabled while a comment is being sent
 2017-11-27 13:40:03 +01:00
Morris Jobke
152b2824dc
Fix contacts menu height for Safari 
* fixes #5119
* in Safari the input field was 38px in height and not 34px like in all other browsers

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-27 13:32:05 +01:00
Lukas Reschke
e02229e412
Merge pull request #7246 from william-p/Add_html5_audioplayer_public 
Add HTML5 audio player in public view
 2017-11-27 12:32:21 +01:00
Morris Jobke
7bb42438fa
Merge pull request #7280 from nextcloud/fix-working-icon-position-when-sending-or-deleting-a-comment 
Fix working icon position when sending or deleting a comment
 2017-11-27 12:19:21 +01:00
Morris Jobke
c5446ebd9a
Merge pull request #7251 from nextcloud/contact-menu-position-fix 
Fixed contact menu position on comments
 2017-11-27 12:14:30 +01:00
Lukas Reschke
fb1a92b07d
Merge pull request #7295 from nextcloud/remove-unused-method 
Remove unused mimetype detection method in OC_Image
 2017-11-27 11:55:20 +01:00
Lukas Reschke
d15ca9ffaf
Replace with non-deprecated JS call 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-11-27 11:53:24 +01:00
Lukas Reschke
8ccb486876
Merge pull request #7264 from nextcloud/cache-fetched-apps 
Cache fetched apps in update check
 2017-11-27 11:48:59 +01:00
Morris Jobke
f0d809fdde
Merge pull request #7298 from nextcloud/fix-wording 
Fix a sentence in the README
 2017-11-27 11:32:03 +01:00
Morris Jobke
4b73ddc9ce
Merge pull request #6437 from nextcloud/support-mail-send-in-share 
Add support for `\OCP\Share\IShare::getMailSend` back
 2017-11-27 11:29:38 +01:00
Morris Jobke
7a88c34c2c
Fix a sentence in the README 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-27 11:23:56 +01:00
Joas Schilling
3d7489cfd6
Merge pull request #7297 from nextcloud/fgsl-master 
Loss of performance on Login after upgrade from NC10 + LDAP to NC 12+ LDAP
 2017-11-27 11:11:00 +01:00
Morris Jobke
a51a8fbcaf
Federation actually sends an email via Share 2.0 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-27 10:54:40 +01:00
Morris Jobke
1063b99406
Merge pull request #6356 from nextcloud/rename-ldap 
Rename "LDAP" to "LDAP/AD-integration"
 2017-11-27 10:31:11 +01:00
Roeland Jago Douma
be1006b607
Merge pull request #7296 from nextcloud/increase-phan-checks 
Harden phan checks to catch more errors
 2017-11-27 10:14:06 +01:00
Marius Blüm
05039f1f71
Rename "LDAP" to "LDAP/AD-integration" 
Signed-off-by: Marius Blüm <marius@lineone.io>
 2017-11-27 09:49:28 +01:00
Lukas Reschke
1c25919cf1
Proper handle null cases and default to true 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-11-27 09:38:39 +01:00
Lukas Reschke
56a2512581
Add support for \OCP\Share\IShare::getMailSend back 
This adds back the support for `\OCP\Share\IShare::getMailSend`, one example is creating bulk shares via API which where previously blocking due to the share notification emails.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-11-27 09:38:39 +01:00
Lukas Reschke
9ac878b6cb
Adjust tests for added lastCheck time 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-11-27 09:25:03 +01:00
Flávio Gomes da Silva Lisboa
5ca9a7d6bc
Loss of performance on Login after upgrade from NC10 + LDAP to NC 12 + LDAP #6732 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-11-27 09:22:44 +01:00
Morris Jobke
655c0cb40d
Merge pull request #7178 from nextcloud/comradekingu-patch-1 
No "to equal to" "We" or "Our", properly
 2017-11-27 09:19:29 +01:00
Morris Jobke
4af12dcab1
Fix unit tests 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-27 08:50:44 +01:00