summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #10890 from nextcloud/bugfix/10857/app-menu-resizeRoeland Jago Douma2018-11-032-4/+9
|\ | | | | Fix app menu calculation for random size of the right header
| * Fix app menu calculation for random size of the right headerJulius Härtl2018-11-022-4/+9
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | [tx-robot] updated from transifexNextcloud bot2018-11-0388-132/+198
| |
* | Merge pull request #12071 from nextcloud/addressbook-uid-check-migrationRoeland Jago Douma2018-11-0210-23/+371
|\ \ | | | | | | Addressbook uid check migration
| * | Phpunit fixJohn Molakvoæ (skjnldsv)2018-11-022-25/+36
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Merge branch 'addressbook-uid-check-migration' of ↵John Molakvoæ (skjnldsv)2018-11-01265-1029/+7485
| |\ \ | | | | | | | | | | | | | | | | | | | | https://github.com/nextcloud/server into addressbook-uid-check-migration Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| | * | Update PHPDoc to reflect the actual behaviourMorris Jobke2018-11-011-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| | * | move migrationJohn Molakvoæ (skjnldsv)2018-11-018-102/+84
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| | * | Create cards if noneJohn Molakvoæ (skjnldsv)2018-11-011-5/+45
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| | * | Properly set uid and create and updateJohn Molakvoæ (skjnldsv)2018-11-011-3/+13
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| | * | TestsJohn Molakvoæ (skjnldsv)2018-11-012-1/+122
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| | * | Repair registration and autoload bumpJohn Molakvoæ (skjnldsv)2018-11-014-18/+28
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| | * | Repair StepJohn Molakvoæ (skjnldsv)2018-11-012-3/+130
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| | * | Migration stepJohn Molakvoæ (skjnldsv)2018-11-011-0/+47
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | Fix phpunitJohn Molakvoæ (skjnldsv)2018-11-011-20/+20
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | fixup! move migrationJohn Molakvoæ (skjnldsv)2018-10-301-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | fixup! move migrationJohn Molakvoæ (skjnldsv)2018-10-302-14/+31
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | move migrationJohn Molakvoæ (skjnldsv)2018-10-306-89/+54
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | fixup! Create cards if noneJohn Molakvoæ (skjnldsv)2018-10-301-1/+0
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | Create cards if noneJohn Molakvoæ (skjnldsv)2018-10-301-5/+46
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | Properly set uid and create and updateJohn Molakvoæ (skjnldsv)2018-10-301-3/+13
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | TestsJohn Molakvoæ (skjnldsv)2018-10-302-1/+122
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | Repair registration and autoload bumpJohn Molakvoæ (skjnldsv)2018-10-305-19/+29
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | Repair StepJohn Molakvoæ (skjnldsv)2018-10-302-3/+130
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | Migration stepJohn Molakvoæ (skjnldsv)2018-10-301-0/+47
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | Merge pull request #12215 from ↵Roeland Jago Douma2018-11-021-0/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/wait-for-the-link-share-menu-to-open-in-acceptance-tests Wait for the link share menu to open in acceptance tests
| * | | | Wait for the link share menu to open in acceptance testsDaniel Calviño Sánchez2018-11-021-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | Merge pull request #12216 from nextcloud/bugfix/appmenu/loadingRoeland Jago Douma2018-11-021-2/+4
|\ \ \ \ \ | |_|_|_|/ |/| | | | Fix loading indicator in app menu
| * | | | Fix loading indicator in app menuJulius Härtl2018-11-021-2/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | Merge pull request #11404 from flokli/sendmail-pathRoeland Jago Douma2018-11-022-2/+12
|\ \ \ \ \ | | | | | | | | | | | | Mailer: discover sendmail path instead of hardcoding it to /usr/sbin/sendmail
| * | | | | Fallback to default path is sendmail can't be foundRoeland Jago Douma2018-11-022-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | | | Mailer: discover sendmail path instead of hardcoding it to /usr/sbin/sendmailFlorian Klink2018-11-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `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>
* | | | | | Merge pull request #11875 from ↵Roeland Jago Douma2018-11-0212-28/+761
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | 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
| * | | | | Add acceptance test steps to be used from Talk acceptance testsDaniel Calviño Sánchez2018-11-021-0/+49
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | Test that "Password protect by Talk" is not shown if Talk is not enabledDaniel Calviño Sánchez2018-11-022-0/+48
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | Add "Password protect by Talk" to the menu of link sharesDaniel Calviño Sánchez2018-11-026-12/+222
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | | | Add sending the password by Talk for a link share to ShareAPIControllerDaniel Calviño Sánchez2018-11-022-0/+324
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | Store "sendPasswordByTalk" property of link shares in the databaseDaniel Calviño Sánchez2018-11-022-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | Check "note", "label" and "hide download" too in update share testsDaniel Calviño Sánchez2018-11-021-14/+55
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | Fix update share testsDaniel Calviño Sánchez2018-11-021-2/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | Merge pull request #12200 from nextcloud/tech-debt/noid/cleanup-legacy-sharingMorris Jobke2018-11-023-22/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | Cleanup some unused sharing methods from the old sharing code
| * | | | | | Cleanup some unused sharing methods from the old sharing codeMorris Jobke2018-11-023-22/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | | Merge pull request #12190 from forsd/AddtestFiles_TrashbinMorris Jobke2018-11-021-0/+44
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add test OCA\Files_Trashbin\Capabilities
| * | | | | | | Add test OCA\Files_Trashbin\CapabilitiesUnknown2018-11-011-0/+44
| | | | | | | |
* | | | | | | | Merge pull request #12148 from nextcloud/suppress-wrong-audit-log-messageRoeland Jago Douma2018-11-021-2/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | suppress wrong audit log messages about failed login attempts
| * | | | | | | | first check if the user is already logged in and then try to authenticate ↵Bjoern Schiessle2018-10-301-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | via apache, this way we suppress wrong audit log messages about failed login attempts Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | | | | | | Merge pull request #12198 from ↵Roeland Jago Douma2018-11-021-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/fix/noid/during-hard-failure-log-original-exception Log the previous exception during hard failure
| * | | | | | | | Log the previous exception during hard failureMorris Jobke2018-11-011-1/+1
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * otherwise the exception that was caused by the template is logged Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | | | Merge pull request #12182 from nextcloud/3rdparty/sabre-3.2.3Julius Härtl2018-11-023-8/+8
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | [3rdparty] Bump sabre/dav to 3.2.3
| * | | | | | | Fix testsRoeland Jago Douma2018-11-012-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>