11b9d224fd
Fix semicolon at end of JS lines
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-01 00:42:53 -03:00
3e8c5441f7
Merge pull request #4521 from nextcloud/custom-mount-types
...
allow apps to set custom mount types
2017-04-28 12:50:38 +02:00
ec272f3ac3
Merge pull request #4574 from nextcloud/rename-extension-point
...
Rename extension point
2017-04-28 11:15:28 +02:00
9e7f7ba7f6
Add sharing types for guests
...
Fixes https://github.com/nextcloud/guests/issues/4
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-28 09:56:57 +02:00
e974f26afa
Rename extension point
...
To align with upstream.
Fixes https://github.com/nextcloud/guests/issues/3
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-28 09:49:02 +02: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
9c4275a832
Show tooltip for second action.
...
Signed-off-by: Ivan Sein <ivan@nextcloud.com>
2017-04-27 18:11:35 +02:00
646db7f88d
Merge pull request #4518 from nextcloud/downstream-25838
...
Fix share indicator handling
2017-04-26 19:23:27 +02:00
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
6bbc682c4b
handle 404 separately
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-04-26 09:30:21 +02:00
99b201a188
unit test jquery.contactsmenu
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-04-26 09:28:15 +02:00
e61cf83faf
better detection whether or not contactsmenu target was clicked
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-04-26 09:28:14 +02:00
399f08bd33
add contactsmenu popover to resharer infobox
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-04-26 09:28:14 +02:00
4d60aff6ec
Contactsmenu popover: show proper message when server throws error
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-04-26 09:28:14 +02:00
8f404c1f56
don't toggle sharing popover together with contactsmenu popover
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-04-26 09:28:14 +02:00
c844b2931e
close menu again when clicking on avatar
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-04-26 09:26:56 +02:00
60f9ed6241
add contactsmenu popover
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-04-26 09:26:53 +02:00
241e397326
Merge branch 'master' into contactsmenu
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-26 00:50:38 +02:00
0f0b04b7d9
Fix test
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-26 00:06:56 +02:00
417bc606e4
Merge pull request #4508 from nextcloud/fix/remove-js-debug-logging
...
Remove js debug logging
2017-04-25 18:26:53 -03:00
fd74ad452a
Remove js debug logging
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-04-25 21:42:38 +02:00
2ccaae8968
Fix emptycontent HTML and wording
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-25 20:47:18 +02:00
945420baaf
Use HTTP POST to retrieve the list of contacts
...
We do not want to have sensitive information in the URL and
therefore also not in the access log. Thus the GET request is
replaced by a POST request.
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-04-25 20:47:18 +02:00
5c61852c25
Fix failing contacts menu js test data
...
When we test wheter action menus in the contacts menu close
when clicking other ones, we have to provide test data
that actually causes the view to render the menu.
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-04-25 20:47:18 +02:00
ecd408d524
Fix icon of second action
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-04-25 20:47:17 +02:00
2c2e1f7988
Use absolute URI for action icons
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-04-25 20:47:17 +02:00
5762cd9436
Use tooltop for contact's top action title
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-04-25 20:47:17 +02:00
d091793ceb
Contacts menu
...
* load list of contacts from the server
* show last message of each contact
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-04-25 20:47:17 +02:00
6a16df7288
Add new auth flow
...
This implements the basics for the new app-password based authentication flow for our clients.
The current implementation tries to keep it as simple as possible and works the following way:
1. Unauthenticated client opens `/index.php/login/flow`
2. User will be asked whether they want to grant access to the client
3. If accepted the user has the chance to do so using existing App Token or automatically generate an app password.
If the user chooses to use an existing app token then that one will simply be redirected to the `nc://` protocol handler.
While we can improve on that in the future, I think keeping this smaller at the moment has its advantages. Also, in the
near future we have to think about an automatic migration endpoint so there's that anyways :-)
If the user chooses to use the regular login the following happens:
1. A session state token is written to the session
2. User is redirected to the login page
3. If successfully authenticated they will be redirected to a page redirecting to the POST controller
4. The POST controller will check if the CSRF token as well as the state token is correct, if yes the user will be redirected to the `nc://` protocol handler.
This approach is quite simple but also allows to be extended in the future. One could for example allow external websites to consume this authentication endpoint as well.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-25 20:18:49 +02:00
27b19aaba1
Fix loading spinner for new app menu
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-04-25 17:31:25 +02:00
7548825743
Responsive app menu
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-04-25 17:31:24 +02:00
82c9eb1c56
Merge pull request #4462 from danxuliu/fix-sharing-password-protected-link
...
Fix sharing a password protected link
2017-04-25 14:12:44 +02:00
58cc1251be
Use "complete" callback in onPasswordEntered
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-24 22:18:52 +02:00
e0b0115f99
Extract common ajax call for addShare and updateShare
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-24 22:07:08 +02:00
3ab2958930
Document options parameter in saveLinkShare
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-24 22:05:34 +02:00
6e9f49f397
Add "complete" callback support for addShare
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-24 21:31:53 +02:00
488020cf2e
Add "complete" callback support for updateShare
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-24 21:24:30 +02:00
726c6c73f4
Add missing unit test cases and conditions
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-24 21:24:05 +02:00
fd7257332d
Merge pull request #4321 from nextcloud/improve-sharing-tooltip
...
change sharing tooltip with a more general description of all available share options
2017-04-24 11:12:41 -03:00
7a81d46fcb
Fix link password toggle
...
We took the wrong field from the share api response. So the password was
never shown as set.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-24 14:41:41 +02: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
153d053ee7
Fix working icon not hidden when successfully setting a password
...
When a request to set the password of a shared link is sent a working
icon is shown. However, as there was no "success" callback, the icon was
never hidden again after successfully setting the password (it worked
fine if there was an error, though).
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-24 11:33:07 +02:00
2317d7bb49
Fix sinon.stub deprecation warnings
...
Calls to `sinon.stub(obj, 'meth', fn)` are deprecated and therefore
replaced by `sinon.stub(obj, 'meth).callsFake(fn)` as instructed by
the deprecation warning.
This makes the js unit testing output readable again.
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-04-24 10:39:37 +02:00
d0d34d308a
Add at most 10 password reset requests per 5 minutes and IP range
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-22 08:12:54 +02:00
9536cbf739
Merge pull request #4409 from nextcloud/socialharing_mail
...
Allow social sharing to specify if a new window is opened
2017-04-20 17:59:55 -05:00
f0651cb066
allow to set a password for shares which where created without a password before the admin started to enforce the password
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-20 16:33:26 +02:00
d8dcd72118
allow admin to enforce password on mail shares
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-20 16:33:26 +02:00
48fd0ee9f0
Allow social sharing to specify if a new window is opened
...
For example mail shares should not open a new window because it looks
weird.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-20 16:32:46 +02:00
1c0bffe87f
Fix translations
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-18 16:40:53 -05:00
c6ae57ecee
simplify share placeholder
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-18 12:08:35 +02: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
3eb6f88019
Move to handlebars.min.js
...
core.js is now below 1mb!
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-12 22:22:38 +02:00
abe887cd48
Moved to jquery-ui.custom.min.js
...
Shaves off about 200kb of the default loaded js libs
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-12 20:03:00 +02:00
a3c9dcf82a
change sharing tooltip with a more general description of all available share options
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-12 16:07:42 +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
c2686be8da
Merge pull request #4285 from nextcloud/bump-md5
...
[js] Bump blueimp-md5
2017-04-11 12:07:02 -05:00
58f959864a
Show 'shared via' in share list for reshares
...
Fixes #1330
userA shares a file to userB
userB shares that file to userC
userA can see both userB and userC.
Now they can also see that userB shared it to user C
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-11 13:56:03 +02:00
7d1745d1e7
[js] Bump blueimp-md5
...
* bumped to latest
* moved to min
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-10 20:37:07 +02:00
ca9d25169d
Merge pull request #4136 from nextcloud/expire-date-for-all-shares
...
Unified sharing options
2017-04-07 17:14:05 -05:00
bf30090be5
Parse date trough moment
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-07 22:16:29 +02:00
0dc13d098f
reset password field properties before we hide it
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-07 15:44:00 +02:00
c7b1a48da7
add datepicker to the popover
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-07 15:44:00 +02:00
3bce6a7a6f
allow to edit single files shared by mail. This is useful for collaborative editing documents
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-07 15:44:00 +02:00
3323d01db1
update unit tests
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-07 15:43:59 +02:00
efb21a948e
Merge pull request #4093 from nextcloud/endorse-password-protection
...
Endorse password protection
2017-04-04 11:04:21 +02:00
7d72ae3011
Move to autosize.min.js
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-03 13:42:33 +02:00
868500eda4
let the user set an empty password for share link
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:58:19 +02:00
0d7801b6ce
endorseLinkPassword changed to enableLinkPasswordByDefault
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:58:11 +02:00
cbfe5f3c1f
feature endorse password for share links
...
works like "enforce password protection", but let the
user optionally remove the password protection after the
password is set.
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:58:03 +02:00
5540def5e3
change permission order
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:29:33 +02:00
99ebdc1111
make sure that variables are defined correctly
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:29:33 +02:00
cfbabf8f2f
fix typo and capitalize cruds
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:29:32 +02:00
b84fd7c361
set expire date for all share types
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:29:32 +02:00
3cc0d15f92
add secure drop functionallity to mail shares
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:29:32 +02:00
c191173d59
allow password protected mail shares
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:29:32 +02:00
0d5147bd49
add new password column to the share table in order to set passwords for share by mails
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:20:49 +02:00
d0eefd17d3
allow the user to set a expire date for all shares
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:20:47 +02:00
2950bcbc70
Do not show social menu when there is no link share
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-31 17:29:41 +02:00
0fb7c631ce
Merge pull request #4128 from nextcloud/updateclipboard
...
Update clipboard.js
2017-03-30 14:37:03 +02:00
0da04fd284
Fix tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-29 22:54:08 +02:00
54c68519ce
Allow avatars for full numeric users
...
Fixes #4087
Because of fancy javascript if a full numeric uid was used javascript
would convert this to an int. Now we just convert everything to a string
first.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-29 13:39:48 +02:00
b052addaca
Use minified clipboard.js
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-29 00:27:50 +02:00
dc5ba95469
Merge pull request #4027 from nextcloud/better-spreed-call-urls
...
Better spreed call urls
2017-03-27 16:21:24 +02:00
f4c9e44403
Merge pull request #4073 from nextcloud/secure-drop
...
Rename File drop to Secure drop
2017-03-27 14:39:32 +02:00
16b02a0fa9
Merge pull request #4064 from nextcloud/update-moment
...
Update momentjs
2017-03-27 14:10:54 +02:00
5a6c7877f6
Rename File drop to Secure drop
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-26 16:13:35 -06:00
3c1d76c282
Cleanup code as suggested by @icewind1991
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-26 19:45:36 +02:00
fea2108710
Make async
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-26 15:26:10 +02:00
980ef89dbf
Fix callback
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-26 14:17:01 +02:00
12a019d328
Use eval instead of $.script
...
Fixes https://github.com/nextcloud/server/issues/4067
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-26 14:12:44 +02:00
62827dd1da
use moments.js min in core.js
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-26 10:25:15 +02:00
2f7669179e
Merge pull request #4043 from nextcloud/merge-js-for-template-prepend
...
Merge JS for template prepend
2017-03-24 15:42:08 -06:00
6a4fde11e6
Merge login JS
...
Removes 2 requests.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-24 21:18:24 +01:00
4f73911bab
Merge pull request #4041 from nextcloud/merge-systemtags-js
...
Merge systemtags JS
2017-03-24 21:12:42 +01:00
6a470e5935
Merge JS for template prepend
...
Shaves off 14 requests.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-24 20:37:13 +01:00
4d68324ba6
Merge sharing backend JS
...
Removes 8 requests.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-24 20:17:38 +01:00
a9c3692a9a
Merge systemtags JS
...
Shaves off 7 requests.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-24 20:08:27 +01:00
34f0ad4ebe
Allow to push a non-query URL to the browser history
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-24 11:51:58 +01:00
f94bc6f8bb
Merge pull request #4013 from nextcloud/bundle_vendor_js
...
Bundle vendor js
2017-03-24 10:49:57 +01:00
Morris Jobke
Roeland Jago Douma
Lukas Reschke
Robin Appelman
Ivan Sein
Vincent Petry
Georg Ehrke
Jan-Christoph Borchardt
Christoph Wurst
Julius Härtl
Daniel Calviño Sánchez
Roeland Jago Douma
Bjoern Schiessle
Joas Schilling
Timo Benk
Olivier Paroz