Lukas Reschke
94c2f12226
Merge pull request #4638 from nextcloud/fix-copy-tooltip
...
Fix "Copied" message for public links
2017-05-02 10:10:23 +02:00
Nextcloud bot
f27d382c47
[tx-robot] updated from transifex
2017-05-02 00:07:20 +00:00
Morris Jobke
2ce71f8c24
Fix "Copied" message for public links
...
* share a file/fodler by public link and click the
copy to clipboard icon and watch the tooltip
* before: it said "Copy"
* after: it now says "Copied" after clicking the button
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-01 17:58:12 -03:00
Lukas Reschke
72dd4425c9
Merge pull request #4626 from nextcloud/adjust-shipped-json
...
Remove apps delivered from the appstore
2017-05-01 20:49:43 +02:00
Lukas Reschke
8cb3115acf
Merge pull request #4615 from nextcloud/js-reduce-share.js-complexity
...
Remove abandoned methods in OC.Share that refer to old API endpoints
2017-05-01 20:44:19 +02:00
Roeland Jago Douma
4904117ba8
Merge pull request #4612 from nextcloud/js-fix-long-lines
...
Fix some long lines in JS - JSLinut recommendation
2017-05-01 19:55:56 +02:00
Roeland Jago Douma
92b73db053
Merge pull request #4613 from nextcloud/remove-unused
...
Remove unused JS file
2017-05-01 19:42:12 +02:00
Robin Appelman
fa52f906e3
show non landscape icons bigger on the login page
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-05-01 19:05:21 +02:00
Lukas Reschke
0329adbc61
Merge pull request #4599 from nextcloud/contactsmenu-mobile
...
Define max-width for Contacts menu for mobile
2017-05-01 18:05:52 +02:00
Lukas Reschke
4a05ca46d3
Merge pull request #4598 from nextcloud/menu-flashing
...
Prevent flashing of apps and user menu on page load
2017-05-01 18:04:51 +02:00
Lukas Reschke
a2f6fea408
Merge pull request #4610 from nextcloud/js-semicolons
...
Fix semicolon at end of JS lines
2017-05-01 16:55:35 +02:00
Lukas Reschke
99f98ca343
Merge pull request #4614 from nextcloud/js-fix-dialogs-and-octemplate
...
Fix variable definitions in oc dialogs
2017-05-01 16:54:53 +02:00
Lukas Reschke
a3546b0ec0
Remove apps delivered from the appstore
...
Apps that are in shipped.json follow some more requirements such as having a valid code integrity check. This is not something that we require when they come from the appstore as there we verify the download integrity via the signature.
Also the updater treats apps that are shipped differently. We should however handle the apps like any other app from the appstore.
Fixes https://github.com/nextcloud/server/issues/4605
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-01 16:47:58 +02:00
Morris Jobke
23858504eb
Fix variable definition in sharedialogview.js
...
* improves readability of conditional statements
and fixes warning in JSLint for varibale definition
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-01 01:32:54 -03:00
Morris Jobke
4cd8b3379b
Remove unused methods from OC.Share
...
* they do calls against core/ajax/share.php which doesn't exist anymore
* also the methods are not called in any of our apps or any of the apps in the appstore
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-01 01:29:00 -03:00
Morris Jobke
d222351c87
Fix variable definitions in oc dialogs
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-01 01:09:29 -03:00
Morris Jobke
26b92ada0e
Remove unused JS file
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-01 00:59:10 -03:00
Morris Jobke
a9ccfe06d9
Fix some long lines in JS - JSLinut recommendation
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-01 00:49:00 -03:00
Morris Jobke
80a5e0a735
Use dot notation for array access - JSLint recommendation
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-01 00:45:41 -03:00
Morris Jobke
11b9d224fd
Fix semicolon at end of JS lines
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-01 00:42:53 -03:00
Nextcloud bot
2152d5f1f6
[tx-robot] updated from transifex
2017-05-01 00:07:32 +00:00
Morris Jobke
55da62a29c
Make tooltip intransparent
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-29 10:44:38 -03:00
Morris Jobke
9af26d1db5
Merge pull request #4597 from nextcloud/tooltips-invert
...
Invert tooltip color to white, fix #4563
2017-04-29 10:43:33 -03:00
Jan-Christoph Borchardt
bc36446455
Define max-width for Contacts menu for mobile
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-29 13:55:57 +02:00
Jan-Christoph Borchardt
7015eb9fe5
Prevent flashing of apps and user menu
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-29 13:34:44 +02:00
Jan-Christoph Borchardt
41b67e3d17
Invert tooltip color to white, fix #4563
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-29 13:19:17 +02:00
Morris Jobke
d91b4044fc
optimize SVGs
2017-04-29 00:54:30 -03:00
Thomas Pulzer
637c75bca1
Implemented visual feedback if a user is disabled in admin user menu.
...
Implemented visuals for enabling/disabling user from admin user list.
Added the controller functions for enabling/disabling a user.
Added the route for changing user status (enabled/disabled) and added an additional route handler in the user controller.
Finished the visuals to reflect current user status and changed user status respectively.
Changed the single icon for enabling/disabling a user into a menu where deletion and state toggling of a user is selectable.
Added displaying of disabled user count.
Improved style of user action menu.
Added proper counting of disabled users.
Removed visual indicator for disabled users.
Moved pseudo-group detection for disabled users from frontend to the controller.
Changed units for newly introduced css values from em to px.
Removed unnecessary png and optimized svg with scour.
Changed the userlist template to display the user action menu with correct width.
Style fixes for better readability and coding style conformity.
Changed the icons for enabling, disabling and deleting a user in the action menu.
2017-04-29 00:54:30 -03:00
Jan-Christoph Borchardt
2a07ec8e21
Add verification icons
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-28 23:41:36 -03:00
Nextcloud bot
c4673224d1
[tx-robot] updated from transifex
2017-04-29 00:07:17 +00:00
Julius Härtl
d13e311aaf
Invert new header icons on bright theming colors
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-04-28 15:53:33 -03:00
Nextcloud bot
3c4dab1bbe
[tx-robot] updated from transifex
2017-04-28 14:05:56 +00:00
Roeland Jago Douma
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
Lukas Reschke
ec272f3ac3
Merge pull request #4574 from nextcloud/rename-extension-point
...
Rename extension point
2017-04-28 11:15:28 +02:00
Lukas Reschke
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
Lukas Reschke
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
Joas Schilling
3fb7de2dfb
Merge pull request #4562 from nextcloud/contactmenu-second-tooltip
...
Show tooltip for second action in contacts menu
2017-04-28 09:38:35 +02:00
Robin Appelman
ab9a36e872
allow apps to set custom mount types
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-28 09:38:21 +02:00
Thomas Müller
43427e26d7
Add console command to migrate the charset
2017-04-28 09:35:36 +02:00
Lukas Reschke
a809aa51cd
Merge pull request #4570 from nextcloud/do-not-disable-3rdparty-apps-on-cli-upgrade
...
Do not disable 3rdparty apps on occ upgrade
2017-04-28 08:33:28 +02:00
Nextcloud bot
6908818999
[tx-robot] updated from transifex
2017-04-28 00:07:41 +00:00
Morris Jobke
aa10cca61b
Do not disable 3rdparty apps on occ upgrade
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-27 18:11:33 -03:00
Ivan Sein
9c4275a832
Show tooltip for second action.
...
Signed-off-by: Ivan Sein <ivan@nextcloud.com>
2017-04-27 18:11:35 +02:00
Nextcloud bot
c1c5f51fd8
[tx-robot] updated from transifex
2017-04-27 00:07:40 +00:00
Morris Jobke
313c971bd5
Merge pull request #4529 from nextcloud/fix-filelist-checkboxes
...
Fix filelist and checkbox vertical align
2017-04-26 16:52:46 -03:00
Roeland Jago Douma
646db7f88d
Merge pull request #4518 from nextcloud/downstream-25838
...
Fix share indicator handling
2017-04-26 19:23:27 +02:00
Jan-Christoph Borchardt
d17258d4b9
Fix filelist and checkbox vertical align
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-26 16:47:04 +02:00
Vincent Petry
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
Georg Ehrke
6bbc682c4b
handle 404 separately
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-04-26 09:30:21 +02:00
Georg Ehrke
99b201a188
unit test jquery.contactsmenu
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-04-26 09:28:15 +02:00
Georg Ehrke
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
Georg Ehrke
399f08bd33
add contactsmenu popover to resharer infobox
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-04-26 09:28:14 +02:00
Georg Ehrke
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
Georg Ehrke
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
Georg Ehrke
c844b2931e
close menu again when clicking on avatar
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-04-26 09:26:56 +02:00
Georg Ehrke
60f9ed6241
add contactsmenu popover
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-04-26 09:26:53 +02:00
Nextcloud bot
e5fe41e16b
[tx-robot] updated from transifex
2017-04-26 00:07:43 +00:00
Jan-Christoph Borchardt
241e397326
Merge branch 'master' into contactsmenu
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-26 00:50:38 +02:00
Jan-Christoph Borchardt
0f0b04b7d9
Fix test
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-26 00:06:56 +02:00
Morris Jobke
417bc606e4
Merge pull request #4508 from nextcloud/fix/remove-js-debug-logging
...
Remove js debug logging
2017-04-25 18:26:53 -03:00
Christoph Wurst
fd74ad452a
Remove js debug logging
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-04-25 21:42:38 +02:00
Jan-Christoph Borchardt
2ccaae8968
Fix emptycontent HTML and wording
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-25 20:47:18 +02:00
Jan-Christoph Borchardt
4ae5340814
Fix spinner position of Contacts menu
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-25 20:47:18 +02:00
Christoph Wurst
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
Christoph Wurst
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
Christoph Wurst
ecd408d524
Fix icon of second action
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-04-25 20:47:17 +02:00
Christoph Wurst
2c2e1f7988
Use absolute URI for action icons
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-04-25 20:47:17 +02:00
Christoph Wurst
36cee1f386
Let apps register contact menu provider via info.xml
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-04-25 20:47:17 +02:00
Christoph Wurst
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
Christoph Wurst
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
Jan-Christoph Borchardt
61af3f41f0
Fix auth flow background color and redirect view layout
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-25 20:18:49 +02:00
Roeland Jago Douma
aae079aa29
AppToken to 72 chars
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-25 20:18:49 +02:00
Roeland Jago Douma
bb5e5efa6d
Do not remove the state token to early
...
we should check the stateToken before we remove it. Else the check will
always fail.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-25 20:18:49 +02:00
Roeland Jago Douma
05e1092c44
Correctly case the stateToken
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-25 20:18:49 +02:00
Lukas Reschke
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
Julius Härtl
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
Julius Härtl
7548825743
Responsive app menu
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-04-25 17:31:24 +02:00
Morris Jobke
6f2df5e495
Merge pull request #3195 from nextcloud/settings-apps-tabular
...
Make apps settings tabular
2017-04-25 10:25:29 -03:00
Roeland Jago Douma
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
Christoph Wurst
bb1d191f82
Fix remember redirect_url on failed login attempts
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-04-25 09:38:19 +02:00
Nextcloud bot
133f3fdc9a
[tx-robot] updated from transifex
2017-04-25 00:07:30 +00:00
Jan-Christoph Borchardt
88bc43182f
Fix app icon being inverted for app store apps too
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-25 00:22:57 +02:00
Jan-Christoph Borchardt
b48d81d59f
Show placeholder for image-less apps in app management
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-25 00:22:57 +02:00
Daniel Calviño Sánchez
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
Daniel Calviño Sánchez
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
Daniel Calviño Sánchez
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
Daniel Calviño Sánchez
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
Daniel Calviño Sánchez
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
Daniel Calviño Sánchez
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
Morris Jobke
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
Roeland Jago Douma
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
Roeland Jago Douma
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
Roeland Jago Douma
97c27395aa
Merge pull request #4458 from nextcloud/fix/sinon-stub-deprecation-warnings
...
Fix sinon.stub deprecation warnings
2017-04-24 13:47:46 +02:00
Daniel Calviño Sánchez
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
Joas Schilling
3d671cc536
Merge pull request #4443 from nextcloud/cleanup-unused-imports
...
Remove unused use statements
2017-04-24 11:47:37 +02:00
Daniel Calviño Sánchez
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
Christoph Wurst
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
Lukas Reschke
8a1d3c7e87
Merge pull request #4434 from nextcloud/add-rate-limiting-to-solve-challenge-controller
...
Add rate limit to TOTP solve challenge controller
2017-04-24 10:03:19 +02:00
Nextcloud bot
a01f946c56
[tx-robot] updated from transifex
2017-04-24 00:07:28 +00:00
Morris Jobke
c54a59d51e
Remove unused use statements
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-22 19:23:31 -05:00
Nextcloud bot
11c7953888
[tx-robot] updated from transifex
2017-04-23 00:07:31 +00:00
Lukas Reschke
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
Lukas Reschke
c1b8f152d8
Add rate limit to TOTP solve challenge controller
...
Fixes https://github.com/nextcloud/server/issues/2626
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-22 07:59:40 +02:00
Nextcloud bot
363d1c69dd
[tx-robot] updated from transifex
2017-04-22 00:07:36 +00:00
Roeland Jago Douma
b101c6f5fe
Update core.js
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-21 16:44:11 +02:00
Lukas Reschke
f4755218a1
Bump to DOMPurify 0.8.6
...
Fixes https://github.com/nextcloud/server/issues/4424
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-21 16:33:00 +02:00
Nextcloud bot
fb7663cefe
[tx-robot] updated from transifex
2017-04-21 00:07:37 +00:00
Morris Jobke
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
Bjoern Schiessle
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
Bjoern Schiessle
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
Roeland Jago Douma
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
Nextcloud bot
adf316c3af
[tx-robot] updated from transifex
2017-04-20 00:07:36 +00:00
Morris Jobke
16c4755e03
Rename renderHTML to renderHtml
...
* fixes #4383
* improves consistency
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-19 15:46:41 -05:00
Morris Jobke
01c9d00e1d
Merge pull request #4387 from nextcloud/fix-little-glitch
...
Fix font-weight of settings button
2017-04-19 14:45:48 -05:00
Morris Jobke
a55f5c0173
Merge pull request #4388 from nextcloud/remove-unused-stuff
...
Remove unused CSS styles
2017-04-19 14:45:32 -05:00
Morris Jobke
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
Roeland Jago Douma
ac9d0fd14c
Merge pull request #4385 from nextcloud/remove-unused-css
...
Remove unused CSS
2017-04-19 19:27:05 +02:00
Roeland Jago Douma
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
Morris Jobke
1dfd7de10e
Remove unused CSS styles
...
* could not find an traces of .popup and .arrow anywhere else
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-18 22:26:18 -05:00
Morris Jobke
6fa7e41047
Fix font-weight of settings button
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-18 21:38:49 -05:00
Morris Jobke
74936e15d1
Remove unused CSS
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-18 20:36:54 -05:00
Nextcloud bot
febe01f571
[tx-robot] updated from transifex
2017-04-19 00:07:40 +00:00
Nextcloud bot
6b490f45fd
[tx-robot] updated from transifex
2017-04-18 23:08:43 +00:00
Morris Jobke
269600a04f
Merge pull request #4369 from nextcloud/fix-translations
...
Fix translations
2017-04-18 18:01:50 -05:00
Jan-Christoph Borchardt
535ec04245
expand clickable area of popover menu entries to full width
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-18 16:59:35 -05:00
Joas Schilling
1c0bffe87f
Fix translations
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-18 16:40:53 -05:00
Nextcloud bot
c40b7acb09
[tx-robot] updated from transifex
2017-04-18 20:47:45 +00:00
Bjoern Schiessle
c6ae57ecee
simplify share placeholder
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-18 12:08:35 +02:00
Nextcloud bot
b072d2c49d
[tx-robot] updated from transifex
2017-04-18 00:07:25 +00:00
Nextcloud bot
df2235c71f
[tx-robot] updated from transifex
2017-04-17 00:07:33 +00:00
Nextcloud bot
dafa9c740a
[tx-robot] updated from transifex
2017-04-15 00:07:36 +00:00
Lukas Reschke
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
Roeland Jago Douma
6b79bf0960
Merge pull request #4346 from nextcloud/properly-do-bruteforce-protection-via-annotation
...
Make BruteForceProtection annotation more clever
2017-04-14 08:15:55 +02:00
Nextcloud bot
0f96d5a641
[tx-robot] updated from transifex
2017-04-14 00:07:36 +00:00
Lukas Reschke
8149945a91
Make BruteForceProtection annotation more clever
...
This makes the new `@BruteForceProtection` annotation more clever and moves the relevant code into it's own middleware.
Basically you can now set `@BruteForceProtection(action=$key)` as annotation and that will make the controller bruteforce protected. However, the difference to before is that you need to call `$responmse->throttle()` to increase the counter. Before the counter was increased every time which leads to all kind of unexpected problems.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-13 23:05:33 +02:00
Lukas Reschke
81d3732bf5
Merge pull request #4308 from nextcloud/lost-password-email
...
Update email template for lost password email
2017-04-13 20:02:15 +02:00
Morris Jobke
d36751ee38
Merge pull request #2424 from nextcloud/fix-login-controller-test-consolidate-login
...
Fix login controller test and consolidate login
2017-04-13 12:16:38 -05:00
Morris Jobke
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
Lukas Reschke
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
Morris Jobke
7cb6038fca
Merge pull request #3043 from nextcloud/issue-3038-no-logentry-on-email-login
...
Dont create a log entry on email login
2017-04-13 01:04:11 -05:00
Nextcloud bot
396618fd19
[tx-robot] updated from transifex
2017-04-13 00:08:02 +00:00
Roeland Jago Douma
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
Morris Jobke
1f962f9115
Update email template for lost password email
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-12 15:19:53 -05:00
Roeland Jago Douma
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
Bjoern Schiessle
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
Jan-Christoph Borchardt
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
Lukas Reschke
b5d31e4e65
Merge pull request #4309 from nextcloud/remove-unused-code
...
Removes unused code for link share emails
2017-04-12 10:15:59 +02:00
Nextcloud bot
633b952358
[tx-robot] updated from transifex
2017-04-12 00:07:44 +00:00
Morris Jobke
8fa5141aaa
Removes unused code for link share emails
...
* now handled by sharebymail app
* see https://github.com/nextcloud/server/pull/657
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-11 17:32:48 -05:00
Morris Jobke
c2686be8da
Merge pull request #4285 from nextcloud/bump-md5
...
[js] Bump blueimp-md5
2017-04-11 12:07:02 -05:00
Roeland Jago Douma
bd6273ee1c
Merge pull request #4280 from nextcloud/share_via_display
...
Show 'shared via' in share list for reshares
2017-04-11 14:46:22 +02:00
Lukas Reschke
afb5d45705
Merge pull request #4256 from nextcloud/theming
...
Move OC_Defaults to OCP\Defaults
2017-04-11 14:39:46 +02:00
Roeland Jago Douma
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
Lukas Reschke
5ca5ebe584
Merge pull request #2618 from nextcloud/2fa-challenge-text
...
Move log out and backup codes link into 2fa box for better readability
2017-04-11 11:41:55 +02:00
Nextcloud bot
4d90b0520e
[tx-robot] updated from transifex
2017-04-11 00:07:29 +00:00
Roeland Jago Douma
3810e89449
[js] Bump blueimp-md5 a major version
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-10 20:56:56 +02:00
Roeland Jago Douma
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
Morris Jobke
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
Nextcloud bot
d25a96d921
[tx-robot] updated from transifex
2017-04-10 00:08:50 +00:00
Nextcloud bot
16091f4424
[tx-robot] updated from transifex
2017-04-09 00:07:40 +00:00
Nextcloud bot
4b0f50c456
[tx-robot] updated from transifex
2017-04-08 00:07:45 +00:00
Morris Jobke
ca9d25169d
Merge pull request #4136 from nextcloud/expire-date-for-all-shares
...
Unified sharing options
2017-04-07 17:14:05 -05:00
Roeland Jago Douma
bf30090be5
Parse date trough moment
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-07 22:16:29 +02:00
Jan-Christoph Borchardt
50609f0d7a
Increase clickable area of app icon
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-07 21:01:22 +02:00
Jan-Christoph Borchardt
637920f669
Fix share dropdown opacity issue
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-07 20:44:54 +02:00
Jan-Christoph Borchardt
8db3419df1
Fix font-weight of Unshare entry
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-07 20:31:26 +02:00
Bjoern Schiessle
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
Bjoern Schiessle
c7b1a48da7
add datepicker to the popover
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-07 15:44:00 +02:00
Bjoern Schiessle
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
Bjoern Schiessle
3323d01db1
update unit tests
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-07 15:43:59 +02:00
Joas Schilling
7ad791efb4
Dont create a log entry on email login
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-07 10:15:20 +02:00
Nextcloud bot
536650c02f
[tx-robot] updated from transifex
2017-04-07 00:09:11 +00:00
Arthur Schiwon
7b3fdfeeaa
do login routine only once when done via LoginController
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-04-06 15:22:42 +02:00
Arthur Schiwon
2994cbc586
fix login controller tests
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-04-06 15:20:17 +02:00
Nextcloud bot
7d9688c89e
[tx-robot] updated from transifex
2017-04-06 00:07:50 +00:00
Roeland Jago Douma
6bdd3a167d
Merge pull request #4123 from nextcloud/allow-password-reset-with-email
...
Allow to reset the password with the email as an input
2017-04-05 09:12:41 +02:00
Roeland Jago Douma
ddd157a84c
Merge pull request #3741 from nextcloud/user-settings-design
...
User mgmt settings design improvements
2017-04-05 09:02:58 +02:00
Nextcloud bot
84035862f7
[tx-robot] updated from transifex
2017-04-05 00:08:20 +00:00
Jan-Christoph Borchardt
94d4d20c39
proper padding for checkboxes in app-settings
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-04 16:49:43 -05:00
Joas Schilling
75657c1a6e
Merge pull request #4071 from nextcloud/issue-173-database-conversion-failure
...
Make sure blob columns are correctly converted as parameters
2017-04-04 16:29:53 +02:00
Lukas Reschke
e0227cb458
Merge pull request #2095 from nextcloud/bruteforcesetttings
...
Introduce bruteforce settings
2017-04-04 11:57:43 +02:00
Roeland Jago Douma
efb21a948e
Merge pull request #4093 from nextcloud/endorse-password-protection
...
Endorse password protection
2017-04-04 11:04:21 +02:00
Roeland Jago Douma
aee2d6318f
Fix tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-04 10:29:12 +02:00
Nextcloud bot
ec5377306d
[tx-robot] updated from transifex
2017-04-04 00:07:46 +00:00
Roeland Jago Douma
7d72ae3011
Move to autosize.min.js
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-03 13:42:33 +02:00
Roeland Jago Douma
497fe1682f
Bump autosize.js
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-03 13:40:34 +02:00
Roeland Jago Douma
47e342c730
Merge pull request #4175 from nextcloud/fix-socialmenudisplay
...
Do not show social menu when there is no link share
2017-04-03 10:59:44 +02:00
Timo Benk
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
Timo Benk
0d7801b6ce
endorseLinkPassword changed to enableLinkPasswordByDefault
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:58:11 +02:00
Timo Benk
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
Bjoern Schiessle
5540def5e3
change permission order
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:29:33 +02:00
Bjoern Schiessle
99ebdc1111
make sure that variables are defined correctly
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:29:33 +02:00
Bjoern Schiessle
cfbabf8f2f
fix typo and capitalize cruds
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:29:32 +02:00
Bjoern Schiessle
b84fd7c361
set expire date for all share types
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:29:32 +02:00
Bjoern Schiessle
3cc0d15f92
add secure drop functionallity to mail shares
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:29:32 +02:00
Bjoern Schiessle
c191173d59
allow password protected mail shares
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:29:32 +02:00
Bjoern Schiessle
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
Bjoern Schiessle
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
Nextcloud bot
d56f6399eb
[tx-robot] updated from transifex
2017-04-03 00:08:20 +00:00
Roeland Jago Douma
c637ff556a
App is always enabled
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-02 21:13:50 +02:00