wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
41401 commits 157 branches 562 tags 714 MiB
Commit graph

2088 commits

Author SHA1 Message Date
blizzz
8ccc2e2758 Merge pull request #5396 from nextcloud/gpx-mimetype 
add gpx mimetype
 2017-06-15 13:23:32 +02:00
Morris Jobke
fc47d0bbaa Merge pull request #5244 from nextcloud/dynamic-percentual-appmenu-limit 
Now using dynamic percentual appmenu limit
 2017-06-14 11:36:04 -05:00
Arthur Schiwon
0f92a2c6fd
bycatch, x-ldif entry was missing 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-14 11:47:44 +02:00
Arthur Schiwon
4d692b6966
add location filetype icon 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-14 11:46:00 +02:00
Julius Härtl
cec2893d3b
Show at least 8 icons, don't use percentage on mobile 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-06-14 11:14:04 +02:00
Christoph Wurst
64d39aad25 Localize contacts menu search input placeholder 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-06-14 10:29:36 +02:00
Joas Schilling
376fe0e246
Fix escaping of user and group names in "shared by" message 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-06-13 12:14:21 +02:00
Morris Jobke
69b6504285 Merge pull request #5167 from nextcloud/rakekniven-patch-2 
l10n improvements from transifex
 2017-06-12 16:18:54 -05:00
Morris Jobke
6b3b341775 Merge pull request #5315 from nextcloud/global-eval 
execute eval in global scope, addresses #5314
 2017-06-12 15:52:55 -05:00
Joas Schilling
8ecdeaa716
Remove the char because it breaks the export from transifex 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-06-12 16:30:08 +02:00
Patrik Kernstock
c0c5df31c0 Decimal percentage, dynamic appIcon width 
Signed-off-by: Patrik Kernstock <info@pkern.at>
 2017-06-10 17:33:01 +02:00
Arthur Schiwon
944738c71d
execute eval in global scope, addresses #5314 
unsure whether this is properly supported everywhere, injection is not an
option for us

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-09 13:43:09 +02:00
Patrik Kernstock
c88e4e2feb Now using dynamic percentual appmenu limit 
Signed-off-by: Patrik Kernstock <info@pkern.at>
 2017-06-04 03:26:40 +02:00
rakekniven
f2d999aa70 Update setupchecks.js 
Fixed typo and removed doclink symbol.
Reported at transifex

Update util.php

Another l10n improvement from transifex.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-31 13:41:45 +02:00
Patrik Kernstock
65d52a1ddf Closed #5121, remove appmenu limit 
Signed-off-by: Patrik Kernstock <info@pkern.at>
 2017-05-26 19:39:22 +02:00
Morris Jobke
1fedf450ac Update Opcache recommendation 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-21 18:21:28 -05:00
Bjoern Schiessle
e9ab452ff3
rename secure drop back to files drop because of name collision with securedrop.org 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-05-18 16:55:58 +02:00
coderkun
b44c3dd198 Improve warning for X-Frame-Options header DENY (#3808) 
Signed-off-by: Oliver Hanraths <olli@coderkun.de>
 2017-05-14 13:16:36 +02:00
Joas Schilling
0828df5ed4
Disable the API endpoints as well 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-05-11 17:03:57 +02:00
Roeland Jago Douma
34d97aa51c
Request proper size for contacts menu 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-05-08 11:20:49 +02:00
Mario Danic
e4aac15a92
Update login flow redirection 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-05-04 19:21:22 +02:00
Roeland Jago Douma
2216e5dcd0
Fix event firing 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-05-04 09:22:28 +02:00
Felix A. Epp
6f2cc42885 Add radio class to read/write sharing options and 1px left adjustment 
Signed-off-by: Felix A. Epp <work@felixepp.de>
 2017-05-04 01:34:29 +02:00
Felix A. Epp
758576f608 Fix read-only label id 
Signed-off-by: Felix A. Epp <work@felixepp.de>
 2017-05-04 01:33:03 +02:00
Roeland Jago Douma
2e32ab945b Make files drop more permanent 
Implement the suggestions from #2207

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-05-04 00:30:51 +02:00
Roeland Jago Douma
6d9cb62f79 Merge pull request #4611 from nextcloud/js-use-dot-notation 
Use dot notation for array access - JSLint recommendation
 2017-05-02 21:44:44 +02:00
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
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
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
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
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
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
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
Ivan Sein
9c4275a832 Show tooltip for second action. 
Signed-off-by: Ivan Sein <ivan@nextcloud.com>
 2017-04-27 18:11:35 +02: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
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
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
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
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
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
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
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
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
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
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
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
Joas Schilling
1c0bffe87f
Fix translations 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-18 16:40:53 -05:00
Bjoern Schiessle
c6ae57ecee
simplify share placeholder 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-18 12:08:35 +02: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
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
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
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
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
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
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