Commit graph

17610 commits

Author SHA1 Message Date
Arthur Schiwon
04f7252fc4
use hash algo that's robust against collisions
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-03-02 16:26:36 +01:00
Morris Jobke
064cb5ebce
Merge pull request #8612 from nextcloud/rakekniven-i18n-fix
Update commentstabview.js
2018-03-02 10:36:36 +01:00
Nextcloud bot
777313db42
[tx-robot] updated from transifex 2018-03-02 01:12:16 +00:00
rakekniven
b348cd170a
Update commentstabview.js
Changed typo reported at GitHub.
See https://www.transifex.com/nextcloud/nextcloud/translate/#de_DE/$/91002505?issue=yes
2018-03-01 20:53:50 +01:00
Roeland Jago Douma
6b931eb64b
Merge pull request #8588 from nextcloud/fix-breadcrumbs-width-calculation
Fix breadcrumbs width calculation
2018-03-01 20:13:26 +01:00
Joas Schilling
0f3ba9444e
Merge pull request #8298 from nextcloud/bugfix/e2e-45/fix-activities-for-end2end-encryption
Fix activities for e2e encryption
2018-03-01 10:51:27 +01:00
Morris Jobke
6b4a2d01c3
Merge pull request #8574 from nextcloud/breadcrumb-flash-fix
Fixed breadcrumb menu flashing
2018-03-01 09:39:29 +01:00
Nextcloud bot
a7fb9ff8da
[tx-robot] updated from transifex 2018-03-01 01:12:11 +00:00
Daniel Calviño Sánchez
542dc2b335 Fix upload button visible on read-only folders
The div that contains the elements related to the creation of new files,
and thus the upload button, is always present in the DOM; it is hidden
or shown based on the folder permissions by adding or removing the
"hidden" CSS class. However, as the other CSS classes for the div are
"actions" and "creatable" and a "display: flex" rule was defined for
".actions.creatable" below the "display: none" rule for
".actions.hidden" the last one took precedence and the div ended being
always visible, even if the "hidden" CSS class was set. Now the rules
for the ".actions.hidden" selector are defined below the rules for the
".actions.creatable" selector and thus the "display: none" rule is
applied as expected.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-02-28 17:26:36 +01:00
Joas Schilling
8b73560cac
Fix unit test
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-02-28 16:04:45 +01:00
Joas Schilling
0b883ab9d9
Catch exception when the parent is deleted as well
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-02-28 15:40:01 +01:00
Joas Schilling
825c276e84
Do a recursion instead of an endless loop
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-02-28 15:16:18 +01:00
Joas Schilling
62e982a91f
Fix problem with deleted files
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-02-28 15:06:06 +01:00
Joas Schilling
d202bae3b5
Fix path handling for activities
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-02-28 15:06:06 +01:00
Joas Schilling
f8c27cb57d
Add special handling for e2e encryption
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-02-28 15:06:06 +01:00
Joas Schilling
03a25410f1
Extract duplicated logic into a method
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-02-28 15:06:05 +01:00
Daniel Calviño Sánchez
ad71abca6f Update comments in tests
Menu and home are not always visible; home is always visible, but menu
is shown only when needed.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-02-28 15:03:26 +01:00
Daniel Calviño Sánchez
292476911f Improve documentation of "getTotalWidth"
"getTotalWidth" is not more accurate; it is simply not clamped.
Moreover, "width/outerWidth" could be used in tests too, and also even
if "getTotalWidth" could be used in tests while others not that would
not be something to be stated in the API documentation, but in a
comment.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-02-28 15:03:26 +01:00
Daniel Calviño Sánchez
d122d054d3 Do not show the crumbs again after hiding them
After the changes in the previous commit "_showCrumb" no longer shows
the menu, only the same crumb that was hidden by the last call to
"_hideCrumb". Therefore, if the crumb was hidden because it did not fit
there is no need to try to show it again, as it will still not fit.

Moreover, the calculated width for a hidden element is not always
accurate; in some cases the calculated width is lower than the actual
width (it happens, for example, when using a background image like the
"Share" icon), which causea the crumb to be shown even if there is not
enough room, which in the end causes the siblings to overflow the
contents.

No unit tests for this one, though; you will have to trust me on this,
sorry ;-)

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-02-28 15:03:26 +01:00
Daniel Calviño Sánchez
10e9eeec45 Fix menu visibility
The crumb for the menu was shown like any other crumb when calling
"_showCrumb", but it was also shown when other crumbs were hidden
without taking into account the available width. This caused several
related problems, like the breadcrumbs taking too much space when the
menu was sometimes shown after the rest of the crumbs were adjusted to
the available width, or the menu being shown instead of the last crumb
even if there was room for it when the available width was increased.

Now the menu is always hidden before starting the resizing of the crumbs
to ensure that whether it was previously shown or not does not affect
the result. In a similar way, the menu will no longer be shown by
"_showCrumb", as it is not a regular crumb that has to be shown simply
if there is enough room. The menu is now shown as soon as any other
crumb is hidden; this ensures that the menu width will be taken into
account in further width checks. As when _updateMenu" is called it no
longer needs to take care of showing the menu this fixes the issue
revealed when fixing the test setup in the previous commit.

Finally, this implicitly fixes the failure in the breadcrumbs tests when
run on Firefox, as it was caused by the menu interfering in the
calculations of the other crumbs when increasing the width.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-02-28 15:03:26 +01:00
Daniel Calviño Sánchez
1bcba56d8f Fix setup to test the breadcrumbs menu
The "Shows only items not in the breadcrumb" test was failing when run
on Firefox, but not on PhantomJS. This was caused by the differences in
the starting width between both browsers and an incorrect setup of the
test (the width set for the crumbs was overriden when the breadcrumbs
were rendered again, and the breadcrumb was resized to 300 from an
indeterminate initial width).

Now the crumbs are rendered and then its width, padding and margin are
set to a known value. Then it is resized to 1000px, which ensures that
there will be enough room for all the crumbs and thus the menu will be
hidden, and finally it is resized to 300, which causes the middle crumb
to be hidden and the menu to be shown.

Note, however, that the test now always fails, no matter if it is run on
PhantomJS or on Firefox; if the menu crumb is hidden when "_updateMenu"
is called it will show it, but it will also wrongly try to add the menu
itself to the menu. As the "crumb-id" of the menu crumb is "-1" this
causes the last regular crumb to be added to the menu. This will be
fixed with other related issues in the next commit.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-02-28 15:03:26 +01:00
Daniel Calviño Sánchez
92345f2c38 Take padding and margins of crumbs into account
When calculating the total width of the crumbs only its padding was
taken into account; now the margin is too. In a similar way, before
showing a crumb only its width was taken into account; now its padding
and margin are taken into account too.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-02-28 15:03:26 +01:00
Daniel Calviño Sánchez
29c924f74b Use hard-coded values for paddings and margins
This ensures that the resize tests do not depend on the values set in
the CSS files.

Note that this change causes a test to fail with Firefox, but not with
PhantomJS. This is due to a difference in the starting width used by
Firefox and by PhantomJS, and it will be fixed in a following commit.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-02-28 15:03:26 +01:00
Daniel Calviño Sánchez
acdf091f84 Compress siblings before calculating the available width for crumbs
When the parent element of the breadcrumbs was resized to a larger width
and the siblings of the breadcrumbs expanded to fill all the available
width some crumbs could be hidden even if there was enough room for
them. The reason was that the width of the siblings being used to
calculate the available width for the breadcrumbs was the expanded width
of the siblings. Now as many crumbs as possible (that is, fitting in the
parent, no matter the siblings) are first shown so the expanding
siblings are compressed before calculating the available width.

Due to the lack of support for flexboxes in PhantomJS the related unit
test is skipped; it has to be run in other browser, like Firefox.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-02-28 15:03:26 +01:00
Daniel Calviño Sánchez
a37007f872 Take all visible siblings into account
Other apps could add elements to the controls outside the creatable
actions div (for example, the button to switch to the gallery), so the
widths of all the visible siblings of the breadcrumbs have to be taken
into account in the size calculations.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-02-28 15:03:26 +01:00
Daniel Calviño Sánchez
e37c4fd7f3 Take padding and margin of the creatable actions div into account
There are some differences in width handling between the browsers used
to run the tests, most likely due to their support (or lack of) of
certain CSS features: PhantomJS requires "width" to be set (probably
because it does not handle flex displays and treats it like a block, so
"min-width" does not matter in this case), while Firefox requires
"min-width" to be set (otherwise the children of "#controls" could be
compressed due to its use of flex display and the elements would end
with a different width than the one needed for the tests). Due to all
that the width of the breadcrumb siblings must be specified in the tests
using both "width" and "min-width".

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-02-28 15:03:26 +01:00
Daniel Calviño Sánchez
3850221ae1 Do not render the breadcrumbs again in resize tests
There is no need to call "setDirectory" again in resize tests; it is
enough to simply resize them (and isolates them better to just test the
resizing behaviour).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-02-28 15:03:26 +01:00
Daniel Calviño Sánchez
a828e7b12a Replace attribute with local variable
The "usedWidth" attribute was not used elsewhere outside the "_resize"
method, so it was replaced with a local variable. Moreover, it was also
renamed to a more suitable name ("availableWidth").

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-02-28 15:03:26 +01:00
Daniel Calviño Sánchez
a9552de089 Set the width of the parent element in breadcrumb tests
Setting the width of the parent element of the breadcrumbs and then
explicitly calling "_resize" is enough to test the resizing behaviour.
This makes possible to remove the "setMaxWidth" method and its related
code, which was used only for testing purposes.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-02-28 15:03:26 +01:00
Roeland Jago Douma
0e0d852b89
Merge pull request #8566 from nextcloud/provisioning_strict
Make the provisioning api app strict
2018-02-28 14:09:34 +01:00
Roeland Jago Douma
4b05f03c34
Merge pull request #8569 from nextcloud/cleanup_unused_static_sharing
Remove unused static sharing helper code
2018-02-28 13:09:06 +01:00
John Molakvoæ (skjnldsv)
d78026c3b4
Fixed breadcrumb menu flashing
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-02-28 11:04:27 +01:00
Nextcloud bot
533e8351ad
[tx-robot] updated from transifex 2018-02-28 01:12:31 +00:00
Roeland Jago Douma
7e8c84ec20
Remove unused static sharing helper code
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-02-27 22:40:59 +01:00
Roeland Jago Douma
b369abc378
Merge pull request #8565 from nextcloud/bugfix/fat-48/make-outlook-and-thunderbird-addons-identifyable
Make the Outlook and Thunderbird addons identifyable
2018-02-27 22:27:26 +01:00
Roeland Jago Douma
fbeaacdf1b
Fix tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-02-27 22:03:40 +01:00
Morris Jobke
77927442a6
Merge pull request #8496 from nextcloud/ext-strg-design-fixes
External storage design fixes and update
2018-02-27 15:59:06 +01:00
Roeland Jago Douma
24b58a7683
Make the provisioning api app strict
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-02-27 15:47:59 +01:00
Joas Schilling
f81d4eb060
Make the Outlook and Thunderbird addons identifyable
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-02-27 14:37:32 +01:00
Morris Jobke
7bc3c2e057
Merge pull request #7363 from nextcloud/default-share-perms
Let the admin configure the default share permissions
2018-02-27 13:44:34 +01:00
Roeland Jago Douma
01f420c7ac
Merge pull request #8051 from nextcloud/public-template
Public page template response
2018-02-27 13:33:19 +01:00
John Molakvoæ (skjnldsv)
5f217e2d83
fixup! Fixed tests
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-02-27 13:25:42 +01:00
Roeland Jago Douma
017e1325f1
Merge pull request #8285 from nextcloud/apps_files-smb-catch-exceptions-on-listing
Make SMB module more fault-tolerant
2018-02-27 13:10:54 +01:00
John Molakvoæ (skjnldsv)
6ee9a2b35b
fixup! Fixed tests
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-02-27 13:05:39 +01:00
Bjoern Schiessle
3285becdc1
fix unit tests
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-02-27 12:29:25 +01:00
Bjoern Schiessle
ebb15283a6
share api: use default permission of no permission is given
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-02-27 12:29:25 +01:00
Bjoern Schiessle
1615312bf1
add share permissions to settings page
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-02-27 12:29:25 +01:00
John Molakvoæ (skjnldsv)
f1634cd3e2
fixup! Fixed tests
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-02-27 12:27:25 +01:00
Julius Härtl
4a1cbefc90
Fix files_sharing tests
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-02-27 12:25:53 +01:00
Julius Härtl
038aad73c7
Add missing phpdoc for public API
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-02-27 12:25:53 +01:00