summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #18639 from nextcloud/version/18/rc2v18.0.0RC2Roeland Jago Douma2020-01-091-2/+2
|\ | | | | 18 RC 2
| * 18 RC 2Roeland Jago Douma2020-01-091-2/+2
|/ | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* [tx-robot] updated from transifexNextcloud bot2020-01-0964-58/+312
|
* Merge pull request #18726 from marius-wieschollek/bugfix/18661Roeland Jago Douma2020-01-081-1/+1
|\ | | | | [#18661] Always include custom login image in theming
| * [#18661] Always include custom login image in themingMarius David Wieschollek2020-01-071-1/+1
| | | | | | | | Signed-off-by: Marius David Wieschollek <git.public@mdns.eu>
* | Merge pull request #18753 from nextcloud/bugfix/noid/select-menu-hideRoeland Jago Douma2020-01-081-1/+0
|\ \ | | | | | | Do not rerender the selection menu on show
| * | Do not rerender the selection menu on showJulius Härtl2020-01-081-1/+0
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | Merge pull request #18754 from nextcloud/fix/transfer-ownership-input-widthRoeland Jago Douma2020-01-083-5/+23
|\ \ \ | | | | | | | | Make the transfer ownership input a bit wider
| * | | Make the transfer ownership input a bit widerChristoph Wurst2020-01-083-5/+23
|/ / / | | | | | | | | | | | | | | | Fixes #18625 Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | Merge pull request #18749 from nextcloud/fix/18746/use-encode-pathRoeland Jago Douma2020-01-085-21/+22
|\ \ \ | |/ / |/| | Use @nextcloud/paths for file sidebar
| * | Use @nextcloud/paths for file sidebarGary Kim2020-01-085-21/+22
|/ / | | | | | | Signed-off-by: Gary Kim <gary@garykim.dev>
* | Merge pull request #18740 from ↵blizzz2020-01-082-3/+20
|\ \ | | | | | | | | | | | | nextcloud/fix/noid/ldap-better-cache-group-existency cache group existence early to save useless requests to LDAP
| * | cache group existence early to save useless requests to LDAPArthur Schiwon2020-01-082-3/+20
| | | | | | | | | | | | | | | | | | we do it for users already Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | Merge pull request #18733 from exner104/patch-1Roeland Jago Douma2020-01-081-3/+9
|\ \ \ | | | | | | | | Wrong email sender fix #18730
| * | | additional fix to #18730 #18733exner1042020-01-081-0/+8
| | | | | | | | | | | | regarding to advice from @kesselb
| * | | Wrong email sender fix #18730exner1042020-01-081-3/+1
| |/ / | | | | | | Wrong email sender in app sharebymail when sending password to owner fix #18730
* | | Merge pull request #18739 from ↵Roeland Jago Douma2020-01-081-1/+1
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/fix/18712/do-not-check-inherited-shares-on-current-node [inherited shares] do not retrieve shares on current folder
| * | | moving ->getParent earlierMaxence Lange2020-01-081-1/+1
| |/ / | | | | | | Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
* | | Merge pull request #18736 from nextcloud/bugfix/18708Roeland Jago Douma2020-01-081-0/+5
|\ \ \ | |/ / |/| | Fix folder permission styling
| * | Fix folder permission stylingJulius Härtl2020-01-081-0/+5
|/ / | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | Merge pull request #18713 from ↵Roeland Jago Douma2020-01-081-1/+2
|\ \ | | | | | | | | | | | | nextcloud/fix/noid/do-remove-shares-generated-from-circles remove non-circles-generated federated shares only
| * | remove non-circles-generated shares onlyMaxence Lange2020-01-071-1/+2
| | | | | | | | | Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
* | | 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.
| * | | Trash bin: fix exception triggered if no correct fileId is provided.simonspa2020-01-071-2/+2
| | |/ | |/| | | | | | | | | | | | | This fixes #17115 Signed-off-by: Simon Spannagel <simon.spannagel@cern.ch>
* / | [tx-robot] updated from transifexNextcloud bot2020-01-0812-118/+388
|/ /
* | Merge pull request #17861 from ↵Roeland Jago Douma2020-01-074-14/+23
|\ \ | | | | | | | | | | | | nextcloud/fix-tab-navigation-of-menu-in-public-share-pages Fix tab navigation of menu in public share pages
| * | Split the menu entry for external shares in twoDaniel Calviño Sánchez2019-12-303-10/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The external shares entry showed a "button" that, when pressed, replaced the button with the input to set the remote share address. The "button" was actually a label for the input, so when the label was focused it transferred the focus to the input and thus pressing enter or space did not show the input. Moreover, inputs inside links are not valid HTML, and once shown there was no way to hide the input again. Due to all this, and for consistency with the direct link input, the external share input was moved to a different menu item that is shown and hidden when the button, which nows is also a real button, is clicked. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Format HTML elementsDaniel Calviño Sánchez2019-12-301-8/+8
| | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Change menu toggle element from span to buttonDaniel Calviño Sánchez2019-12-302-1/+11
| | | | | | | | | | | | | | | | | | | | | This makes possible to navigate to the menu toggle using the keyboard, as well as being semantically more correct. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | Merge pull request #18724 from nextcloud/fix/18721/encode-uri-for-sidebarRoeland Jago Douma2020-01-073-5/+5
|\ \ \ | | | | | | | | Encode URI for file sidebar
| * | | Encode URI for file sidebarGary Kim2020-01-083-5/+5
| | | | | | | | | | | | | | | | Signed-off-by: Gary Kim <gary@garykim.dev>
* | | | Merge pull request #18707 from nextcloud/enh/pending_shares_overviewRoeland Jago Douma2020-01-079-3/+178
|\ \ \ \ | | | | | | | | | | A pending shares overview
| * | | | Add pending share list to frontendJulius Härtl2020-01-078-8/+148
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net> Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | A pending shares overviewRoeland Jago Douma2020-01-072-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that we accept shares we should show an overview of shares that are pending. This first part is the small API to get a list of the currently pending shares. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #18710 from ↵Roeland Jago Douma2020-01-071-0/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/dependachristoph/composer/id3parser-0.1.1 Update ID3Parser to v1.1.0 for php7.4 compat
| * | | | | Update ID3Parser to v1.1.0 for php7.4 compatChristoph Wurst2020-01-071-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | Merge pull request #18718 from ↵Roeland Jago Douma2020-01-073-3/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | nextcloud/fix/18711/others_with_access_only_with_reshare Only show others with access if you have reshare permissions
| * | | | | Only show others with access if you have reshare permissionsRoeland Jago Douma2020-01-073-3/+3
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #18711 If you do not have reshare permissions the others with access will throw an error anyways. So better to just not show it ;) Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #18576 from BernieO/bernieo-convertInteractiveChristoph Wurst2020-01-071-1/+3
|\ \ \ \ \ | | | | | | | | | | | | enable option '--no-interaction' for db:convert-type
| * | | | | Introduce new variable with the default answer to allow option ↵Bernhard Ostertag2019-12-291-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | --no-interaction for command occ db:convert-type Variable is set to true for --no-interaction and false otherwise Signed-off-by: Bernhard Ostertag <bernieo.code@gmx.de>
| * | | | | enable option '--no-interaction' for db:convert-typeBernhard Ostertag2019-12-271-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bernhard Ostertag <bernieo.code@gmx.de>
* | | | | | 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 Cooki…
| * | | | | Only allow requesting new CSRF tokens if it passes the SameSite Cookie testRoeland Jago Douma2020-01-032-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | Merge pull request #18701 from ↵Roeland Jago Douma2020-01-073-5/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/fix/18632/show_info_when_no_others_with_access_found Show message if no other users with access are found
| * | | | | | Show message if no other users with access are foundRoeland Jago Douma2020-01-063-5/+11
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #18632 Show a small subtitle if no other users with access are found. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | Merge pull request #18535 from nextcloud/enh/flow/newDispatcherblizzz2020-01-078-25/+208
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use the new Events in Flow
| * | | | | | Use the new Events in FlowRoeland Jago Douma2020-01-028-25/+208
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | [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. login
| * | | | | | fix wording log in vs. loginSascha Wiswedel2020-01-064-4/+4
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "log in" is used as verb, while "login" is a noun. In this case, what's supposed to be cancelled is the login process - therefore the noun must be used. Signed-off-by: Sascha Wiswedel <sascha.wiswedel@nextcloud.com>