summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2019-06-2820-28/+54
|
* Merge pull request #16126 from nextcloud/backport/16114/stable15Roeland Jago Douma2019-06-271-3/+5
|\ | | | | [stable15] Fix download link included in public share page with hidden download
| * Fix download link included in public share page with hidden downloadDaniel Calviño Sánchez2019-06-271-3/+5
| | | | | | | | | | | | | | | | The preview element in the public share page was always wrapped with a link to download the file; now that link is included only if the "Hide download" option of the share is not enabled. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | Merge pull request #16129 from nextcloud/backport/16107/stable15Roeland Jago Douma2019-06-271-0/+21
|\ \ | |/ |/| [stable15] verify that paths are valid for recursive local move
| * verify that paths are valid for recursive local moveRobin Appelman2019-06-271-0/+21
|/ | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* Merge pull request #16113 from nextcloud/backport/16101/stable15Roeland Jago Douma2019-06-273-7/+37
|\ | | | | [stable15] invalidates user when plugin reported deletion success
| * Also invalidate groups after deletionArthur Schiwon2019-06-271-2/+11
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * invalidates user when plugin reported deletion successArthur Schiwon2019-06-272-5/+26
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | Merge pull request #16110 from nextcloud/backport/stable15/16011Roeland Jago Douma2019-06-273-20/+83
|\ \ | |/ |/| [stable15] (LDAP) API: return one base properly when multiple are configured
| * fixes return type in php docArthur Schiwon2019-06-271-1/+1
| | | | | | | | | | | | * the backend already expects and works with the string Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * fixes returning the base when multiple are specifiedArthur Schiwon2019-06-272-19/+82
|/ | | | | | | | | | | * reading the config directly will return the value with line breaks * using the proper accessor gives us all bases in an array * returns the first matching one * having user id provided for the group base is strange and does not let us operate like this. here we return the first one. might change in future, a backportable fix won't have an API change however. Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* [tx-robot] updated from transifexNextcloud bot2019-06-278-2/+36
|
* Merge pull request #16092 from nextcloud/backport/16027/stable15Roeland Jago Douma2019-06-261-1/+3
|\ | | | | [stable15] Check if uploading to lookup server is enabled before verifying
| * Check if uploading to lookup server is enabled before verifyingJoas Schilling2019-06-261-1/+3
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #16083 from nextcloud/backport/15832/stable15Roeland Jago Douma2019-06-262-2/+5
|\ \ | | | | | | [stable15] Fix full text search for groupfolders
| * | Fix full text search for groupfoldersMorris Jobke2019-06-252-2/+5
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #16090 from nextcloud/backport/16021/stable15Roeland Jago Douma2019-06-262-0/+6
|\ \ \ | |_|/ |/| | [stable15] Fall back to black for non-color values
| * | Fall back to black for non-color valuesJoas Schilling2019-06-262-0/+6
|/ / | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #16081 from nextcloud/backport/15956/stable15Roeland Jago Douma2019-06-261-2/+2
|\ \ | | | | | | [stable15] Fix appid argument for integrity:check-app
| * | Fix appid argument for integrity:check-appGeorg Ehrke2019-06-251-2/+2
| |/ | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | [tx-robot] updated from transifexNextcloud bot2019-06-2610-2/+68
| |
* | Merge pull request #15927 from nextcloud/backport/stable15/15830Roeland Jago Douma2019-06-252-47/+45
|\ \ | |/ |/| [stable15] Show share settings only if incoming federated shares are allowed
| * Show share settings only if incoming federated shares are allowedMorris Jobke2019-06-112-47/+45
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #16030 from nextcloud/backport/15540/stable15Roeland Jago Douma2019-06-251-2/+3
|\ \ | | | | | | [stable15] Prevent faulty logs from nested setupFS calls
| * | Prevent faulty logs from nested setupFS callsJoas Schilling2019-06-211-2/+3
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | [tx-robot] updated from transifexNextcloud bot2019-06-2518-24/+152
| | |
* | | Merge pull request #16052 from nextcloud/backport/16033/stable15blizzz2019-06-243-44/+32
|\ \ \ | | | | | | | | [stable15] fix LDAP Wizard forgetting groups on select with search
| * | | fixes LDAP Wizard forgetting groups on select with searchArthur Schiwon2019-06-243-44/+32
|/ / / | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | [tx-robot] updated from transifexNextcloud bot2019-06-2420-6/+126
| | |
* | | [tx-robot] updated from transifexNextcloud bot2019-06-2318-2/+24
| | |
* | | [tx-robot] updated from transifexNextcloud bot2019-06-222-0/+872
|/ /
* | [tx-robot] updated from transifexNextcloud bot2019-06-2120-2/+58
| |
* | [tx-robot] updated from transifexNextcloud bot2019-06-206-2/+44
| |
* | [stable15] Avoid scrolling to the hidden input when toggling grid/list view ↵John Molakvoæ2019-06-191-0/+4
|\ \ | | | | | | | | | | | | (#16008) [stable15] Avoid scrolling to the hidden input when toggling grid/list view
| * | Avoid scrolling to the hidden input when toggling grid/list viewJulius Härtl2019-06-191-0/+4
|/ / | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | [stable15] cache the displayname after an LDAP plugin set it (#16001)John Molakvoæ2019-06-192-4/+30
|\ \ | | | | | | [stable15] cache the displayname after an LDAP plugin set it
| * | caches the displayname after an LDAP plugin set itArthur Schiwon2019-06-182-4/+30
| | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | [tx-robot] updated from transifexNextcloud bot2019-06-192-2/+68
|/ /
* | [tx-robot] updated from transifexNextcloud bot2019-06-184-4/+4
| |
* | Merge pull request #15985 from nextcloud/backport/15858/stable15blizzz2019-06-1710-103/+106
|\ \ | | | | | | [stable15] add LDAP integr. test for receiving share candidates with group limitation
| * | fix inGroup check, thus make integration tests succeedArthur Schiwon2019-06-171-1/+0
| | | | | | | | | | | | | | | | | | | | | there is not such strange return mode. Having invalid user ids caused this check to fail, and as side effect share limitation to groups to not work. Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | add LDAP integr. test for receiving share candidates with group limitationArthur Schiwon2019-06-179-102/+106
|/ / | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | [tx-robot] updated from transifexNextcloud bot2019-06-1722-4/+106
| |
* | [tx-robot] updated from transifexNextcloud bot2019-06-1610-14/+62
| |
* | [tx-robot] updated from transifexNextcloud bot2019-06-1562-28/+438
| |
* | [tx-robot] updated from transifexNextcloud bot2019-06-14482-14262/+16290
| |
* | [stable15] Make accessibility app translatable (#15928)John Molakvoæ2019-06-122-0/+2
|\ \ | |/ |/| [stable15] Make accessibility app translatable
| * Fix translation sync for accessibiltiyMorris Jobke2019-06-112-0/+2
|/ | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Merge pull request #15861 from nextcloud/backport/15738/stable15Roeland Jago Douma2019-06-051-7/+7
|\ | | | | [stable15] Don't notify admins if no potentially over exposing links found
| * Don't notify admins if no potentially over exposing links foundDaniel Kesselberg2019-06-031-7/+7
| | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>