summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #18753 from nextcloud/bugfix/noid/select-menu-hideRoeland Jago Douma2020-01-081-1/+0
|\
| * Do not rerender the selection menu on showJulius Härtl2020-01-081-1/+0
* | Merge pull request #18754 from nextcloud/fix/transfer-ownership-input-widthRoeland Jago Douma2020-01-083-5/+23
|\ \
| * | Make the transfer ownership input a bit widerChristoph Wurst2020-01-083-5/+23
|/ /
* | Merge pull request #18749 from nextcloud/fix/18746/use-encode-pathRoeland Jago Douma2020-01-085-21/+22
|\ \ | |/ |/|
| * Use @nextcloud/paths for file sidebarGary Kim2020-01-085-21/+22
|/
* Merge pull request #18740 from nextcloud/fix/noid/ldap-better-cache-group-exi...blizzz2020-01-082-3/+20
|\
| * cache group existence early to save useless requests to LDAPArthur Schiwon2020-01-082-3/+20
* | Merge pull request #18733 from exner104/patch-1Roeland Jago Douma2020-01-081-3/+9
|\ \
| * | additional fix to #18730 #18733exner1042020-01-081-0/+8
| * | Wrong email sender fix #18730exner1042020-01-081-3/+1
| |/
* | Merge pull request #18739 from nextcloud/fix/18712/do-not-check-inherited-sha...Roeland Jago Douma2020-01-081-1/+1
|\ \
| * | moving ->getParent earlierMaxence Lange2020-01-081-1/+1
| |/
* | Merge pull request #18736 from nextcloud/bugfix/18708Roeland Jago Douma2020-01-081-0/+5
|\ \ | |/ |/|
| * Fix folder permission stylingJulius Härtl2020-01-081-0/+5
|/
* Merge pull request #18713 from nextcloud/fix/noid/do-remove-shares-generated-...Roeland Jago Douma2020-01-081-1/+2
|\
| * remove non-circles-generated shares onlyMaxence Lange2020-01-071-1/+2
* | Merge pull request #18728 from simonspa/trashbin_exceptionRoeland Jago Douma2020-01-081-2/+2
|\ \
| * | Trash bin: fix exception triggered if no correct fileId is provided.simonspa2020-01-071-2/+2
* | | [tx-robot] updated from transifexNextcloud bot2020-01-0812-118/+388
|/ /
* | Merge pull request #17861 from nextcloud/fix-tab-navigation-of-menu-in-public...Roeland Jago Douma2020-01-074-14/+23
|\ \
| * | Split the menu entry for external shares in twoDaniel Calviño Sánchez2019-12-303-10/+9
| * | Format HTML elementsDaniel Calviño Sánchez2019-12-301-8/+8
| * | Change menu toggle element from span to buttonDaniel Calviño Sánchez2019-12-302-1/+11
* | | Merge pull request #18724 from nextcloud/fix/18721/encode-uri-for-sidebarRoeland Jago Douma2020-01-073-5/+5
|\ \ \
| * | | Encode URI for file sidebarGary Kim2020-01-083-5/+5
* | | | Merge pull request #18707 from nextcloud/enh/pending_shares_overviewRoeland Jago Douma2020-01-079-3/+178
|\ \ \ \
| * | | | Add pending share list to frontendJulius Härtl2020-01-078-8/+148
| * | | | A pending shares overviewRoeland Jago Douma2020-01-072-0/+35
* | | | | Merge pull request #18710 from nextcloud/dependachristoph/composer/id3parser-...Roeland Jago Douma2020-01-071-0/+0
|\ \ \ \ \
| * | | | | Update ID3Parser to v1.1.0 for php7.4 compatChristoph Wurst2020-01-071-0/+0
* | | | | | Merge pull request #18718 from nextcloud/fix/18711/others_with_access_only_wi...Roeland Jago Douma2020-01-073-3/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Only show others with access if you have reshare permissionsRoeland Jago Douma2020-01-073-3/+3
|/ / / / /
* | | | | Merge pull request #18576 from BernieO/bernieo-convertInteractiveChristoph Wurst2020-01-071-1/+3
|\ \ \ \ \
| * | | | | Introduce new variable with the default answer to allow option --no-interacti...Bernhard Ostertag2019-12-291-7/+7
| * | | | | enable option '--no-interaction' for db:convert-typeBernhard Ostertag2019-12-271-5/+7
* | | | | | Merge pull request #18644 from nextcloud/harden/csrf_endpointRoeland Jago Douma2020-01-072-1/+17
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Only allow requesting new CSRF tokens if it passes the SameSite Cookie testRoeland Jago Douma2020-01-032-1/+17
* | | | | | Merge pull request #18701 from nextcloud/fix/18632/show_info_when_no_others_w...Roeland Jago Douma2020-01-073-5/+11
|\ \ \ \ \ \
| * | | | | | Show message if no other users with access are foundRoeland Jago Douma2020-01-063-5/+11
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #18535 from nextcloud/enh/flow/newDispatcherblizzz2020-01-078-25/+208
|\ \ \ \ \ \
| * | | | | | Use the new Events in FlowRoeland Jago Douma2020-01-028-25/+208
* | | | | | | [tx-robot] updated from transifexNextcloud bot2020-01-07142-186/+786
| |/ / / / / |/| | | | |
* | | | | | Merge pull request #18692 from nextcloud/wiswedel/wording/loginRoeland Jago Douma2020-01-064-4/+4
|\ \ \ \ \ \
| * | | | | | fix wording log in vs. loginSascha Wiswedel2020-01-064-4/+4
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #18696 from nextcloud/fix/18380/auto_accept_on_mail_openRoeland Jago Douma2020-01-065-2/+92
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Accept shares when you open mailRoeland Jago Douma2020-01-065-2/+92
|/ / / / /
* | | | | fix overlapping (#18473)John Molakvoæ2020-01-061-3/+2
|\ \ \ \ \
| * | | | | fix overlappingGretaD2019-12-181-3/+2
* | | | | | Merge pull request #18672 from nextcloud/fix/17799/if_disabled_dont_show_link...Roeland Jago Douma2020-01-063-3/+9
|\ \ \ \ \ \