summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #12105 from nextcloud/using-resharing-right-to-display-sharesRoeland Jago Douma2018-11-047-23/+141
|\
| * revert testsMaxence Lange2018-11-022-11/+11
| * user can have his resharing rights revoked, yet seeing created sharesMaxence Lange2018-11-022-10/+19
| * check parents resharing rightsMaxence Lange2018-11-021-6/+14
| * Use property to check if a share entry is shared with the current userJulius Härtl2018-11-023-13/+17
| * Add uid_owner to enable permission settings on the viewsJulius Härtl2018-11-021-1/+8
| * Remove reshare owner entry from the share listJulius Härtl2018-11-021-0/+3
| * Show share settings for owner and reshare owners onlyJulius Härtl2018-11-024-7/+33
| * limit to circles moderatorMaxence Lange2018-11-021-1/+2
| * display shares to circles moderatorMaxence Lange2018-11-021-0/+22
| * shares are displayed to users with resharing rightsMaxence Lange2018-11-022-11/+49
* | Merge pull request #12230 from nextcloud/bugfix/do_not_logerror_on_filelockRoeland Jago Douma2018-11-043-20/+13
|\ \
| * | Fix testsRoeland Jago Douma2018-11-042-20/+10
| * | Do not log FileLock as exceptionRoeland Jago Douma2018-11-041-0/+3
|/ /
* | [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 headerJulius Härtl2018-11-022-4/+9
* | | [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
|\ \ \
| * | | Phpunit fixJohn Molakvoæ (skjnldsv)2018-11-022-25/+36
| * | | Merge branch 'addressbook-uid-check-migration' of https://github.com/nextclou...John Molakvoæ (skjnldsv)2018-11-01265-1029/+7485
| |\ \ \
| | * | | Update PHPDoc to reflect the actual behaviourMorris Jobke2018-11-011-2/+2
| | * | | move migrationJohn Molakvoæ (skjnldsv)2018-11-018-102/+84
| | * | | Create cards if noneJohn Molakvoæ (skjnldsv)2018-11-011-5/+45
| | * | | Properly set uid and create and updateJohn Molakvoæ (skjnldsv)2018-11-011-3/+13
| | * | | TestsJohn Molakvoæ (skjnldsv)2018-11-012-1/+122
| | * | | Repair registration and autoload bumpJohn Molakvoæ (skjnldsv)2018-11-014-18/+28
| | * | | Repair StepJohn Molakvoæ (skjnldsv)2018-11-012-3/+130
| | * | | Migration stepJohn Molakvoæ (skjnldsv)2018-11-011-0/+47
| * | | | Fix phpunitJohn Molakvoæ (skjnldsv)2018-11-011-20/+20
| * | | | fixup! move migrationJohn Molakvoæ (skjnldsv)2018-10-301-1/+1
| * | | | fixup! move migrationJohn Molakvoæ (skjnldsv)2018-10-302-14/+31
| * | | | move migrationJohn Molakvoæ (skjnldsv)2018-10-306-89/+54
| * | | | fixup! Create cards if noneJohn Molakvoæ (skjnldsv)2018-10-301-1/+0
| * | | | Create cards if noneJohn Molakvoæ (skjnldsv)2018-10-301-5/+46
| * | | | Properly set uid and create and updateJohn Molakvoæ (skjnldsv)2018-10-301-3/+13
| * | | | TestsJohn Molakvoæ (skjnldsv)2018-10-302-1/+122
| * | | | Repair registration and autoload bumpJohn Molakvoæ (skjnldsv)2018-10-305-19/+29
| * | | | Repair StepJohn Molakvoæ (skjnldsv)2018-10-302-3/+130
| * | | | Migration stepJohn Molakvoæ (skjnldsv)2018-10-301-0/+47
* | | | | Merge pull request #12215 from nextcloud/wait-for-the-link-share-menu-to-open...Roeland Jago Douma2018-11-021-0/+8
|\ \ \ \ \
| * | | | | Wait for the link share menu to open in acceptance testsDaniel Calviño Sánchez2018-11-021-0/+8
* | | | | | Merge pull request #12216 from nextcloud/bugfix/appmenu/loadingRoeland Jago Douma2018-11-021-2/+4
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Fix loading indicator in app menuJulius Härtl2018-11-021-2/+4
| | |_|_|/ | |/| | |
* | | | | Merge pull request #11404 from flokli/sendmail-pathRoeland Jago Douma2018-11-022-2/+12
|\ \ \ \ \
| * | | | | Fallback to default path is sendmail can't be foundRoeland Jago Douma2018-11-022-2/+12
| * | | | | Mailer: discover sendmail path instead of hardcoding it to /usr/sbin/sendmailFlorian Klink2018-11-021-1/+1
* | | | | | Merge pull request #11875 from nextcloud/add-support-for-sending-the-password...Roeland Jago Douma2018-11-0212-28/+761
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Add acceptance test steps to be used from Talk acceptance testsDaniel Calviño Sánchez2018-11-021-0/+49
| * | | | | Test that "Password protect by Talk" is not shown if Talk is not enabledDaniel Calviño Sánchez2018-11-022-0/+48