aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #12105 from nextcloud/using-resharing-right-to-display-sharesRoeland Jago Douma2018-11-047-23/+141
|\ | | | | Shares are displayed to users with resharing rights
| * revert testsMaxence Lange2018-11-022-11/+11
| | | | | | Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
| * user can have his resharing rights revoked, yet seeing created sharesMaxence Lange2018-11-022-10/+19
| | | | | | Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
| * check parents resharing rightsMaxence Lange2018-11-021-6/+14
| | | | | | Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
| * Use property to check if a share entry is shared with the current userJulius Härtl2018-11-023-13/+17
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * Add uid_owner to enable permission settings on the viewsJulius Härtl2018-11-021-1/+8
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * Remove reshare owner entry from the share listJulius Härtl2018-11-021-0/+3
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * Show share settings for owner and reshare owners onlyJulius Härtl2018-11-024-7/+33
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * limit to circles moderatorMaxence Lange2018-11-021-1/+2
| | | | | | Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
| * display shares to circles moderatorMaxence Lange2018-11-021-0/+22
| | | | | | Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
| * shares are displayed to users with resharing rightsMaxence Lange2018-11-022-11/+49
| | | | | | Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
* | Merge pull request #12230 from nextcloud/bugfix/do_not_logerror_on_filelockRoeland Jago Douma2018-11-043-20/+13
|\ \ | | | | | | Do not log FileLock as exception
| * | Fix testsRoeland Jago Douma2018-11-042-20/+10
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Do not log FileLock as exceptionRoeland Jago Douma2018-11-041-0/+3
|/ / | | | | | | | | | | | | | | 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>
* | [tx-robot] updated from transifexNextcloud bot2018-11-0450-44/+254
| |
* | 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>
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-11 03:24:31 +0000