Commit graph

46597 commits

Author SHA1 Message Date
Roeland Jago Douma
5d3051ff62
Do not log FileLock as exception
There is no reason to log FileLock errors as exceptions to the log file.
Locks happen for very legit reasons and it is actually a sign of the
code doing its job.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-04 13:55:49 +01:00
Nextcloud bot
9d7f02ec47
[tx-robot] updated from transifex 2018-11-04 01:14:02 +00:00
Roeland Jago Douma
b9783993da
Merge pull request #10890 from nextcloud/bugfix/10857/app-menu-resize
Fix app menu calculation for random size of the right header
2018-11-03 09:35:14 +01:00
Nextcloud bot
f196394c44
[tx-robot] updated from transifex 2018-11-03 01:12:38 +00: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
Roeland Jago Douma
9d89f8bbac
Merge pull request #12071 from nextcloud/addressbook-uid-check-migration
Addressbook uid check migration
2018-11-02 19:37:48 +01:00
Roeland Jago Douma
927130ef34
Merge pull request #12215 from nextcloud/wait-for-the-link-share-menu-to-open-in-acceptance-tests
Wait for the link share menu to open in acceptance tests
2018-11-02 19:35:32 +01:00
Roeland Jago Douma
bc98330a58
Merge pull request #12216 from nextcloud/bugfix/appmenu/loading
Fix loading indicator in app menu
2018-11-02 19:34:21 +01:00
Roeland Jago Douma
4ba709bb71
Merge pull request #11404 from flokli/sendmail-path
Mailer: discover sendmail path instead of hardcoding it to /usr/sbin/sendmail
2018-11-02 16:17:02 +01:00
Julius Härtl
727df9f970
Fix loading indicator in app menu
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-11-02 15:11:18 +01:00
Roeland Jago Douma
30a1237f81
Merge pull request #11875 from nextcloud/add-support-for-sending-the-password-for-a-link-share-by-nextcloud-talk
Add support for sending the password for a link share by Nextcloud Talk
2018-11-02 14:54:46 +01:00
Daniel Calviño Sánchez
fec8d12fc5 Wait for the link share menu to open in acceptance tests
In the acceptance tests the link share menu is automatically opened if
needed before interacting with an item in the menu; if the menu is not
open it is opened by clicking on its toggle.

However, since a recent change the link share menu is automatically
opened by the regular UI after the link share is created. This causes
that, sometimes, after the creation of a link share the acceptance tests
check whether the menu is shown or not before the menu was automatically
opened; as the menu is not open then the acceptance tests proceed to
click on the toggle, but in the meantime the link share was created and
the menu opened, so clicking on the toggle now closes it. As the menu is
closed it is not possible to interact with its items and the test fails.

To prevent that now the acceptance tests wait for the link share menu to
open after a link share is created before continuing with the other
steps.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-11-02 14:24:52 +01:00
John Molakvoæ (skjnldsv)
66624cfe0a
Phpunit fix
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-11-02 14:20:53 +01:00
Morris Jobke
337cd25187
Merge pull request #12200 from nextcloud/tech-debt/noid/cleanup-legacy-sharing
Cleanup some unused sharing methods from the old sharing code
2018-11-02 14:03:51 +01:00
Roeland Jago Douma
054056a8df
Fallback to default path is sendmail can't be found
If the sendmail binary can't be found at all we fallback to the default
path.
It most likely is not there but then at least a proper error message
pops up.

Updated the tests to also properly pass.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-02 14:03:11 +01:00
Morris Jobke
f5728f2c14
Merge pull request #12190 from forsd/AddtestFiles_Trashbin
Add test OCA\Files_Trashbin\Capabilities
2018-11-02 14:01:25 +01:00
Florian Klink
7078a0e53e
Mailer: discover sendmail path instead of hardcoding it to /usr/sbin/sendmail
`sendmail` can very well be in a path different from
`/usr/sbin/sendmail`.

We already search `$PATH` at `lib/private/Settings/Admin/Mail.php` to
detect whether we want to offer sendmail as a mail transfer method, so
let's be consistent and actually initialize `\Swift_SendmailTransport`
with this path to sendmail, instead of just hardcoding
`/usr/sbin/sendmail`.

Signed-off-by: Florian Klink <flokli@flokli.de>
2018-11-02 13:57:43 +01:00
Roeland Jago Douma
7ba8700ba1
Merge pull request #12148 from nextcloud/suppress-wrong-audit-log-message
suppress wrong audit log messages about failed login attempts
2018-11-02 13:52:50 +01:00
Roeland Jago Douma
88cf60a149
Merge pull request #12198 from nextcloud/fix/noid/during-hard-failure-log-original-exception
Log the previous exception during hard failure
2018-11-02 13:49:32 +01:00
Daniel Calviño Sánchez
f57b07e2c2 Add acceptance test steps to be used from Talk acceptance tests
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-11-02 13:30:22 +01:00
Daniel Calviño Sánchez
a784e1fcc1 Test that "Password protect by Talk" is not shown if Talk is not enabled
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-11-02 13:30:22 +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
166907afef
Merge pull request #12182 from nextcloud/3rdparty/sabre-3.2.3
[3rdparty] Bump sabre/dav to 3.2.3
2018-11-02 13:09:46 +01:00
Morris Jobke
f13c7dda1c
Merge pull request #12207 from nextcloud/item-list-popover-fix
Fix popover menu alignment in list
2018-11-02 10:58:30 +01:00
Morris Jobke
248d95339d
Cleanup some unused sharing methods from the old sharing code
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-11-02 10:49:42 +01:00
John Molakvoæ (skjnldsv)
6200ee78f9
Fix popover menu alignment in list
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-11-02 09:57:11 +01:00
Morris Jobke
0f08f3cd41
Merge pull request #12177 from nextcloud/fix/apptoken_login_flow_proper_host
Use the proper server for the apptoken flow login
2018-11-02 09:39:40 +01:00
Roeland Jago Douma
d836b853ea
Merge pull request #12195 from nextcloud/fulltextsearch-info-xsd
add the tag fulltextsearch
2018-11-02 09:07:08 +01:00
Maxence Lange
cd729b696b
Merge pull request #12193 from nextcloud/interface-fulltxtsearch-issue-00002
+infoBool / +infoInt
2018-11-02 08:38:02 +01:00
Roeland Jago Douma
2cae91904c
Merge pull request #12194 from nextcloud/fix-path-as-dashboard-is-already-imported
fix path to DashboardManager, as the class is already imported (minor)
2018-11-02 08:22:05 +01:00
Nextcloud bot
3b5e031e6b
[tx-robot] updated from transifex 2018-11-02 01:13:34 +00: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
fe8a67f517 Store "sendPasswordByTalk" property of link shares in the database
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
Daniel Calviño Sánchez
00e4c8aee4 Fix update share tests
The update share tests only checked that the share returned by
"update()" had the expected values. However, as "update()" returns the
same share that was given as a parameter the tests were not really
verifying that the values were updated in the database.

In a similar way, the test that checked that a password was removed did
not set a password first, so even if the database returned null it could
be simply returning the default value for the share; a password must be
set first to ensure that it is removed.

Besides that, a typo was fixed too that made the checks on the original
share instead of on the one returned by "update()"; right now it is the
same share, so the change makes no difference, but it is how the check
should be done anyway.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-11-02 01:09:01 +01:00
Morris Jobke
8bfbefa117
Merge pull request #11053 from nextcloud/occ-app-update-command
occ app update command
2018-11-02 00:41:59 +01:00
Jan-Christoph Borchardt
6702576dfc
Merge pull request #12192 from nextcloud/development-setup
Development setup in readme, and some adjustments
2018-11-02 00:23:46 +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
Morris Jobke
affdb0e4d1
Log the previous exception during hard failure
* otherwise the exception that was caused by the template is logged

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-11-01 22:27:56 +01:00
Morris Jobke
35e3d40e80
Merge pull request #12188 from nextcloud/revert/9900/revert-wait-for-cron
Revert "Wait for cron to finish before running upgrade command"
2018-11-01 21:52:20 +01:00
Morris Jobke
d96e2ce111
Merge pull request #12196 from nextcloud/revert-12138-and-12138
Revert important rule for hidden class and inline button style
2018-11-01 21:48:52 +01:00
Maxence Lange
70b8c5672b init some var
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
2018-11-01 21:37:59 +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
Daniel Calviño Sánchez
b23289da1a Adjust acceptance tests to changes in link shares
Although now it is possible to create several link shares the acceptance
tests currently handles only the first link share; this first link share
is now created by clicking an "Add new share" button instead of a
checkbox.

Besides that, the "Copy link" button has been moved from the menu to the
row, next to the menu trigger.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
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)
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