Commit graph

16642 commits

Author SHA1 Message Date
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