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
d23bc9a99a
[tx-robot] updated from transifex
2017-07-07 00:08:24 +00:00
c46b158e10
update sharing test to new master key default
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-06 11:47:12 +02:00
f3c25e177f
Merge pull request #5407 from nextcloud/5157-simple-logo
...
Simplified Nextcloud logo icon #2
2017-07-04 12:56:05 +02:00
c94dbddd12
[tx-robot] updated from transifex
2017-07-03 00:08:21 +00:00
3470d0a44e
Simplified Nextcloud logo icon
...
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-07-02 14:14:49 +02:00
928b6a376e
[tx-robot] updated from transifex
2017-06-29 00:08:26 +00:00
fd63577089
Improve wording of various error messages
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-06-21 14:51:59 -05:00
90fa27694a
Use PNG version of the icons for shipped activities
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-20 13:48:51 +02:00
c9ef998f17
Merge pull request #5091 from nextcloud/shared-cache-during-init
...
dont die if we try to access the shared cache while setting up the shared storage
2017-06-19 13:47:59 +02:00
26d6c4a64a
[tx-robot] updated from transifex
2017-06-17 00:08:26 +00:00
db14089d6c
Merge pull request #5375 from nextcloud/share-folder-for-remote-shares
...
Use the share_folder config for remote shares
2017-06-14 22:42:06 -05:00
7a269ae872
[tx-robot] updated from transifex
2017-06-15 00:08:40 +00:00
2398d40d98
Merge pull request #5384 from nextcloud/allow-to-share-to-local-users-via-email
...
Allow to find local users by their email address
2017-06-14 18:03:24 -05:00
f28511cac6
Add unit test
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-14 15:32:34 +02:00
4f98852f52
Make sure to only add system users once
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-14 15:07:21 +02:00
ae693129db
Allow to find local users by their email address
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-13 18:07:47 +02:00
2b3549610b
fix 'add to your nextcloud' input field, this is not an email address
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-06-13 17:46:46 +02:00
b5beaf7ef4
Use the share_folder config for remote shares
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-13 14:30:25 +02:00
a74901fce1
[tx-robot] updated from transifex
2017-06-08 00:08:26 +00:00
a3c5d43cd5
[tx-robot] updated from transifex
2017-06-07 00:09:00 +00:00
bb884c341f
[tx-robot] updated from transifex
2017-06-06 00:08:45 +00:00
f03d6f225e
[tx-robot] updated from transifex
2017-06-04 00:08:29 +00:00
5d39f700e4
[tx-robot] updated from transifex
2017-06-03 00:09:00 +00:00
c70de161cf
[tx-robot] updated from transifex
2017-06-02 00:08:30 +00:00
8801b68d45
[tx-robot] updated from transifex
2017-06-01 00:08:38 +00:00
b9b7f8bede
[tx-robot] updated from transifex
2017-05-30 00:08:44 +00:00
4be17dff0f
[tx-robot] updated from transifex
2017-05-29 00:08:33 +00:00
e3e3e8edf2
[tx-robot] updated from transifex
2017-05-27 00:08:32 +00:00
a46d2f1d39
[tx-robot] updated from transifex
2017-05-25 00:08:04 +00:00
ed89034047
dont die if we try to access the shared cache while setting up the shared storage
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-05-24 13:56:09 +02:00
9c8a838624
[tx-robot] updated from transifex
2017-05-23 00:08:29 +00:00
3ec9d91bd0
Split multi-author entries
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-22 10:39:49 +02:00
bc8fbc1a67
Bump app versions as well
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-22 10:35:25 +02:00
fdfe8f7f15
Adjust version requirement
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-22 10:32:05 +02:00
462f12611c
[tx-robot] updated from transifex
2017-05-22 00:08:23 +00:00
119e8474b6
fix for sharing
...
Signed-off-by: Daniel Hansson <daniel@techandme.se>
2017-05-20 16:23:04 +02:00
879e11e7d1
Merge pull request #4812 from nextcloud/move-sharing-to-migration
...
Move the file sharing app to migration
2017-05-18 18:24:43 +02:00
d41fd7471c
[tx-robot] updated from transifex
2017-05-18 00:07:48 +00:00
11e04e394d
[tx-robot] updated from transifex
2017-05-17 15:56:32 +00:00
443cbdc739
[tx-robot] updated from transifex
2017-05-17 00:08:09 +00:00
c180ad1caa
Remove primary class from public link download button
2017-05-16 20:47:52 +02:00
91dfff5db4
Revert "fix permissions of mountpoints - take 2"
2017-05-15 12:43:25 -05:00
ad0d0b0916
Merge pull request #4685 from nextcloud/fix_4683
...
fix permissions of mountpoints - take 2
2017-05-15 11:53:59 -05:00
9b750c08ac
update comment to code
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-05-15 15:54:37 +02:00
6e3a914f4a
[tx-robot] updated from transifex
2017-05-13 00:08:00 +00:00
51757716ec
Fix the share type of guest shares when migrating from ownCloud
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-12 09:38:48 +02:00
643b4a4ec4
Move the file sharing app to migration
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-12 09:38:48 +02:00
645f0aa96f
[tx-robot] updated from transifex
2017-05-12 00:07:46 +00:00
241226c23c
[tx-robot] updated from transifex
2017-05-11 00:08:08 +00:00
fb78774eb8
[tx-robot] updated from transifex
2017-05-10 00:08:31 +00:00
37b847ec48
[tx-robot] updated from transifex
2017-05-09 05:08:07 +00:00
6109afc14d
[tx-robot] updated from transifex
2017-05-08 00:07:37 +00:00
412d3e2e80
Fix SharedStorage Test
...
A moveable mount point (What a SharedStorage is) always has DELETE +
UPDATE permissions. Since you can either delete (unshare) or update
(rename) it.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-05-04 08:43:05 +02:00
4e4bc17ff5
Merge pull request #4545 from individual-it/access-control-3726
...
show error message when "files-drop" upload fails
2017-05-03 00:21:40 +02:00
24ff230f93
Merge pull request #4620 from nextcloud/preview-error-handling
...
better handling of preview generation errors
2017-05-02 21:49:14 +02:00
23cc309606
Handle more error cases
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-02 13:43:48 +02:00
f27d382c47
[tx-robot] updated from transifex
2017-05-02 00:07:20 +00:00
9a366dbe2e
add missing translation and other small fixes
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-28 23:41:36 -03:00
866e5d6d05
use configured lookup server
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-28 23:41:36 -03:00
ab9a36e872
allow apps to set custom mount types
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-28 09:38:21 +02:00
f2f2e7b6fb
some small refactoring and reformating
...
Signed-off-by: Artur Neumann <info@individual-it.net>
2017-04-27 14:16:55 +05:45
79c760a10c
use jqXHR.fail() to check for failures
...
Signed-off-by: Artur Neumann <info@individual-it.net>
2017-04-27 14:16:36 +05:45
17a31a51c6
Fix share indicator handling
...
Properly update the fileInfoModel with the updated share types, which
also updates the file list row indicator properly
2017-04-26 13:38:12 +02:00
133f3fdc9a
[tx-robot] updated from transifex
2017-04-25 00:07:30 +00:00
c5617f4e8a
Merge pull request #4463 from danxuliu/fix-working-icon-placement-on-password-save
...
Fix working icon placement on password save
2017-04-24 14:34:56 +02:00
36f55b5867
Fix working icon placement on password save
...
Before, the icon appeared below the text input for the password. Now, it
appears inside the text input, to the right end.
The CSS was adjusted based on other icons shown in that position for
other text inputs in the Share tab view, like the information icon or
the clipboard icon.
Fixes #4135
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-24 11:50:06 +02:00
3d671cc536
Merge pull request #4443 from nextcloud/cleanup-unused-imports
...
Remove unused use statements
2017-04-24 11:47:37 +02:00
c54a59d51e
Remove unused use statements
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-22 19:23:31 -05:00
11c7953888
[tx-robot] updated from transifex
2017-04-23 00:07:31 +00:00
e9b00f84b8
Merge pull request #4406 from nextcloud/fix-unit-test-problems
...
Fix unit test problems
2017-04-21 09:35:01 +02:00
f5b900b654
Merge pull request #4412 from individual-it/master
...
deleted forgotten code in test
2017-04-20 18:04:32 -05:00
faf55adb90
deleted forgotten code in test
...
how embarrassing, left code from before I've done the loop around the test
Signed-off-by: Artur Neumann <info@individual-it.net>
2017-04-20 22:27:51 +05:45
810fb7ff2c
Merge pull request #4402 from nextcloud/fix-clickable-area
...
Fix clickable area in share permissions menu
2017-04-20 16:49:00 +02:00
a0ada9aab4
Don't use deprecated getMock() anymore
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-20 12:30:21 +02:00
b469882595
Merge pull request #4212 from individual-it/master
...
validate file name before uploading in upload only folder
2017-04-20 10:50:56 +02:00
16b8397765
Fix clickable area in share permissions menu
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-19 17:41:26 -05:00
4be923e459
Improve menu CSS
...
* fix mess with menus and actions in the files app
* reduces amount of !important usages
* keeps the behaviour on mobile as well as on desktop
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-19 12:42:23 -05:00
ad24b86013
Merge pull request #4350 from nextcloud/adjust-old-bruteforce-protection-annotations
...
Adjust existing bruteforce protection code
2017-04-19 09:27:23 +02:00
bf58d24b5c
remove accidently left over *f*it
...
Signed-off-by: Artur Neumann <info@individual-it.net>
2017-04-18 20:53:49 +05:45
88f02f27a3
JS tests for upload only function
...
Signed-off-by: Artur Neumann <info@individual-it.net>
2017-04-18 20:43:25 +05:45
cdb65eff34
refactor to make it easier to test
...
Signed-off-by: Artur Neumann <info@individual-it.net>
2017-04-18 20:42:36 +05:45
b072d2c49d
[tx-robot] updated from transifex
2017-04-18 00:07:25 +00:00
dafa9c740a
[tx-robot] updated from transifex
2017-04-15 00:07:36 +00:00
727688ebd9
Adjust existing bruteforce protection code
...
- Moves code to annotation
- Adds the `throttle()` call on the responses on existing annotations
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-14 13:42:40 +02:00
0f96d5a641
[tx-robot] updated from transifex
2017-04-14 00:07:36 +00:00
ec034757fa
Merge pull request #4337 from nextcloud/fix-adblock-share-icon
...
Fix AdBlock blocking share icon, ref #866
2017-04-13 12:10:37 -05:00
66835476b5
Add support for ratelimiting via annotations
...
This allows adding rate limiting via annotations to controllers, as one example:
```
@UserRateThrottle(limit=5, period=100)
@AnonRateThrottle(limit=1, period=100)
```
Would mean that logged-in users can access the page 5 times within 100 seconds, and anonymous users 1 time within 100 seconds. If only an AnonRateThrottle is specified that one will also be applied to logged-in users.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-13 12:00:16 +02:00
06f8ea247b
Remove invalid route
...
Said file doesn't exist anymore and accessing it would just return a 500
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-13 11:05:44 +02:00
396618fd19
[tx-robot] updated from transifex
2017-04-13 00:08:02 +00:00
31024b7700
Merge pull request #4329 from nextcloud/move-out-shared-folder
...
Fix moving files out of a shared folder
2017-04-12 11:44:26 -05:00
b90e91144b
Merge pull request #3614 from nextcloud/discover-federatedsharing-endpoints
...
Discover federatedsharing endpoints
2017-04-12 16:01:07 +02:00
37145a275f
Fix AdBlock blocking share icon, ref #866
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-12 15:04:12 +02:00
2f949f4515
rename Jail::getSourcePath to getUnjailedPath to fix conflict with Local::getSourcePath
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-12 14:55:47 +02:00
35188899e9
Merge pull request #4316 from nextcloud/cleanup-files_sharing-update
...
[files_sharing] Remove unneeded update steps
2017-04-12 10:56:25 +02:00
4d7c7b1816
[files_sharing] Remove unneeded update steps
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-12 00:49:50 -05:00
1729e4471f
Update comments to Nextcloud
...
* based on PR by @Ardinis
* see #4311
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-11 23:16:27 -05:00
81b1dc4930
share api expanded by tags ( #26583 )
...
* share api expanded by tags
* Modified files_sharing JS Unit tests
* modified tests. renamed request parameter. refactoring
* Update Share20OCS.php
Added missing function description
* Update Helper.php
Added missing function description
* Update Helper.php
implicit boolean conversion to !empty()
* Update Share20OCSTest.php
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-11 11:54:13 -05:00
45a6e37699
Merge pull request #4293 from nextcloud/fix_4248
...
Do reload shared views
2017-04-11 11:53:01 -05:00
53bca14a27
Do proper DI
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-11 15:04:01 +02:00
449011dae7
remove discovery manager in favour of the OCSDiscoveryService
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-11 15:04:01 +02:00
afb5d45705
Merge pull request #4256 from nextcloud/theming
...
Move OC_Defaults to OCP\Defaults
2017-04-11 14:39:46 +02:00
8c01e45d6b
Do reload shared views
...
Fixes #4248
The magic introduced in #3686 caused the shared views not to be updated
properly. Thus we just overwrite the _onUrlChange method in the
sharedfilelist.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-11 09:33:27 +02:00
4d90b0520e
[tx-robot] updated from transifex
2017-04-11 00:07:29 +00:00
cbacca4202
move capabilities to share by mail app
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-10 17:18:13 +02:00
5b4adf66e5
Move OC_Defaults to OCP\Defaults
...
* currently there are two ways to access default values:
OCP\Defaults or OC_Defaults (which is extended by
OCA\Theming\ThemingDefaults)
* our code used a mixture of both of them, which made
it hard to work on theme values
* this extended the public interface with the missing
methods and uses them everywhere to only rely on the
public interface
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-09 21:43:01 -05:00
4b0f50c456
[tx-robot] updated from transifex
2017-04-08 00:07:45 +00:00
ca9d25169d
Merge pull request #4136 from nextcloud/expire-date-for-all-shares
...
Unified sharing options
2017-04-07 17:14:05 -05:00
3323d01db1
update unit tests
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-07 15:43:59 +02:00
676a4c781a
update capabilities
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-07 15:43:59 +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
Daniel Hansson
Artur Neumann
Vincent Petry
Michael Jobst