summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #12254 from nextcloud/dependabot/npm_and_yarn/apps/updaten...Roeland Jago Douma2018-11-052-29/+36
|\
| * Bump css-loader from 1.0.0 to 1.0.1 in /apps/updatenotificationdependabot[bot]2018-11-052-29/+36
* | Merge pull request #12255 from nextcloud/dependabot/npm_and_yarn/apps/updaten...Roeland Jago Douma2018-11-052-101/+101
|\ \
| * | Bump webpack from 4.23.1 to 4.24.0 in /apps/updatenotificationdependabot[bot]2018-11-052-101/+101
| |/
* | Merge pull request #12231 from nextcloud/bugfix/10934/setmodel_before_renderRoeland Jago Douma2018-11-051-1/+1
|\ \
| * | Set the filemodel before rending the detailsviewRoeland Jago Douma2018-11-021-1/+1
* | | [tx-robot] updated from transifexNextcloud bot2018-11-0514-6/+42
| |/ |/|
* | Merge pull request #12105 from nextcloud/using-resharing-right-to-display-sharesRoeland Jago Douma2018-11-041-4/+80
|\ \
| * | revert testsMaxence Lange2018-11-021-6/+4
| * | 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
| * | 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-021-0/+38
* | | 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-0424-12/+52
* | | [tx-robot] updated from transifexNextcloud bot2018-11-0336-36/+52
| |/ |/|
* | Merge pull request #12071 from nextcloud/addressbook-uid-check-migrationRoeland Jago Douma2018-11-025-23/+109
|\ \
| * | Phpunit fixJohn Molakvoæ (skjnldsv)2018-11-022-25/+36
| * | Update PHPDoc to reflect the actual behaviourMorris Jobke2018-11-011-2/+2
| * | move migrationJohn Molakvoæ (skjnldsv)2018-11-014-2/+67
| * | Properly set uid and create and updateJohn Molakvoæ (skjnldsv)2018-11-011-3/+13
* | | Merge pull request #11875 from nextcloud/add-support-for-sending-the-password...Roeland Jago Douma2018-11-022-14/+379
|\ \ \
| * | | Add sending the password by Talk for a link share to ShareAPIControllerDaniel Calviño Sánchez2018-11-022-0/+324
| * | | Check "note", "label" and "hide download" too in update share testsDaniel Calviño Sánchez2018-11-021-14/+55
* | | | 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 #12182 from nextcloud/3rdparty/sabre-3.2.3Julius Härtl2018-11-021-6/+6
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Fix testsRoeland Jago Douma2018-11-011-6/+6
* | | | | | [tx-robot] updated from transifexNextcloud bot2018-11-022-2/+2
| |_|_|/ / |/| | | |
* | | | | Merge pull request #11844 from nextcloud/multiple-link-sharesMorris Jobke2018-11-014-53/+84
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fix wording, sort 'Add another link' to bottom so it does not confuseJan-Christoph Borchardt2018-11-011-0/+5
| * | | | Use primary color for share link icon background instead of bland greyJan-Christoph Borchardt2018-11-011-2/+2
| * | | | Fix note displayJohn Molakvoæ (skjnldsv)2018-11-011-1/+3
| * | | | Copy link outside menuJohn Molakvoæ (skjnldsv)2018-11-011-7/+0
| * | | | Migrate link shares to arrayJohn Molakvoæ (skjnldsv)2018-11-012-26/+24
| * | | | adjust unit testsBjoern Schiessle2018-11-011-2/+22
| * | | | allow to update lables for public link sharesBjoern Schiessle2018-11-011-1/+15
| * | | | allow to add labels to sharesBjoern Schiessle2018-11-011-5/+13
| * | | | allow to create multiple link shares via share apiBjoern Schiessle2018-10-311-9/+0
* | | | | Merge pull request #12150 from nextcloud/techdebt/noid/ldap-rm-iusertoolsMorris Jobke2018-11-017-179/+110
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | remove app specific IUserTools and consolidate testArthur Schiwon2018-10-307-179/+110
| |/ / /
* | | | Merge pull request #12180 from nextcloud/sidebar-fixesMorris Jobke2018-11-012-2/+12
|\ \ \ \
| * | | | Fix issues with clipboard button for local link in sidebarJan-Christoph Borchardt2018-11-011-2/+8
| * | | | Add icon to Versions sidebar tabJan-Christoph Borchardt2018-11-011-0/+4
* | | | | Merge pull request #12162 from nextcloud/file-menu-alignMorris Jobke2018-11-011-2/+13
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Align file menu below '+' button, fix #5595Jan-Christoph Borchardt2018-10-311-2/+13
| | |/ / | |/| |