3888b3a285
adapt unit test for ensuring exception
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-26 23:10:24 +02:00
a28b1d91f9
split off former searchSharee unit test
...
also moves registering default plugins to Server for proper unit testing
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-26 23:10:24 +02:00
4a315ede81
adjust ShareeAPIController invalid-input search unit test
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-26 23:10:24 +02:00
38ff7eaece
adjust ShareeAPIController search test
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-26 23:10:24 +02:00
3d1d03a511
split off getEmail tests
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-26 23:10:24 +02:00
c92f7ee767
split off getRemote unit tests
...
adds two small fixes → they actually work \o/
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-26 23:10:24 +02:00
b35760de27
split off getGroups unit tests
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-26 23:10:24 +02:00
dd9e191d37
split off getUsers unit tests
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-26 23:10:23 +02:00
c55583d1b4
allow more than one plugin per share type
...
however it does not dedupe (appears too complex/expensive while we don't
havve the issue currently)
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-26 23:10:23 +02:00
4a96e22258
don't keep result types hard coded
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-26 23:10:23 +02:00
ea3ac4e656
Splits off the logic from sharees endpoint thus making it available from
...
within Nc/via PHP.
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-26 23:10:17 +02:00
ef3e8faea2
[tx-robot] updated from transifex
2017-09-26 00:08:26 +00:00
4077f684e1
Only have direct preview urls for image files
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-25 21:47:09 +02:00
05c37526a7
Fix tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-25 21:44:42 +02:00
9080976975
Merge pull request #6372 from nextcloud/scss-normalization
...
Scss normalization
2017-09-25 16:50:30 +02:00
c3491e3f14
Add annotation
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-25 16:18:50 +02:00
894958e3e2
For images we have a preview for use the preview link
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-25 16:18:50 +02:00
7d8c5f73f5
Add direct preview link to single shared image files
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-25 16:18:50 +02:00
199c4b2ff9
[tx-robot] updated from transifex
2017-09-25 00:08:01 +00:00
d169e3fd59
Removed unused filter for opacity, fix #6408
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-23 18:18:14 +02:00
7eba0a2720
Fix comment
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-09-21 20:10:36 +02:00
4d556a3ade
[tx-robot] updated from transifex
2017-09-21 00:08:26 +00:00
e43400eddb
Merge pull request #5562 from nextcloud/link-password-style
...
Fix style of link share password input view
2017-09-20 11:30:31 +02:00
4faa562403
Fix browser width compatibility
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-19 18:19:47 +02:00
23a08c501a
Move link share password box and button together
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-09-17 21:02:49 +02:00
3ea819e261
Add box around link share password box, fix #5560
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-09-17 21:02:48 +02:00
cdb6b0295a
[tx-robot] updated from transifex
2017-09-17 00:08:25 +00:00
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
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
1e24fe858a
[tx-robot] updated from transifex
2017-08-30 00:08:26 +00:00
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
daf2d6cb96
[tx-robot] updated from transifex
2017-08-29 00:08:27 +00:00
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
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
7b8bd8188e
[tx-robot] updated from transifex
2017-08-25 00:08:59 +00:00
a7f2dc6dd6
[tx-robot] updated from transifex
2017-08-24 00:08:50 +00:00
ae0789ef43
[tx-robot] updated from transifex
2017-08-22 00:08:20 +00:00
8c458de4c2
[tx-robot] updated from transifex
2017-08-20 00:08:15 +00:00
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
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
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
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
231cffffb9
[tx-robot] updated from transifex
2017-08-18 00:08:15 +00:00
0ceb06fde5
[tx-robot] updated from transifex
2017-08-17 00:08:14 +00:00
6e7865d05b
Update to new test case
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-16 21:23:32 +02:00
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
4c558c99f3
Merge pull request #6130 from nextcloud/cleanup-unused-methods
...
Cleanup unused methods
2017-08-16 08:55:06 +02:00
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
a55e794bfd
Cleanup unused methods
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-15 14:29:26 +02:00
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
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
895b9c2309
Use proper methods for registerBackend
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-15 11:29:15 +02:00
f640b56bfa
Cleanup unused methods
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-15 10:09:47 +02:00
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
a2e3c8ede5
[tx-robot] updated from transifex
2017-08-12 00:08:18 +00:00
685f272212
Add unit tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-10 16:25:58 +02:00
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
8a539ec0f6
Move shareinfo over to proper controller
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-10 13:49:06 +02:00
0ef9f943b2
[tx-robot] updated from transifex
2017-08-10 00:08:15 +00:00
c81e79f8b9
Fix files_sharing CacheTests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-09 16:15:27 +02:00
8549fcf6e4
[tx-robot] updated from transifex
2017-08-09 00:08:20 +00:00
585e5c6ea5
Logo claim is not used anymore
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-02 23:08:45 +02:00
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
6290ba8299
Merge pull request #4790 from nextcloud/fix-comparisons-in-apps
...
Fix comparisons in apps
2017-08-02 16:28:33 +02:00
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
6010c4f267
Merge pull request #5877 from nextcloud/typehint_middleware
...
Prop argument type for Middleware
2017-08-01 14:28:16 +02:00
80febeae21
Fix comparisons in the sharing app
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-01 13:56:12 +02:00
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
456392e627
[tx-robot] updated from transifex
2017-08-01 00:08:26 +00:00
3548603a88
Fix middleware implementations signatures
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-07-31 16:54:19 +02:00
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
a309fa7d6b
Disable default activity email for incoming shares
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-31 08:19:54 +02:00
98b664a000
[tx-robot] updated from transifex
2017-07-30 00:08:03 +00:00
b43abf7512
[tx-robot] updated from transifex
2017-07-29 00:08:31 +00:00
65ade4b6d5
[tx-robot] updated from transifex
2017-07-27 00:08:03 +00:00
da31a30edb
[tx-robot] updated from transifex
2017-07-26 00:08:06 +00:00
11e182fff2
[tx-robot] updated from transifex
2017-07-25 00:08:02 +00:00
6d4731024a
Some app fixes of phpstorm inspections
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-07-24 11:42:07 +02:00
d95b46ffb7
[tx-robot] updated from transifex
2017-07-24 00:08:01 +00:00
46332b0d8e
[tx-robot] updated from transifex
2017-07-23 00:07:58 +00:00
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
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
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
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
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
964d5338dc
[tx-robot] updated from transifex
2017-07-21 00:08:06 +00:00
d8ec399454
Run phan over code base
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-07-19 10:28:11 +02:00
58f72309cc
Merge pull request #5736 from smueller18/patch-2
...
do not show hyphen in og:title if slogan does not exist
2017-07-18 09:04:47 +02:00
7fa02905aa
still remove the federated share even if we cant notify the remote
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-17 14:19:44 +02:00
a23cdd04bb
[tx-robot] updated from transifex
2017-07-15 00:08:54 +00:00
7cf3dc4e29
do not show hyphen in og:title if slogan does not exist
2017-07-14 15:26:44 +02:00
3865c77279
[tx-robot] updated from transifex
2017-07-14 00:08:37 +00:00
261513b04a
[tx-robot] updated from transifex
2017-07-13 00:08:31 +00:00
08d3cb9107
Merge pull request #5685 from nextcloud/jail-propagator
...
Fix propagating changes within jail wrapper
2017-07-12 12:14:51 +02:00
13295c2d1d
[tx-robot] updated from transifex
2017-07-12 00:08:43 +00:00
dfe662ad42
Fix propagating changes within jail wrapper
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-11 17:55:04 +02:00
6e7be6acfd
upstream
...
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
2017-07-11 13:21:24 +02:00
b69ddfba8b
Fix activity emails for accept/decline of remote shares
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-10 12:10:36 +02:00
4f7fafb5c5
[tx-robot] updated from transifex
2017-07-10 00:08:41 +00:00
b4deba2078
Merge pull request #5483 from nextcloud/issue-5075-png-files-for-activity-emails
...
Use PNGs for icons in activity emails
2017-07-07 11:05:00 +02:00
Arthur Schiwon
Nextcloud bot
Roeland Jago Douma
John Molakvoæ
John Molakvoæ (skjnldsv)
Morris Jobke
Joas Schilling
Jan-Christoph Borchardt
Roeland Jago Douma
Daniel Calviño Sánchez
Lukas Reschke
Marin Treselj
Bjoern Schiessle
Robin Appelman
Stephan Müller
Maxence Lange