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

4079 commits

Author SHA1 Message Date
Morris Jobke
d70b010432
Merge pull request #12447 from nextcloud/bugfix/12446/fix-oracle-install-again 
Shorten index name of calendar changes table
 2018-11-15 10:47:51 +01:00
Nextcloud bot
10c9b37461
[tx-robot] updated from transifex 2018-11-15 01:12:14 +00:00
John Molakvoæ (skjnldsv)
2b7832d0c9
Fix breakpoint and shrinking of the content + list 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-11-14 17:19:35 +01:00
Joas Schilling
aa88254f64
Shorten index name of calendar changes table 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-11-14 10:14:23 +01:00
Morris Jobke
79681ef3d9
Merge pull request #12398 from nextcloud/fix/12378 
change "Download" to "Download all files" for shared folders
 2018-11-13 17:21:09 +01:00
Nextcloud bot
5e84824839
[tx-robot] updated from transifex 2018-11-13 01:12:40 +00:00
Morris Jobke
fd8eeccb15
Merge pull request #11942 from nextcloud/techdebt/noid/use-count-function 
Use the defined func()->count() instead of manual counting
 2018-11-12 17:43:56 +01:00
Morris Jobke
bbd51f4ddb
Merge pull request #12385 from nextcloud/fix/12356/grid-toggle-fix 
Fixes the grid toggle for none folder shares
 2018-11-11 23:30:14 +01:00
Nextcloud bot
6dc2b03ebe
[tx-robot] updated from transifex 2018-11-11 01:13:10 +00:00
Jonas Sulzer
1f237c7e25
change "Download" to "Download all files" for shared folders 
fixes #12378

Signed-off-by: Jonas Sulzer <jonas@violoncello.ch>
 2018-11-10 19:10:31 +01:00
Nextcloud bot
cc96b93f95
[tx-robot] updated from transifex 2018-11-10 01:12:25 +00:00
Michael Weimann
04b9154c9a
Fixes the grid toggle for none folder shares 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2018-11-09 22:28:19 +01:00
Nextcloud bot
da57aaf814
[tx-robot] updated from transifex 2018-11-09 01:12:25 +00:00
Joas Schilling
bb352fb667
Use the defined func()->count() instead of manual counting 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-11-08 15:44:45 +01:00
Nextcloud bot
55f0c2ac3b
[tx-robot] updated from transifex 2018-11-08 01:12:18 +00:00
John Molakvoæ (skjnldsv)
f54b201f23
Better primary visual on public pages 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-11-07 16:30:59 +01:00
Morris Jobke
7940a79a41
Merge pull request #12324 from nextcloud/add-password-response-parameter-for-returning-the-password-of-link-shares 
Add "password" parameter to the response data of link shares
 2018-11-07 16:29:05 +01:00
Morris Jobke
463dfb50d9
Fix unit tests 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-11-07 10:25:36 +01:00
Morris Jobke
9669d451e3
Reduce function calls 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-11-07 10:19:20 +01:00
Morris Jobke
ca93d73f97
Improve text to be better translatable and use CSS instead of HTML for bold text 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-11-07 10:19:20 +01:00
Morris Jobke
68d39e4b92
Fix indentation of CSS 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-11-07 10:19:20 +01:00
Michael Weimann
c572c669e5
Adapts the code to the new master state 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2018-11-07 10:19:20 +01:00
Michael Weimann
e0ab2902d6
Moves the terms of service into a dialog 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2018-11-07 10:19:19 +01:00
Michael Weimann
95a19bdfdd
Inlines the share note for file drops 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2018-11-07 10:19:19 +01:00
Michael Weimann
08e681b221
Inlines the share note for file drops 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2018-11-07 10:19:19 +01:00
Michael Weimann
16f379b974
Hides the header actions for file drops 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2018-11-07 10:19:19 +01:00
Nextcloud bot
c26d847d19
[tx-robot] updated from transifex 2018-11-07 01:12:29 +00:00
Daniel Calviño Sánchez
b2cc2d6023 Add "password" parameter to the response data of link shares 
Due to legacy reasons the password of link shares was returned in the
"share_with" and "share_with_displayname" parameters of the response
data. Now a proper "password" parameter is returned too; the old
"share_with" and "share_with_displayname" parameters are kept, although
deprecated, and they will be removed in a future version of Nextcloud.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-11-06 23:48:28 +01:00
John Molakvoæ (skjnldsv)
cac2f7f4d6
Fix tests 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-11-06 16:05:34 +01:00
John Molakvoæ (skjnldsv)
98edf3612c
Fix min trhumbnail size 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-11-06 11:45:19 +01:00
John Molakvoæ (skjnldsv)
5682d302c7
Add grid toggle for every files view 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-11-06 11:42:18 +01:00
Nextcloud bot
54a30a4b81
[tx-robot] updated from transifex 2018-11-06 01:12:39 +00:00
Morris Jobke
cba3883410
Merge pull request #12185 from nextcloud/cleanup/dicontainer 
Cleanup the DIContainer
 2018-11-05 12:16:36 +01:00
Nextcloud bot
c28ea52155
[tx-robot] updated from transifex 2018-11-05 01:12:32 +00: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
Nextcloud bot
9d7f02ec47
[tx-robot] updated from transifex 2018-11-04 01:14:02 +00:00
Nextcloud bot
f196394c44
[tx-robot] updated from transifex 2018-11-03 01:12:38 +00:00
Roeland Jago Douma
c8cf986527
Fix files_sharing 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-11-02 19:20:37 +01:00
Maxence Lange
77b95ccd12
revert tests 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2018-11-02 12:10:49 +01:00
Maxence Lange
0fc8a0f58e
user can have his resharing rights revoked, yet seeing created shares 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2018-11-02 12:10:49 +01:00
Maxence Lange
236a293f6a
check parents resharing rights 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2018-11-02 12:10:48 +01:00
Maxence Lange
275cea5d9c
limit to circles moderator 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2018-11-02 12:09:28 +01:00
Maxence Lange
72ad2d60b5
display shares to circles moderator 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2018-11-02 12:09:28 +01:00
Maxence Lange
68c44bb642
shares are displayed to users with resharing rights 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2018-11-02 12:09:26 +01:00
Daniel Calviño Sánchez
adf80aa8b3 Add sending the password by Talk for a link share to ShareAPIController 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-11-02 01:57:48 +01:00
Daniel Calviño Sánchez
52cada951b Check "note", "label" and "hide download" too in update share tests 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-11-02 01:56:07 +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
Jan-Christoph Borchardt
7bfb32230a Use primary color for share link icon background instead of bland grey 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2018-11-01 21:33:10 +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
Bjoern Schiessle
feb9f72e8b adjust unit tests 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-11-01 04:27:25 +01:00
Bjoern Schiessle
5e90711600 allow to update lables for public link shares 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-11-01 02:18:55 +01:00
Bjoern Schiessle
f377a61f90 allow to add labels to shares 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-11-01 02:15:07 +01:00
Bjoern Schiessle
d0411b2369
allow to create multiple link shares via share api 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-10-31 06:55:52 +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
bfb2a914d2 Honour "hide download" in the public share page 
When the "hide download" property of a share is set the public share
page will not show the download button nor the menu with the download,
direct link and "Add to your Nextcloud" actions; the "downloadURL"
hidden field will not be included either in the generated HTML.

Despite that, note that the "downloadURL" parameter is still set and
passed to the template, as this could be needed anyway to generate
previews (for example, of audio files).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-10-30 15:18:55 +01:00
Roeland Jago Douma
c237a3f003 Expose hide download to public page 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-30 15:18:55 +01:00
Roeland Jago Douma
abbb946bbb Propegate hide download state in share provider 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-30 15:18:55 +01:00
Julius Härtl
ffc32222f1
Styling papercuts 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 14:43:34 +01:00
Julius Härtl
192324e4de
Make dropdown height 6 1/2 entries 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 10:19:35 +01:00
Julius Härtl
5059605c99
Increase max-width of the share autocompletion suggestions 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 10:19:34 +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
6dde7e1183
Improve share select list 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 10:19:32 +01:00
Nextcloud bot
9f99232865
[tx-robot] updated from transifex 2018-10-30 01:12:54 +00:00
Nextcloud bot
18fef12721
[tx-robot] updated from transifex 2018-10-29 01:13:07 +00:00
Nextcloud bot
0092e3adec
[tx-robot] updated from transifex 2018-10-27 00:12:35 +00:00
Morris Jobke
37782b1084
Merge pull request #11573 from nextcloud/gridview-table 
Files grid view
 2018-10-24 15:31:23 +02:00
Nextcloud bot
a9fb21f9fc
[tx-robot] updated from transifex 2018-10-23 14:54:28 +00: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
Morris Jobke
9b092fd4bd
Merge pull request #11967 from nextcloud/fix-opening-a-section-again-in-the-files-app 
Fix opening a section again in the Files app
 2018-10-23 15:29:55 +02:00
John Molakvoæ (skjnldsv)
bf6a1650ce
Use preview-x & preview-y on public pages 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-10-23 08:59:34 +02:00
John Molakvoæ (skjnldsv)
ec05e5d048
Fix public background override 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-10-23 08:54:09 +02:00
John Molakvoæ (skjnldsv)
e0dde083d0
Public fixes, request & default to grid 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-10-23 08:43:02 +02:00
Joas Schilling
3febeb6ca7
Use lax CSP when the share is a talk share 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-10-22 10:57:55 +02:00
Daniel Calviño Sánchez
0426ba6de5 Remove event handler no longer needed 
The custom handler for "URL changed" events were added to reload the
file list whenever the sections for favorites and shares were opened;
this was used to fix the problem of not reloading the file lists when
opening them for a second time. However, besides that the handlers were
not really necessary, and as the root of the bug was fixed in the
previous commit those handlers are now removed.

The file list for tags uses the handler for a different purpose, though,
so that one was kept.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-10-21 20:21:59 +02:00
Daniel Calviño Sánchez
449349e901 Fix opening a section again in the Files app 
When a section is open in the Files app a "show" event is triggered.
File list objects handle that event by reloading themselves, but only
if the file list was shown at least once. However, the file list objects
of plugins are created when the "show" event is triggered for the first
time for their section; as the file list objects register their handler
for the "show" event when they are created they never handle the first
triggered "show" event, as the handler is set while that event is being
already handled. Therefore, from the point of view of the handler, the
second time that a "show" event was triggered it was seen as if the file
list was shown for the first time, and thus it was not reloaded. Now the
"shown" property is explicitly set for those file lists that are created
while handling a "show" event, which causes them to be reloaded as
expected when opening their section again.

Note that it is not possible to just reload the file list whenever it is
shown; the file list is reloaded also when the directory changes, and
this can happen when the web page is initially loaded and the URL is
parsed. In that case, if file lists were reloaded when shown for the
first time then it could be reloaded twice, one with the default
parameters due to the "show" event and another one with the proper
parameters once the URL was parsed, and the files that appeard in the
list would depend on which response from the server was received the
last.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-10-21 20:21:19 +02:00
Roeland Jago Douma
f544c9fec9
Merge pull request #11927 from stweil/clean 
Remove duplicate condition
 2018-10-19 21:15:04 +02:00
Stefan Weil
81c0f2a9a7
Remove duplicate condition 
This fixes a warning from LGTM:

    Operands additionnalShares and additionnalShares are identical.

Fix also the typo in the parameter name.
 2018-10-19 20:19:08 +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
Roeland Jago Douma
97717ae3a7
Merge pull request #11905 from nextcloud/design/noid/tab-icons 
Add icon to file sidebar tabs
 2018-10-19 16:53:56 +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
Julius Härtl
45804b5bef
Add icon to file sidebar tabs 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-18 15:54:17 +02:00
Jan-Christoph Borchardt
39ff82f707
Use grid view in other file views too 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2018-10-18 13:44:05 +02:00
blizzz
2634ceb35b
Merge pull request #11862 from nextcloud/bugfix/ensure_cache_it_init 
Double check for failed cache with a shared storage
 2018-10-17 13:12:57 +02:00
Morris Jobke
b88ab75c3a
Merge pull request #11870 from nextcloud/fix/noid/proper-column-name-escaping 
Properly quote column name in "createFunction" call
 2018-10-16 17:02:26 +02:00
Morris Jobke
b458ed9c82
Properly escape column name in "createFunction" call 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-10-16 15:24:02 +02:00
Roeland Jago Douma
1bc388e507
Double check for failed cache with a shared storage 
When obtaining the SourceRootInfo we can call init. If this fails the
cache is set to a failed cache and the storage to a failed storage.
However we did not check for this. Which means that if the storage was
invalid it would fail later on.

Now we will properly error out.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-16 10:57:37 +02:00
Roeland Jago Douma
bee5bbbf0e
Move files_drop to compiled handlebars 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-16 08:27:06 +02:00
Nextcloud bot
7c26bbbd82
[tx-robot] updated from transifex 2018-10-10 00:13:11 +00:00
Morris Jobke
ab3599155f
Merge pull request #11716 from nextcloud/bugfix/noid/use-numeric-placeholders-for-rtl-translations 
Use numeric placeholders if there are multiple, so that RTL languages…
 2018-10-09 16:31:52 +02:00
Joas Schilling
ea21aa3f7a
Use numeric placeholders if there are multiple, so that RTL languages can operate better 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-10-09 14:32:14 +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
Nextcloud bot
d07c5db947
[tx-robot] updated from transifex 2018-10-09 00:12:27 +00: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
Nextcloud bot
4c47ec005f
[tx-robot] updated from transifex 2018-10-07 00:12:21 +00:00
Nextcloud bot
d9fe68ed12
[tx-robot] updated from transifex 2018-10-05 00:12:56 +00:00
Roeland Jago Douma
13b1cd5cb8
Allow userId to be null 
Fixes #10852

A quick hack. Still ensures some type safety however now also accepts
null. Else we'd need to add a whole new layer of middlewares.

This can only happen when a guest user wants to access a controller that
requries the user_id.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-04 13:04:58 +02:00
Roeland Jago Douma
b10cddebe5
Move sharetabview to compiled handlebars 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-04 09:53:44 +02:00
Marin Treselj
a92e8b4c18
Merge pull request #11538 from nextcloud/heading-bold 
Set headings to Semibold for better information architecture
 2018-10-03 10:09:57 +02:00