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

2458 commits

Author SHA1 Message Date
Morris Jobke
a9de88e96e
Merge pull request #12350 from nextcloud/filepicker-sorting 
Enable sorting in file picker
 2018-11-20 13:34:51 +01:00
Julius Härtl
5e5cced48c
Properly align loading indicator when switching folders 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-11-16 14:50:40 +01:00
Julius Härtl
916cdb260e
Flip sort indicators 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-11-16 14:12:47 +01:00
Julius Härtl
3e11337b3b
Allow sorting in the file picker 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-11-16 14:12:41 +01:00
John Molakvoæ (skjnldsv)
d0e2a22e83
Fix login loader position and theming support 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-11-16 12:48:13 +01:00
John Molakvoæ (skjnldsv)
a8dafc2ff8
Remove conflicting multiselect 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-11-15 14:08:13 +01:00
Morris Jobke
0c9e411f76
Merge pull request #12418 from nextcloud/bugfix/noid/do-not-show-integrity-warning-always 
Remove outdated integrity warning on each page
 2018-11-12 22:44:55 +01:00
Morris Jobke
761ba1801b
Remove outdated integrity warning on each page 
* integrity warning is shown during update and in the admin setup checks
* there is also the plan to retire this old way of notification

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-11-12 16:54:38 +01:00
John Molakvoæ (skjnldsv)
cddc6c0207
fixup! Use nextcloud-password-confirmation 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-11-12 12:54:17 +01:00
John Molakvoæ (skjnldsv)
1cb5f316ed
Use nextcloud-password-confirmation 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-11-12 11:59:38 +01:00
Morris Jobke
f77e24e725
Merge pull request #12332 from nextcloud/bugfix/12314/existing-link-title 
Also use default label if share label is null
 2018-11-07 16:58:41 +01:00
Morris Jobke
35a9c51efa
Merge pull request #12334 from nextcloud/bugfix/12164/share-dialog-userid 
Only show label if the shareWith value is relevant
 2018-11-07 16:56:55 +01:00
Julius Härtl
d110f0c29c
Also use default label if share label is null 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-11-07 16:04:51 +01:00
Julius Härtl
8ed945a519
Only show label if the shareWith value is relevant 
For local users / groups the display name is enough to show, we just need details for email/remote shares

Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-11-07 15:40:50 +01:00
Julius Härtl
2ba519a5d4
Add es6-shim as polyfill and minify underscore.js 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-11-07 11:14:18 +01:00
John Molakvoæ
0f1edd538e
Merge pull request #12273 from nextcloud/public-share-enforce-pass-fix 
Fix password enforce on public share links
 2018-11-06 18:28:08 +01:00
John Molakvoæ (skjnldsv)
a3bf860be7
Fix sharedialog failure handler 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-11-06 10:47:27 +01:00
John Molakvoæ (skjnldsv)
eeeb19079f
Add focus on pending popover opening 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-11-06 10:32:00 +01:00
John Molakvoæ (skjnldsv)
e0de0a122f
Disable grid for ie 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-11-05 17:27:09 +01:00
John Molakvoæ (skjnldsv)
11b6c22595
Fix password enforce on public share links 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-11-05 10:50:06 +01:00
Roeland Jago Douma
72b7c9ffa0
Merge pull request #12105 from nextcloud/using-resharing-right-to-display-shares 
Shares are displayed to users with resharing rights
 2018-11-04 21:08:11 +01:00
Julius Härtl
a696c011c2
Fix app menu calculation for random size of the right header 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-11-02 19:57:06 +01:00
Daniel Calviño Sánchez
376704e834 Add "Password protect by Talk" to the menu of link shares 
When Talk is enabled the menu for link shares now shows a checkbox to
protect the password by Talk (that is, to show the "Request password by
Talk" UI in the authentication page for the link share).

Although in e-mail shares protecting the share with a password and
protecting the password by Talk are mutually exclusive actions (as when
the password is set it is sent to the sharee, so it must be set again
when protecting it by Talk to be able to verify the identity of the
sharee), in the case of link shares protecting the password by Talk is
an additional step to protecting the share with a password (as just
setting the password does not disclose it to anyone). As such, the
checkbox is shown only when there is a password set for the link share
(even if the field itself for the password is not shown, like when they
are enforced in the settings).

Note that the icon set for the field, "icon-passwordtalk", does not
currently exist; it is the same used for e-mail shares, and it is needed
simply to get the right padding in the menu.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-11-02 13:30:18 +01:00
Julius Härtl
2a17811caf
Use property to check if a share entry is shared with the current user 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-11-02 12:10:48 +01:00
Julius Härtl
2804f3a761
Add uid_owner to enable permission settings on the views 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-11-02 12:09:29 +01:00
Julius Härtl
59377dbd50
Remove reshare owner entry from the share list 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-11-02 12:09:29 +01:00
Julius Härtl
b73e03724c
Show share settings for owner and reshare owners only 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-11-02 12:09:29 +01:00
Morris Jobke
f28691c26e
Merge pull request #11844 from nextcloud/multiple-link-shares 
allow to create multiple link shares via share api
 2018-11-01 22:36:09 +01:00
John Molakvoæ (skjnldsv)
876d6ec8e6 Fixed jsunit 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-11-01 21:33:11 +01:00
John Molakvoæ (skjnldsv)
0a70544cd9 Password policy fix and menu open on first share 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-11-01 21:33:11 +01:00
Jan-Christoph Borchardt
9dea41f8fe Fix wording, sort 'Add another link' to bottom so it does not confuse 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2018-11-01 21:33:10 +01:00
John Molakvoæ (skjnldsv)
a7ea3d29fa Fix password enforcement 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-11-01 21:33:05 +01:00
John Molakvoæ (skjnldsv)
260290ec41 Fix enforce date 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-11-01 21:30:46 +01:00
John Molakvoæ (skjnldsv)
206d6126b6 Fix note display 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-11-01 21:30:45 +01:00
John Molakvoæ (skjnldsv)
106ed07d6a Copy link outside menu 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-11-01 21:30:45 +01:00
John Molakvoæ (skjnldsv)
1bd6d39b39 Migrate link shares to array 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-11-01 21:29:40 +01:00
Julius Härtl
95e34407bf
Add tests for edit permission state on file shares 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-31 12:12:24 +01:00
Julius Härtl
2c990ade77
Do not set indeterminate state for file shares 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-31 11:23:23 +01:00
Roeland Jago Douma
41ff001b77
Merge pull request #11899 from nextcloud/enhancement/noid/sharing-consolidation 
Sharing user consolidation
 2018-10-30 19:27:05 +01:00
Daniel Calviño Sánchez
a1e3098322 Add "Hide download" to the menu of link shares 
Hiding the download does not depend on other settings and it does not
affect other settings either (for example, it would be possible to hide
the downloads yet make the share editable), so a simple checkbox was
added to the menu. However, note that this option is only available for
files, but not for folders.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-10-30 15:18:55 +01:00
Julius Härtl
e6952edaf4
Don't enforce merged property 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 11:37:11 +01:00
Julius Härtl
f116461d4b
Show one share method per contact for inaccurate results 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 10:19:36 +01:00
Julius Härtl
e8e898ede8
Use tab to complete selected entry to the share entry 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 10:19:35 +01:00
Julius Härtl
3313c0142d
Simplify share list text 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 10:19:35 +01:00
Julius Härtl
3e11515b9c
Merge contacts and add type of result to the UI 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 10:19:34 +01:00
Julius Härtl
06d8438fda
Group share suggestions by userid 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 10:19:34 +01:00
Julius Härtl
a1c6e44700
Add collaborators uuid to properly render the avatar and for later grouping 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 10:19:33 +01:00
Julius Härtl
e5cae301eb
Highlight search term in sharing results 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 10:19:33 +01:00
Julius Härtl
6dde7e1183
Improve share select list 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 10:19:32 +01:00
Morris Jobke
0a2476fcb3
Merge pull request #11988 from nextcloud/docs/jsdoc-build 
JSdoc build fixes and move build script out of the root folder
 2018-10-25 15:49:27 +02:00
Morris Jobke
116268a2b5
Merge pull request #11893 from caugner/7837-filesize-format-with-locale 
Formats file sizes using the user's locale
 2018-10-25 14:05:20 +02:00
Julius Härtl
d14434fa2e
Adjust some jsdocs 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-24 16:24:16 +02:00
Morris Jobke
37782b1084
Merge pull request #11573 from nextcloud/gridview-table 
Files grid view
 2018-10-24 15:31:23 +02:00
Morris Jobke
df6e9109c8
Merge pull request #11396 from nextcloud/wellknown-webfinger 
adding .well-known/webfinger
 2018-10-24 14:51:15 +02:00
Claas Augner
d5e142a336
OC.getCanonicalLocale: fix tests 
Signed-off-by: Claas Augner <git@caugner.de>
 2018-10-24 11:17:58 +02:00
Claas Augner
00b8be60f2
humanFileSize: use toLocaleString 
humanFileSize: add test with locale
humanFileSize: use canonical locale
humanFileSize: skip test w/o toLocaleString support
humanFileSize: stub getCanonicalLocale
OC.getCanonicalLocale: cover undefined case
humanFileSize: fix getCanonicalLocale stub

Signed-off-by: Claas Augner <git@caugner.de>
 2018-10-24 09:18:39 +02:00
John Molakvoæ (skjnldsv)
b6981dcecb
Merge branch 'master' of https://github.com/nextcloud/server into gridview-table 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-10-23 16:44:20 +02:00
John Molakvoæ (skjnldsv)
26ca7a0e2f
Add filepicker toggle 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-10-23 10:38:00 +02:00
John Molakvoæ (skjnldsv)
c039bd2bd1
Filepicker grid 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-10-23 10:04:03 +02:00
Stefan Weil
c5d3febf37
Add missing variable declarations 
This fixes errors from LGTM like the following one:

    Variable i is used like a local variable,
    but is missing a declaration.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2018-10-19 20:17:55 +02:00
Morris Jobke
efee380e95
Merge pull request #11885 from dpeukert/master 
Check if the X-XSS-Protection header contains the required fields
 2018-10-19 15:32:17 +02:00
Stefan Weil
2ad38200fb Add missing semicolons 
This fixes some recommendations from LGTM:

    Avoid automated semicolon insertion (90% of all statements
    in the enclosing function have an explicit semicolon).

Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2018-10-19 11:24:24 +02:00
Daniel Peukert
7a5d6ac15c Fix failing tests and add some more 
Signed-off-by: Daniel Peukert <dan.peukert@gmail.com>
 2018-10-17 18:51:01 +02:00
Daniel Peukert
2da4f96bd6 Remove arrow function 
Signed-off-by: Daniel Peukert <dan.peukert@gmail.com>
 2018-10-17 18:10:37 +02:00
Daniel Peukert
b2dfcb5a18 Check if the X-XSS-Protection header contains the required fields 
Signed-off-by: Daniel Peukert <dan.peukert@gmail.com>
 2018-10-17 14:28:51 +02:00
Julius Härtl
0b4ea70995
Tests: Remove spacing from html before comparing the template 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-16 10:49:34 +02:00
Roeland Jago Douma
0a4a23f015
Move jquery.contactsmenu.js to compiled handlebars 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-16 09:51:36 +02:00
Roeland Jago Douma
056a74e323
Fix plural function to be hardcoded 
No more weird eval to construct a plural function.
We just use the plural function from symfony.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-14 20:45:36 +02:00
Christoph Wurst
365f68372f
Use jQuery.getScript to dynamically load script 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-10-14 20:45:36 +02:00
Moritz Beck
b68661ed6e
Allow "same-origin" as "Referrer-Policy" 
Fixes #11531

Although "same-origin" is more strict than e.g. strict-origin it showed up a warning in setupcheck
Based on https://scotthelme.co.uk/a-new-security-header-referrer-policy/

Signed-off-by: Moritz Beck <git@birkenstab.de>
 2018-10-11 13:17:26 +02:00
Morris Jobke
fe45db6ae2
Merge pull request #11744 from burned42/fix_percent_sign_breaking_all_files_view 
Remove duplicate call to decodeURIComponent
 2018-10-11 12:20:07 +02:00
Daniel Calviño Sánchez
c2916b62d3 Ignore "session_lifetime" if it can not be converted to a number 
When "session_lifetime" can not be converted to a number the interval
becomes a NaN due to dividing it by 2. This NaN was "dragged" over all
the other mathematical operations and caused the csrftoken to be got
again and again due to an infinite loop with no pauses in "setInterval".
Now, the interval is set to the default value instead if the
"session_lifetime" can not be converted to a number.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-10-11 10:53:25 +02:00
Bernd Stellwag
0f030d885b Remove duplicate call to decodeURIComponent 
Signed-off-by: Bernd Stellwag <burned@zerties.org>
 2018-10-11 08:00:28 +02:00
Daniel Calviño Sánchez
d143b43a04 Make possible to set the expected status of the well known URL check 
The check is based on the HTTP status returned by the URL, and different
URLs may return different status (for example, DAV returns 207, while
a service like WebFinger would return 200), so the expected status needs
to be set depending on the URL.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-10-10 13:48:56 +02:00
Morris Jobke
b8d54bd53a
Fix a misleading setup check for .well-known/caldav & carddav 
The problem is that the version without the slash is the correct one.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-10-10 10:41:02 +02:00
Christoph Wurst
9af69ca2a5
Fix usage of deprecated OC.webroot 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-10-09 13:53:59 +02:00
Morris Jobke
43ed8bb91a
Merge pull request #11693 from nextcloud/refactor/remove-legacy-sharemodel-areavatarsenabled 
Remove deprecated and unused legacy ShareConfigModel.areAvatarsEnabled()
 2018-10-09 09:09:35 +02:00
Christoph Wurst
47f0447ce0
Remove deprecated and unused legacy ShareConfigModel.areAvatarsEnabled() 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-10-09 07:58:06 +02:00
Christoph Wurst
e836a1457c
Remove deprecated and noop APIs from OC.AppConfig 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-10-09 07:54:34 +02:00
Morris Jobke
6994a2a87d
Merge pull request #11679 from nextcloud/refactor/remove-ie8-apis 
Remove IE8 APIs
 2018-10-08 18:36:07 +02:00
Morris Jobke
3330600dc5
Merge pull request #11682 from nextcloud/refactor/remove-deprecated-unused-fileDownloadPath 
Remove deprecated and unused fileDownloadPath
 2018-10-08 18:04:08 +02:00
Morris Jobke
8acd503975
Merge pull request #11681 from nextcloud/refactor/remove-deprecated-getScrollBarWidth 
Remove deprecated window.getScrollBarWidth
 2018-10-08 17:43:10 +02:00
Christoph Wurst
576e44f890
Remove deprecated and unused fileDownloadPath 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-10-08 16:46:36 +02:00
Christoph Wurst
a0499f4404
Remove deprecated window.getScrollBarWidth 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-10-08 16:41:33 +02:00
Christoph Wurst
dccb3ab5b2
Remove deprecated SVG helpers for old IEs 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-10-08 16:33:41 +02:00
Christoph Wurst
d9783af7bd
Remove outdated comment 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-10-08 16:21:31 +02:00
Christoph Wurst
d5b53d0ede
Remove OC.isIE8 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-10-08 16:18:51 +02:00
Christoph Wurst
dd459bbb7a
Remove OC.scaleFixForIE8 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-10-08 16:17:16 +02:00
Roeland Jago Douma
8932a51b91
Extract translated strings of compiled handlebars 
Follow up to #11615

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-05 12:32:48 +02:00
Roeland Jago Douma
363ec1d3c3
Remove leftover ' 
Followup to #11583

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-04 16:02:09 +02:00
Roeland Jago Douma
b0fd31496b
Move OC.Share to compiled handlebars 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-04 09:53:45 +02:00
Roeland Jago Douma
cd7c17482e
Move systemtags to compiled handlebars 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-04 09:53:44 +02:00
Morris Jobke
c8e617b07c
Set nonce for loading the zxcvbn 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-10-03 17:05:01 +02:00
Morris Jobke
48f483a352
Add missing compiled mimetype list - see #10135 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-10-01 15:54:02 +02:00
Jan-Christoph Borchardt
9b8e884b19
Change wording of 'Copy URL' to more understandable 'Copy link' 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2018-10-01 11:02:12 +02:00
Roeland Jago Douma
7e5b7f75ba
Bump templates to handlebars 4.0.12 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-09-28 21:17:08 +02:00
Morris Jobke
d867f9f091
Merge pull request #11037 from nextcloud/trash-webui-dav 
Use trashbin dav endpoint to list trash in webui
 2018-09-28 16:03:24 +02:00
Roeland Jago Douma
c9e93b8084
Compile contactmenu handlebars templates 
Fixes #11029
For https://github.com/orgs/nextcloud/projects/18

Ship the compiled handlebars templates. This makes it possible to have a
scricter CSP.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-09-27 20:33:58 +02:00
Robin Appelman
073fddcc28
fix trashbin infoparsers interfering with other dav clients 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-09-20 17:03:56 +02:00
Robin Appelman
91066954a8
pass existing data to info parsers 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-09-20 17:03:30 +02:00