summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | | Add "Password protect by Talk" to the menu of link sharesDaniel Calviño Sánchez2018-11-026-12/+222
| * | | | | Add sending the password by Talk for a link share to ShareAPIControllerDaniel Calviño Sánchez2018-11-022-0/+324
| * | | | | Store "sendPasswordByTalk" property of link shares in the databaseDaniel Calviño Sánchez2018-11-022-0/+13
| * | | | | Check "note", "label" and "hide download" too in update share testsDaniel Calviño Sánchez2018-11-021-14/+55
| * | | | | Fix update share testsDaniel Calviño Sánchez2018-11-021-2/+50
* | | | | | 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 codeMorris Jobke2018-11-023-22/+14
* | | | | | | Merge pull request #12190 from forsd/AddtestFiles_TrashbinMorris Jobke2018-11-021-0/+44
|\ \ \ \ \ \ \
| * | | | | | | 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
|\ \ \ \ \ \ \ \
| * | | | | | | | first check if the user is already logged in and then try to authenticate via...Bjoern Schiessle2018-10-301-2/+3
* | | | | | | | | Merge pull request #12198 from nextcloud/fix/noid/during-hard-failure-log-ori...Roeland Jago Douma2018-11-021-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Log the previous exception during hard failureMorris Jobke2018-11-011-1/+1
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #12182 from nextcloud/3rdparty/sabre-3.2.3Julius Härtl2018-11-023-8/+8
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Fix testsRoeland Jago Douma2018-11-012-8/+8
| * | | | | | | [3rdparty] Bump sabre/dav to 3.2.3Roeland Jago Douma2018-11-011-0/+0
* | | | | | | | Merge pull request #12207 from nextcloud/item-list-popover-fixMorris Jobke2018-11-021-1/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix popover menu alignment in listJohn Molakvoæ (skjnldsv)2018-11-021-1/+3
|/ / / / / / / /