mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
40,939 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

16819 Commits

Author SHA1 Message Date
Nextcloud bot 3f6692ee24
[tx-robot] updated from transifex 2017-09-10 00:08:23 +00:00
Nextcloud bot 194f880073
[tx-robot] updated from transifex 2017-09-08 00:08:16 +00:00
Nextcloud bot 9959560649
[tx-robot] updated from transifex 2017-09-07 00:08:23 +00:00
Morris Jobke 8e6d86a862 Merge pull request #5304 from nextcloud/bugfix/2855/dont_send_invitations_for_past_events 
don't send invitation emails for past events
 2017-09-06 22:48:46 +02:00
Robin Appelman ccc41aeddd
adjust tests to new failed storage handling 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-09-06 17:12:19 +02:00
Morris Jobke 6f7d200838 Merge pull request #6370 from nextcloud/fix-alternative-logins 
Fix layout of alternative login buttons
 2017-09-06 10:22:04 +02:00
Morris Jobke f5aea79bd7
Fix layout of alternative login buttons 
* fixes #6367

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-09-06 10:21:11 +02:00
Morris Jobke 1724fed8c5 Merge pull request #5415 from nextcloud/search-cache-node 
cache nodes from search results
 2017-09-06 10:16:01 +02:00
Nextcloud bot 9d930210ee
[tx-robot] updated from transifex 2017-09-06 00:08:21 +00:00
Joas Schilling 521ede8f5f
Allow translations of the comments activity in the emails too 
Message and object data is not available on emails atm,
so we can not use them either...

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-09-05 18:10:32 +02:00
Morris Jobke 15cd21d252 Merge pull request #6358 from nextcloud/fix-mixup-of-id-and-name 
Set the meta data before everything
 2017-09-05 16:08:57 +02:00
Morris Jobke cebbb1633a Merge pull request #5642 from tobru/fix/groupOfUniqueNames_in_Wizard 
recognize groupOfUniqueNames as valid LDAP group object
 2017-09-05 13:33:15 +02:00
Georg Ehrke a1df91da9d
Sabre/VObject returns DateTimeImmutable, not a simple DateTime 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-09-05 13:13:37 +02:00
Georg Ehrke 86f28669fc
don't send invitation emails for past events 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-09-05 13:13:37 +02:00
Morris Jobke ff93dd7eb1 Merge pull request #5466 from jlehtoranta/ldap-connectivity-fixes 
LDAP Connectivity Fixes
 2017-09-04 18:31:32 +02:00
Joas Schilling 6dbb64c4a2
Merge setMetaData into constructor 
This ensures that the meta data is set in the beginning

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-09-04 15:07:41 +02:00
Julius Härtl 63d1da50b4
Cleanup theming styles to fit the new login page 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-09-04 14:31:57 +02:00
Julius Härtl 8f10cee3ff
Fix tests for primary element color 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-09-04 14:30:46 +02:00
Julius Härtl da5662c454
Use separate element color in theming 
This way we can use a grey color when the primary color is to bright

Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-09-04 14:30:46 +02:00
Morris Jobke 30ca3b70ed Merge pull request #6196 from nextcloud/downstream-26539-2 
Handle invalid ext storage backend to keep mount point visible
 2017-09-04 14:17:28 +02:00
blizzz 2060ff591b Merge pull request #6120 from nextcloud/public_upload_share_api_fix 
Public upload share permission handling
 2017-09-04 12:43:02 +02:00
Roeland Jago Douma f0158e42e9 Merge pull request #6309 from nextcloud/new-dav-event 
add a new dav event to allow apps to register their own sabredav plugins
 2017-09-04 12:12:46 +02:00
Morris Jobke 5927a63680 Merge pull request #6351 from nhirokinet/master 
not to backquote LIMIT on CalDavBackend.php
 2017-09-04 12:10:57 +02:00
Robin Appelman e9a58f8579
show storage as unavailable in the file list 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-09-04 11:54:13 +02:00
Robin Appelman 68ee79b595
set the exception for failedstorage 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-09-04 11:54:13 +02:00
Morris Jobke 442d4ed24a
Use the FailedStorage instead 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-09-04 11:54:13 +02:00
Vincent Petry 5df5b9c8b1
Handle invalid ext storage backend to keep mount point visible 
Keep mount point visible and also ext storage config visible when
dealing with configs relating to storage backends or auth mechanisms
that were provided by an app that is currently disabled.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-09-04 11:54:08 +02:00
Morris Jobke d5cba5eeaa Merge pull request #6221 from nextcloud/fav_share_api_fix 
Correctly format OCS response with favorites
 2017-09-04 08:46:09 +02:00
nhirokinet baba99a7e6 not to backquote LIMIT on CalDavBackend.php 2017-09-03 23:51:49 +09:00
Julius Härtl 0a49757535
Change invertion threshold to 55% 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-09-02 21:48:14 +02:00
Nextcloud bot 27c6dc9657
[tx-robot] updated from transifex 2017-09-02 00:08:29 +00:00
Nextcloud bot 45f687a279
[tx-robot] updated from transifex 2017-09-01 00:08:27 +00:00
Arthur Schiwon ab92e2ee14
listen to deletion hooks for proper handling, adjust and add tests 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-08-31 23:03:21 +02:00
Arthur Schiwon efedc81c0a
simplify returning the homePath and fixing #4117 
homesToKill was not set in runtime since some changes some place else. It
required deleteUser() to be called first. The method acts independent of it
now.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-08-31 23:03:16 +02:00
Morris Jobke 77354cb7a2 Merge pull request #6315 from nextcloud/metadata-for-all-emails 
Implement metadata for email templates of remaining emails
 2017-08-31 09:54:31 +02:00
Nextcloud bot 99dcf5036d
[tx-robot] updated from transifex 2017-08-31 00:08:31 +00:00
Morris Jobke 404bd1be60
Implement metadata for email templates of remaining emails 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-30 22:56:14 +02:00
Roeland Jago Douma 969eea2c0d Merge pull request #6273 from nextcloud/move-multiple-files 
Move multiple files
 2017-08-30 14:23:05 +02:00
Bjoern Schiessle 454d136a06
also allow to register additional plugins if the old endpoint is used 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-08-30 14:05:18 +02:00
Bjoern Schiessle f8cc8e1c9e
add a new dav event to allow apps to register their own sabredav plugins 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-08-30 14:05:18 +02:00
Nextcloud bot 1e24fe858a
[tx-robot] updated from transifex 2017-08-30 00:08:26 +00:00
Morris Jobke 4edb261805 Merge pull request #6303 from nextcloud/background-image 
Adjust background image to the one used on the website
 2017-08-29 19:09:54 +02:00
Morris Jobke 3cfe91bf0f
Add shareWith to email template metadata 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-29 16:09:25 +02:00
Jan-Christoph Borchardt 2e6d1a3453 Set primary action button color to same as theming color 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-08-29 16:05:18 +02:00
Jan-Christoph Borchardt badbab81ea Update background image to the one used on the website 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-08-29 16:04:11 +02:00
Morris Jobke 7d8b7d4e4e Merge pull request #4925 from nextcloud/error-styling 
Improve design and wording of various error messages
 2017-08-29 12:03:16 +02:00
Roeland Jago Douma eea7de4c9f
Correctly format OCS response with favorites 
The helper funtion did not handle the response correctly and basically
only returned the last share with tags.

This is a simple rewrite. That is still understandable. Loops maybe more
than strictly required. But preformance is not the issue here.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-29 12:03:13 +02:00
Morris Jobke 8c917cbfe0 Merge pull request #6288 from nextcloud/master-6287 
Allow the expiration date to be set to null
 2017-08-29 11:32:11 +02:00
Björn Schießle 5adc1efe9f Merge pull request #6283 from nextcloud/add-new-propfind 
add propfind to detect encryption status
 2017-08-29 10:47:33 +02:00
Nextcloud bot daf2d6cb96
[tx-robot] updated from transifex 2017-08-29 00:08:27 +00:00
Morris Jobke be23f7e1de
Allow the expiration date to be set to null 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-28 17:49:16 +02:00
Bjoern Schiessle e83e1c7c23
add propfind to detect encryption status 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-08-28 14:02:25 +02:00
Nextcloud bot 8e4085526d
[tx-robot] updated from transifex 2017-08-28 00:08:24 +00:00
Thomas Citharel 2af0c3d928 Move multiple files 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2017-08-27 15:20:18 +02:00
Morris Jobke 2bf15eda26 Merge pull request #6255 from nextcloud/email-meta-data 
Add meta information to emails for better customisation
 2017-08-26 18:53:52 +02:00
Roeland Jago Douma 85d5a71258 Merge pull request #6182 from nextcloud/fixes-in-files-drop-js 
Fixes in files_drop.js
 2017-08-26 17:58:30 +02:00
Morris Jobke f0c34a3e89
Allow the expiration date to be set to null 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-26 17:57:24 +02:00
Morris Jobke cfe5d35862 Merge pull request #6252 from nextcloud/only_show1_error 
Don't try the actual file upload if the checks already error out
 2017-08-26 12:46:01 +02:00
Morris Jobke ae1ef85137 Merge pull request #6157 from nextcloud/smb-2.0.2 
update icewind/smb to 2.0.2
 2017-08-26 12:02:48 +02:00
Roeland Jago Douma 69d2d0178a
Don't try the actual file upload if the checks already error out 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-26 11:30:04 +02:00
Morris Jobke 4e6343a4fb Merge pull request #6262 from nextcloud/navigation-entries-sort 
Fix sorting of entries in Files sidebar
 2017-08-26 11:16:39 +02:00
Robin Appelman 42915b1e8b Fix test 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-08-26 10:52:22 +02:00
Robin Appelman 37e8b698f7 cache nodes from search results 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-08-26 10:18:19 +02:00
Nextcloud bot ca490bafb9
[tx-robot] updated from transifex 2017-08-26 00:08:26 +00:00
Jan-Christoph Borchardt d0d6a92054 Fix sorting of entries in Files sidebar 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-08-25 18:40:28 +02:00
Jan-Christoph Borchardt ee69a29f2f Fix permanent display of favorite icon 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-08-25 14:25:21 +02:00
Nextcloud bot 7b8bd8188e
[tx-robot] updated from transifex 2017-08-25 00:08:59 +00:00
Joas Schilling 09747b296a
Add meta information to emails for better customisation 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-24 17:54:22 +02:00
Roeland Jago Douma 5a9a199aaa
Don't fetch the translation from core but from files 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-24 14:54:14 +02:00
Nextcloud bot a7f2dc6dd6
[tx-robot] updated from transifex 2017-08-24 00:08:50 +00:00
Morris Jobke 57fd256b9a
Replace ... with … 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-23 16:22:11 +02:00
Morris Jobke 591dda2fed
Show "Uploading..." in web UI for long uploads 
If the estimated upload time is bigger than 4 hours it shows the text
"Uploading..." because the time then doesn't give any good hint to the
user anyways.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-23 15:59:05 +02:00
Nextcloud bot 782f6e9454
[tx-robot] updated from transifex 2017-08-23 00:08:55 +00:00
Nextcloud bot ae0789ef43
[tx-robot] updated from transifex 2017-08-22 00:08:20 +00:00
Vincent Petry 2cb3461146 Move GDrive external storage to a separate repo 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-21 09:59:10 +02:00
Morris Jobke 6e3b8db98d Merge pull request #6180 from nextcloud/fix-warnings 
Fix PHPUnit warnings
 2017-08-21 09:25:35 +02:00
Nextcloud bot 9e1884b27c
[tx-robot] updated from transifex 2017-08-21 00:08:13 +00:00
Nextcloud bot 8c458de4c2
[tx-robot] updated from transifex 2017-08-20 00:08:15 +00:00
Nextcloud bot 6b978ebd29
[tx-robot] updated from transifex 2017-08-19 00:08:26 +00:00
Lukas Reschke f8b4b2c499
Fix PHPUnit warnings 
```
1) OCA\FederatedFileSharing\Tests\Settings\AdminTest::testGetForm with data set #0 (true)
PHPUnit_Framework_TestCase::getMock() is deprecated, use PHPUnit_Framework_TestCase::createMock() or PHPUnit_Framework_TestCase::getMockBuilder() instead

2) OCA\FederatedFileSharing\Tests\Settings\AdminTest::testGetForm with data set #1 (false)
PHPUnit_Framework_TestCase::getMock() is deprecated, use PHPUnit_Framework_TestCase::createMock() or PHPUnit_Framework_TestCase::getMockBuilder() instead

3) OCA\FederatedFileSharing\Tests\Settings\AdminTest::testGetSection
PHPUnit_Framework_TestCase::getMock() is deprecated, use PHPUnit_Framework_TestCase::createMock() or PHPUnit_Framework_TestCase::getMockBuilder() instead

4) OCA\FederatedFileSharing\Tests\Settings\AdminTest::testGetPriority
PHPUnit_Framework_TestCase::getMock() is deprecated, use PHPUnit_Framework_TestCase::createMock() or PHPUnit_Framework_TestCase::getMockBuilder() instead
```

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-18 15:39:10 +02:00
Daniel Calviño Sánchez 4d003c812d Do not iterate over the files 
As "singleFileUpload" is used the "add" callback (which in turn calls
"addFileToUpload") will always be called with a single file. Therefore
there is no need to iterate over the files (and it is not done in the
other callbacks either, so this aligns the code with the rest of the
callbacks).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-08-18 15:18:20 +02:00
Daniel Calviño Sánchez 313b824dd7 Replace fileName variable with data.files[0].name 
There is no need to store the file name, as the "data" parameter given to
all the callbacks provides a "files" attribute with all the files that
the callback refers to; moreover, it will always be a single file due to
the use of "singleFileUploads" in the jQuery File Upload plugin.

This also fixes the loading icon not disappearing when several files were
uploaded at once. "singleFileUploads" causes the "add" callback to be
called once for each file to be uploaded, so "fileName" was overwritten
with the name of each new file in the upload set; when "fileName" was
later used in the "done" callback to find the file in the list whose
loading icon replace with the MIME type icon "fileName" always had the
name of the last file, and thus its icon was the only one replaced.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-08-18 15:14:32 +02:00
Daniel Calviño Sánchez c70688e5d0 Update the whole file item instead of only its contents 
The "done" and "fail" callbacks both update the item for the uploaded
file using "setFileIcon". "setFileIcon" updates the contents of the
"<li>" element for the file, but the "fail" callback was giving
"setFileIcon" an element generated by the template,  so the resulting
HTML contained a "<li>" element nested in another "<li>" element.

However, generating the HTML is better done through a template, so the
template now receives the icon to show in order to be used by a
successful upload and a failed one, and "setFileIcon" was changed to
"updateFileItem".

Note that the mimeTypeUrl does no longer need to be escaped, as
Handlebars templates escape the needed characters automatically.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-08-18 14:26:15 +02:00
Daniel Calviño Sánchez 2860ce027a Remove "errorThrown" parameter 
When the "fail" callback is called, "errorThrown" is a property of the
data object instead of a parameter.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-08-18 14:08:51 +02:00
Nextcloud bot 231cffffb9
[tx-robot] updated from transifex 2017-08-18 00:08:15 +00:00
Nextcloud bot 0ceb06fde5
[tx-robot] updated from transifex 2017-08-17 00:08:14 +00:00
Roeland Jago Douma 6e7865d05b
Update to new test case 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-16 21:23:32 +02:00
Roeland Jago Douma 82791b7b06
Public upload share permission handling 
If you set the permissions on a public share the SHARE permission makes
no sense. So instead of throwing a warning. Just filter out the share
permission.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-16 21:17:26 +02:00
Robin Appelman db688d0322
update icewind/smb to 2.0.2 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-08-16 18:48:07 +02:00
Vincent Petry 653610559d Bye bye Dropbox v1 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-16 11:03:25 +02:00
Morris Jobke 4c558c99f3 Merge pull request #6130 from nextcloud/cleanup-unused-methods 
Cleanup unused methods
 2017-08-16 08:55:06 +02:00
Nextcloud bot d7406e5159
[tx-robot] updated from transifex 2017-08-16 00:08:33 +00:00
Morris Jobke 8c97218b95 Merge pull request #6128 from nextcloud/primary-font-color-in-capabilities 
Add the primary font color to the capabilities as well
 2017-08-15 21:27:28 +02:00
Morris Jobke 60a485b80d Merge pull request #6132 from nextcloud/do-not-log-maintenance-mode 
Do not log WebDAV maintenance mode exception
 2017-08-15 21:26:18 +02:00
Lukas Reschke f698aa11e7 Merge pull request #6101 from cbartz/patch-1 
Missing array assignment in Swift.php
 2017-08-15 18:17:58 +02:00
Lukas Reschke 422c3e302a Merge pull request #6099 from nextcloud/issue-3457-no-exception-on-sharee-error 
Catch exceptions on error of cloud id resolution
 2017-08-15 17:04:42 +02:00
Morris Jobke fc12bd0be6 Do not log WebDAV maintenance mode exception 
Log the maintenance mode exception only in debug level. Fixes #6124

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-15 15:03:39 +02:00
Morris Jobke a55e794bfd Cleanup unused methods 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-15 14:29:26 +02:00
Morris Jobke cf7c4a4439 Merge pull request #6123 from nextcloud/cleanup-shareItem 
Cleanup usage of shareItem in internal code base
 2017-08-15 13:57:00 +02:00
Joas Schilling b7b4cfd6a1
Add the primary font color to the capabilities as well 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-15 13:50:08 +02:00
Morris Jobke 8366dfa50b Cleanup usage of shareItem in internal code base 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-15 11:57:18 +02:00
Morris Jobke 895b9c2309 Use proper methods for registerBackend 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-15 11:29:15 +02:00
Morris Jobke c5c23b30b9 Merge pull request #6116 from nextcloud/cleanup-unused-methods 
Cleanup unused methods
 2017-08-15 11:26:26 +02:00
Morris Jobke f640b56bfa Cleanup unused methods 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-15 10:09:47 +02:00
Nextcloud bot cc40f02684
[tx-robot] updated from transifex 2017-08-15 00:08:15 +00:00
Joas Schilling 2e73112256 Catch exceptions on error of cloud id resolution 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-14 22:20:57 +02:00
Christopher Bartz bbd8797f1e Remove tmpFiles Array in Swift.php 
tmpFiles Array is unnecessary and there has been
a reference without an assignment which lead to a bug making swift external
storage unuseable.
 2017-08-14 17:35:04 +02:00
Morris Jobke 5b2d6b080f Merge pull request #6080 from nextcloud/header-bottom-border 
Add buttom border for header
 2017-08-14 17:29:03 +02:00
Robin Appelman ca3aef0486 Merge pull request #5872 from nextcloud/swift-filter-dot 
Filter magic dot object when swift directory
 2017-08-14 15:11:53 +02:00
Morris Jobke 995ddc61d1 Add buttom border for header 
* allows to distinct the header from the rest of the UI for bright colors
* ref #5654

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-14 09:40:55 +02:00
Nextcloud bot d1f3e1de96
[tx-robot] updated from transifex 2017-08-14 00:08:21 +00:00
Nextcloud bot ded780a45a
[tx-robot] updated from transifex 2017-08-13 00:08:14 +00:00
Jan-Christoph Borchardt 9f67fb86c8 Improve design of various error messages 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-08-12 18:48:48 +02:00
Nextcloud bot a2e3c8ede5
[tx-robot] updated from transifex 2017-08-12 00:08:18 +00:00
Lukas Reschke 1c88e59930 Merge pull request #5861 from nextcloud/shareinfo 
Move shareinfo over to proper controller
 2017-08-11 14:02:43 +02:00
Nextcloud bot c9612b9324
[tx-robot] updated from transifex 2017-08-11 00:08:20 +00:00
Morris Jobke 43facdb95f Merge pull request #5616 from nextcloud/ldap-wizard-remove-LDAPTLS_REQCERT-attempt 
LDAP Wizard: do not attempt to recognise cert issue by using LDAPTLS_REQCERT
 2017-08-10 21:06:14 +02:00
Roeland Jago Douma 685f272212
Add unit tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-10 16:25:58 +02:00
Roeland Jago Douma c9d2e31d52
Remove old code + add Middleware 
* Add proper middleware for shareinfo
* Remove old shareinfo routes

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-10 13:49:09 +02:00
Roeland Jago Douma 8a539ec0f6
Move shareinfo over to proper controller 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-10 13:49:06 +02:00
Daniel Calviño Sánchez b16ce1b4ba Fix preview of theming 
Pull request #5429 made cached SCSS files depend on a hash of the base
URL, so the "/css/core/server.css" file does no longer exist; as the
file can not be loaded the "Loading preview" message is never removed
and the "Saved" message is never shown.

As it now depends on the hash of the base URL the file to be reloaded
can no longer be hardcoded, so the full URL to the "server.css" file
that has to be reloaded (if any) is now got from the DataResponse
provided by the controller.

Fixes #5975

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-08-10 12:37:58 +02:00
Daniel Calviño Sánchez 5999b212d1 Refactor reloadStylesheets to receive absolute URLs 
This is a preparatory step for a following change in which
reloadStylesheets will have to be able to receive absolute URLs.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-08-10 12:37:57 +02:00
Daniel Calviño Sánchez db52e861dd Provide "server.css" URL in ThemingController response 
Pull request #5429 made cached SCSS files depend on a hash of the base
URL, so the "/css/core/server.css" file does no longer exist. The
"server.css" URL must be known by the Theming app in order to update the
stylesheets when previewing the changes to the theme, so the
DataResponse from the controller now provides the full URL to the
"server.css" file that has to be reloaded (if any).

The "server.css" URL provided by the response will be taken into account
by the JavaScript front-end in a following commit.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-08-10 12:37:57 +02:00
Daniel Calviño Sánchez 986dffdae4 Split updateStylesheet tests for success and error 
This is a preparatory step for a following commit in which the
properties present in the response will change depending on whether the
request was successful or not.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-08-10 12:37:57 +02:00
Daniel Calviño Sánchez d7e45d45c4 Unify DataResponse format with its uses in the rest of the file 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-08-10 12:37:57 +02:00
Nextcloud bot 0ef9f943b2
[tx-robot] updated from transifex 2017-08-10 00:08:15 +00:00
Roeland Jago Douma c6f6413bb1
Fix ldap tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-09 21:10:15 +02:00
Roeland Jago Douma c81e79f8b9
Fix files_sharing CacheTests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-09 16:15:27 +02:00
Nextcloud bot 8549fcf6e4
[tx-robot] updated from transifex 2017-08-09 00:08:20 +00:00
Lukas Reschke 9707ef9ba7 Merge pull request #5982 from nextcloud/fix-loading-icon-inside-upload-button-in-theming-app 
Fix loading icon inside upload button in Theming app
 2017-08-08 18:41:57 +02:00
Morris Jobke d7645ee928 Merge pull request #5972 from nextcloud/replace-loading-icon-gif-with-pure-css-in-login-button 
Replace loading icon GIF with pure CSS in login button
 2017-08-08 14:40:35 +02:00
Nextcloud bot 481002a00b
[tx-robot] updated from transifex 2017-08-08 00:08:10 +00:00
Daniel Calviño Sánchez 2398e845c9 Fix loading icon inside upload button in Theming app 
Pull request #5969 fixed the vertical alignment of loading icon and
status message in Theming app, but in doing so it broke the loading icon
inside the upload button.

When an image is being uploaded the upload icon is replaced by a loading
icon, so the loading icon and the upload icon have to share their CSS
rules, but only in that specific case.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-08-07 15:04:43 +02:00
Nextcloud bot eb2442b871
[tx-robot] updated from transifex 2017-08-06 00:08:24 +00:00
Nextcloud bot 21f2fe5cb9
[tx-robot] updated from transifex 2017-08-05 00:08:08 +00:00
Morris Jobke de94eefe97 Merge pull request #5969 from nextcloud/fix-vertical-alignment-of-loading-icon-and-status-message-in-theming-app 
Fix vertical alignment of loading icon and status message in Theming app
 2017-08-04 12:08:16 +02:00
Lukas Reschke 3266e81577 Merge pull request #5954 from nextcloud/textpreview_range 
Do not fetch the whole text file for the sidebar preview
 2017-08-04 11:23:42 +02:00
Morris Jobke d63beffe9e Merge pull request #5967 from nextcloud/revert-5682-inline-svg-icon 
Revert "Proof of concept #5593 - inline SVG icon for icon-contacts"
 2017-08-04 10:53:21 +02:00
Nextcloud bot 1f8a45bbd7
[tx-robot] updated from transifex 2017-08-04 00:08:18 +00:00
Daniel Calviño Sánchez b237379fa1 Replace loading icon GIF with pure CSS loading icon 
The pure CSS loading icon uses an ::after pseudo-element, and thus it
can only be used on container elements; the input element is not a
container element, so when the class "icon-loading-small" is set on an
input element it falls back to a loading icon GIF.

This commit modifies the markup of the login button to add a div element
that holds the confirm icon and the loading icon (depending on the
case). In order to position the icon in the same place as before the
input and the icon are both wrapped by another div making possible to
set the absolute position of the icon relative to the input.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-08-03 21:09:43 +02:00
Daniel Calviño Sánchez 09a8c4a5d4 Fix code style 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-08-03 21:09:25 +02:00
Daniel Calviño Sánchez c723d093a8 Remove superfluous selector part 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-08-03 21:09:25 +02:00
Daniel Calviño Sánchez 4fbcbd3e6d Align vertically loading icon and status message 
As both elements are inline/inline-block and belong to the same line
they can be aligned vertically using "vertical-align: middle".

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-08-03 21:09:25 +02:00
Daniel Calviño Sánchez fa7f4e5cae Do not use the same rules for loading icon than for upload icon 
The loading icon is used in a totally different way than the upload icon
and thus it should not share its CSS rules.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-08-03 21:09:25 +02:00
Daniel Calviño Sánchez 33c4a674a2 Remove ignored rules 
The removed rules were either always overriden by other rules or never
used due to not matching any element.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-08-03 21:09:25 +02:00
Roeland Jago Douma 3aa819c62c
Do not fetch the whole text file for the sidebar preview 
Just fetch the first 10kb. This should be more than enough in 99% of the
cases. And avoid downloading a 10mb text file just to display a tiny
portion.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-03 20:32:59 +02:00
Joas Schilling 9abbd6ab13 Revert "Proof of concept #5593 - inline SVG icon for icon-contacts" 2017-08-03 17:27:24 +02:00
Morris Jobke bb865a55fe Merge pull request #5738 from nextcloud/comradekingu-patch-3 
Spelling: UID
 2017-08-03 14:28:41 +02:00
Morris Jobke 8fecc336ac Merge pull request #5959 from nextcloud/drop-logo-claim 
Logo claim is not used anymore
 2017-08-03 08:20:56 +02:00
Nextcloud bot 21dd85678f
[tx-robot] updated from transifex 2017-08-03 00:08:06 +00:00
Lukas Reschke ea2e629c6c Merge pull request #5953 from nextcloud/theming-lightness-correction 
Use same lightness calculation as the SCSS compiler for theming
 2017-08-02 23:17:19 +02:00
Morris Jobke 585e5c6ea5
Logo claim is not used anymore 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-02 23:08:45 +02:00
Marin Treselj ffcdc96a0b Proof of concept #5593 - inline SVG icon for icon-contacts 
Signed-off-by: Marin Treselj <marin@pixelipo.com>
 2017-08-02 18:27:24 +02:00
Allan Nordhøy 2fcf4f2f29 Improve spelling in LDAP 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-02 18:12:31 +02:00
Morris Jobke 6ca4b9eee9 Merge pull request #5920 from nextcloud/gallery-share-view-fix 
Top bar buttons in share view are wrong positioned
 2017-08-02 16:59:24 +02:00
Morris Jobke 6290ba8299 Merge pull request #4790 from nextcloud/fix-comparisons-in-apps 
Fix comparisons in apps
 2017-08-02 16:28:33 +02:00
Morris Jobke 1a711b1e73 Merge pull request #5956 from nextcloud/proper-update-notification-layout 
Improve update notification layout and show non-default update server
 2017-08-02 16:26:57 +02:00
Roeland Jago Douma fbfd371493 Merge pull request #5923 from nextcloud/expire-federation-jobs 
Expire federation jobs
 2017-08-02 16:15:28 +02:00
Joas Schilling 4ca4b270e7
Close all the cursors 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-02 14:35:14 +02:00
Joas Schilling 81c54ea515
Use automatic injection whenever possible 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-02 14:34:51 +02:00
Morris Jobke 9391d8fc60 Improve update notification layout and show non-default update server 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-02 13:56:36 +02:00
Morris Jobke 7f2e9d10a3 Show correct status in update notification 
Sometimes it could be the case that after a channel change the last updated
timestamp is reset, but the check for updates is not yet completed. In this
case the update notification showed "You are up to date" and the date was
"1970-01-01 00:00:00". With this fix the state is properly shown.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-02 10:45:26 +02:00
Nextcloud bot 2800e017de
[tx-robot] updated from transifex 2017-08-02 00:08:10 +00:00
Julius Härtl 9cd21bbe8a
Use same lightness calculation as the SCSS compiler for theming 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-08-01 18:09:07 +01:00
Lukas Reschke f93a82b8b0
Remove explicit type hints for Controller 
This is public API and breaks the middlewares of existing apps. Since this also requires maintaining two different code paths for 12 and 13 I'm at the moment voting for reverting this change.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-01 17:32:03 +02:00
Robin Appelman 578e4f9903
Filter magic dot object when swift directory 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-08-01 14:57:33 +02:00
Morris Jobke 6010c4f267 Merge pull request #5877 from nextcloud/typehint_middleware 
Prop argument type for Middleware
 2017-08-01 14:28:16 +02:00
Joas Schilling a20934227c Remove undocumented config 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-01 13:59:10 +02:00
Joas Schilling c23c05d4f6 Fix versions app 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-01 13:57:08 +02:00
Joas Schilling 231bb47ae6 Fix file size comparison 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-01 13:56:12 +02:00
Joas Schilling d703744d4a Fix comparisions in the trashbin app 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-01 13:56:12 +02:00
Joas Schilling 80febeae21 Fix comparisons in the sharing app 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-01 13:56:12 +02:00
Joas Schilling 7a62fbd205 Fix comparisons in the files external app 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-01 13:56:12 +02:00
Joas Schilling e30287cf81 Fix comparisons in the files app 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-01 13:56:12 +02:00
Joas Schilling 45e2c415d4 Fix comparison in the ldap app 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-01 13:56:12 +02:00
Joas Schilling 1e2de86c3a Fix comparisons in the versions app 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-01 13:56:12 +02:00
Joas Schilling 89238164e1 Fix comparisons in the dav app 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-01 13:55:07 +02:00
Joas Schilling 0ebdf871e0 Fix comparisons in encryption app 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-01 13:54:07 +02:00
Roeland Jago Douma c8452803ef Merge pull request #5897 from nextcloud/add-share-mail-for-user-share 
Send an email once a file/folder is shared with a user
 2017-08-01 13:27:15 +02:00
Roeland Jago Douma bc54e6ff7c
Use ITimeFactory 
* Inject the timefacotry so we can mock it properly in the tests.
* Extended unit tests to cover the new paths

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-01 11:23:40 +02:00
Bjoern Schiessle 3ffff08819
we don't need to remove the job manually here, even if we ask once more the other server will decline and the background job will be removed 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-08-01 10:07:53 +02:00
Bjoern Schiessle 80c08e8fd0
update unit tests 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-08-01 10:07:53 +02:00
Bjoern Schiessle 9c9cb1a6db
cleanup constructors 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-08-01 10:07:53 +02:00
Bjoern Schiessle 06b9e58081
expire requestSharedSecret job after 30 days 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-08-01 10:07:53 +02:00
Bjoern Schiessle 51d85eb2f8
expire getShareadSecret job after 30 days 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-08-01 10:07:51 +02:00
Roeland Jago Douma 2fae696d35
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-01 08:20:17 +02:00
Roeland Jago Douma 61a6adff14
Fix sabre test 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-01 08:20:17 +02:00
Roeland Jago Douma ede15f0988
Fix L10N::t 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-01 08:20:17 +02:00
Roeland Jago Douma fd465d4e49
[files_external] Fix phpdoc 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-01 08:20:17 +02:00
Roeland Jago Douma fc369dd86e
[DAV] Fix URLUtil::splitPath usage 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-01 08:20:17 +02:00
Roeland Jago Douma f57a3aa81b
[DAV][CalDAV] Fixes 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-01 08:20:16 +02:00
Roeland Jago Douma 201bbb962c
Fix Comments 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-01 08:20:16 +02:00
Roeland Jago Douma 19b039e6e0
[files_external] fix commands 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-01 08:20:16 +02:00
Roeland Jago Douma b7c8e9ed88
[files_external] Fix phpdoc 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-01 08:20:16 +02:00
Lukas Reschke dfd8125aeb
Replace wrong PHPDocs 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-01 08:20:16 +02:00
Lukas Reschke d321e9792e
Add |null to PHPDoc 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-01 08:20:15 +02:00
Lukas Reschke e1f52fc901
Stricter phan config fixes 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-01 08:20:13 +02:00
Nextcloud bot 456392e627
[tx-robot] updated from transifex 2017-08-01 00:08:26 +00:00
Roeland Jago Douma f71dc7523f
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-07-31 16:54:19 +02:00
Roeland Jago Douma 3548603a88
Fix middleware implementations signatures 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-07-31 16:54:19 +02:00
Marin Treselj f53db38c03 Change id to class in the main share template 
Signed-off-by: Marin Treselj <marin@pixelipo.com>
 2017-07-31 12:19:19 +02:00
Morris Jobke 7b2c08a31a Merge pull request #5905 from nextcloud/ocp-config 
Use IConfig instead of static OCP\Config
 2017-07-31 10:54:40 +02:00
Roeland Jago Douma baee0b4bcc Merge pull request #5913 from nextcloud/fix-anchor-name 
Fix anchor name for federated sharing settings
 2017-07-31 08:51:23 +02:00
Morris Jobke a309fa7d6b Disable default activity email for incoming shares 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-31 08:19:54 +02:00
Nextcloud bot 97d06a7698
[tx-robot] updated from transifex 2017-07-31 00:08:02 +00:00
Nextcloud bot 98b664a000
[tx-robot] updated from transifex 2017-07-30 00:08:03 +00:00
Nextcloud bot b43abf7512
[tx-robot] updated from transifex 2017-07-29 00:08:31 +00:00
Morris Jobke fae327799b Fix anchor name for federated sharing settings 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-28 08:21:25 +02:00
Nextcloud bot baa6db3539
[tx-robot] updated from transifex 2017-07-28 00:08:05 +00:00
Morris Jobke dc58206ded Merge pull request #5852 from nextcloud/preview_trash_cleanup 
Preview trash cleanup
 2017-07-27 17:24:47 +02:00
Morris Jobke c27498db71 Use IConfig instead of static OCP\Config 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-27 13:43:18 +02:00
Nextcloud bot 65ade4b6d5
[tx-robot] updated from transifex 2017-07-27 00:08:03 +00:00
Joas Schilling 28290d8691 Allow to enable the external storage app via the web ui 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-26 14:30:21 +02:00
Nextcloud bot da31a30edb
[tx-robot] updated from transifex 2017-07-26 00:08:06 +00:00
Lukas Reschke 3faef644a1 Merge pull request #5864 from nextcloud/legacy_user 
Remove legacy OC_User_Backend and OC_User_Interface
 2017-07-25 17:15:11 +02:00
Morris Jobke 89a7b007f2 Fix comments 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-25 08:57:58 +02:00
Nextcloud bot 11e182fff2
[tx-robot] updated from transifex 2017-07-25 00:08:02 +00:00
Roeland Jago Douma b930f32e89
Remove legacy OC_User_Backend and OC_User_Interface 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-07-24 20:42:55 +02:00
Morris Jobke e785b849c7 Merge pull request #5835 from nextcloud/cleanup_testing_app 
Cleanup testing app
 2017-07-24 15:03:15 +02:00
Morris Jobke c775d5e497 Merge pull request #5514 from nextcloud/assembly-stream-seek 
refactor chunked assembly stream
 2017-07-24 15:00:03 +02:00
Roeland Jago Douma 7f6a72b65d
Move over locking controller 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-07-24 13:44:03 +02:00
Roeland Jago Douma 10efec246d
Move over Config 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-07-24 13:43:00 +02:00
Roeland Jago Douma d1993c32e5
Move Application to AppInfo 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-07-24 13:42:58 +02:00
Roeland Jago Douma 6d4731024a
Some app fixes of phpstorm inspections 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-07-24 11:42:07 +02:00
Roeland Jago Douma 549845aa73
Delete trash using node API to trigger preview deletion 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-07-24 11:14:12 +02:00
Nextcloud bot d95b46ffb7
[tx-robot] updated from transifex 2017-07-24 00:08:01 +00:00
Jarkko Lehtoranta 69f6d42b17 LDAP: Simplify conditions in establishConnection 
Signed-off-by: Jarkko Lehtoranta <devel@jlranta.com>
 2017-07-23 14:50:01 +03:00
Jarkko Lehtoranta 6a62b4784a LDAP: Add testStartTlsNegotiationFailure unit test 
Signed-off-by: Jarkko Lehtoranta <devel@jlranta.com>
 2017-07-23 14:50:01 +03:00
Jarkko Lehtoranta 3a6511eac8 LDAP: Add testBindWithInvalidCredentials unit test 
Signed-off-by: Jarkko Lehtoranta <devel@jlranta.com>
 2017-07-23 14:50:01 +03:00
Jarkko Lehtoranta 6103677a91 LDAP: Use imported exception in Connection class 
Signed-off-by: Jarkko Lehtoranta <devel@jlranta.com>
 2017-07-23 14:50:01 +03:00
Jarkko Lehtoranta 79fbed4064 LDAP: Clean-up doConnect 
Signed-off-by: Jarkko Lehtoranta <devel@jlranta.com>
 2017-07-23 14:50:01 +03:00
Jarkko Lehtoranta d87375cbaa LDAP: Throw an exception if disabling LDAP referrals fails 
Signed-off-by: Jarkko Lehtoranta <devel@jlranta.com>
 2017-07-23 14:50:01 +03:00
Jarkko Lehtoranta 97e14cccf2 LDAP: Fix testUseBackupServer unit test 
Signed-off-by: Jarkko Lehtoranta <devel@jlranta.com>
 2017-07-23 14:50:01 +03:00
Jarkko Lehtoranta de9a9bc004 LDAP: Throw an exception if Start TLS fails 
This ensures that only a secure connection to the LDAP server will be used,
if Start TLS has been enabled.

Signed-off-by: Jarkko Lehtoranta <devel@jlranta.com>
 2017-07-23 14:50:01 +03:00
Jarkko Lehtoranta ee2c6e8215 LDAP: Remove unnecessary "recursion" fix 
This reverts commit 86d72b9a61
"LDAP: fix possible recursion".

Signed-off-by: Jarkko Lehtoranta <devel@jlranta.com>
 2017-07-23 14:50:01 +03:00
Jarkko Lehtoranta 039a836d4a LDAP: Don't handle invalid credentials as a connection error 
Signed-off-by: Jarkko Lehtoranta <devel@jlranta.com>
 2017-07-23 14:50:01 +03:00
Jarkko Lehtoranta 4e2e592635 LDAP: Connect to backup server only if it exists + handle errors 
Signed-off-by: Jarkko Lehtoranta <devel@jlranta.com>
 2017-07-23 14:50:01 +03:00
Nextcloud bot 46332b0d8e
[tx-robot] updated from transifex 2017-07-23 00:07:58 +00:00
Morris Jobke b6c67f585e Merge pull request #5827 from nextcloud/improve-public-share-header 
Add filename and sharer in public page
 2017-07-22 10:59:33 +02:00
Nextcloud bot ce7c62d9bb
[tx-robot] updated from transifex 2017-07-22 00:08:07 +00:00
Morris Jobke 50fc5a1e25 Merge pull request #5823 from nextcloud/improve-error-handling 
Improve error handling for accepting federated shares
 2017-07-21 22:54:14 +02:00
Morris Jobke b2b4691e48 Add filename and sharer in public page 
* shows the filename and sharer on the public page
* allows the user to identify, that this is a user page and not an official page of the Nextcloud hosting
* remove link on logo that redirects to login (fixes #5720)

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-21 18:55:37 +02:00
Arthur Schiwon 25439919f8
fix phpdoc return types (no code change) 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-07-21 14:55:12 +02:00
Arthur Schiwon 9b2f171cbd
do not attempt to recognise cert issue by using LDAPTLS_REQCERT 
first, it does not work (at least not everywhere/reliably), second if it
did it was not reset properly. Removes a bit of complexity.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-07-21 14:55:11 +02:00
Robin Appelman 89b747d066
refactor chunked assembly stream 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-07-21 12:49:39 +02:00
Roeland Jago Douma 86d2fe516e Merge pull request #5753 from nextcloud/fed-unshare-fail-remote 
still remove the federated share even if we cant notify the remote
 2017-07-21 12:45:01 +02:00
Bjoern Schiessle 8b3dfcc429
use OCSv2 to make sure that the error also arrives at the web front-end 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-07-21 12:09:13 +02:00
Bjoern Schiessle e78040d250
improved error handling 
check if table was updated successfully and only then send a notification
mail and return "true".

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-07-21 12:07:32 +02:00
Morris Jobke 407a500745 Merge pull request #5803 from nextcloud/fix-public-links 
fix preview for public links
 2017-07-21 09:34:36 +02:00
Morris Jobke 3d9fd4d0d1 Merge pull request #5817 from nextcloud/add-basic-sql-injection-checker 
Add Phan plugin to check for SQL injections
 2017-07-21 09:25:24 +02:00