summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #17686 from nextcloud/backport/17673/stable17Roeland Jago Douma2019-10-263-8/+6
|\ | | | | [stable17] Fix jsConfigHelper lang/locale mixup
| * Cleanup theming messRoeland Jago Douma2019-10-262-6/+5
| | | | | | | | | | | | | | | | | | | | * Do not do translations in the constructor. This gets called to early so there is no user yet. Which means we can't obtain the locale. Which means we store the wrong translation instance. * Same for the theming app magic. Just use the parent call when needed. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Don't pass in the locale as the languageRoeland Jago Douma2019-10-261-2/+1
|/ | | | | | This messes with the translation of the date names etc. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* [tx-robot] updated from transifexNextcloud bot2019-10-268-2/+50
|
* Merge pull request #17676 from nextcloud/backport/17469/stable17Roeland Jago Douma2019-10-251-4/+5
|\ | | | | [stable17] fix filename overlapping on mobile
| * add commentGreta Doci2019-10-251-3/+3
| | | | | | | | Signed-off-by: Greta Doci <gretadoci@gmail.com>
| * fix filename overlapping on mobile ref #17364Greta Doci2019-10-251-2/+3
| | | | | | | | Signed-off-by: Greta Doci <gretadoci@gmail.com>
* | Merge pull request #17681 from nextcloud/backport/17678/stable17Roeland Jago Douma2019-10-253-4/+98
|\ \ | |/ |/| [stable17] Harden middleware check
| * Harden middleware checkRoeland Jago Douma2019-10-253-4/+98
|/ | | | | | | These annotations will allow for extra checks. And thus make it harder to break things. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* [tx-robot] updated from transifexNextcloud bot2019-10-256-24/+68
|
* [tx-robot] updated from transifexNextcloud bot2019-10-2410-178/+234
|
* Merge pull request #17300 from nextcloud/backport/17110/stable17Roeland Jago Douma2019-10-231-1/+1
|\ | | | | [stable17] Position fixed for .toastify.toast
| * Position fixed for .toastify.toastzorn-v2019-10-221-1/+1
| | | | | | | | Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | [tx-robot] updated from transifexNextcloud bot2019-10-2312-12/+16
| |
* | Merge pull request #17305 from nextcloud/backport/15557/stable17Roeland Jago Douma2019-10-221-9/+8
|\ \ | |/ |/| [stable17] Fix fetching additional search results on scrolling down
| * Fix fetching additional search results on scrolling downRené Bühlmann2019-10-221-9/+8
|/ | | | Signed-off-by: René Bühlmann <rene@buehlmann.net>
* Merge pull request #17156 from nextcloud/stable17-16976Roeland Jago Douma2019-10-224-6/+10
|\ | | | | [stable17] Always use the folder icon depending on the mount type if not a share mount
| * Bump bundlesJulius Härtl2019-10-222-2/+2
| | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
| * Fallback to directory icon based on the mount typeJulius Härtl2019-10-222-4/+8
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | Merge pull request #17578 from nextcloud/stable17-help-aboutRoeland Jago Douma2019-10-221-0/+3
|\ \ | | | | | | [stable17] Load additional scripts on help page
| * | Load additional scripts on help pageJulius Härtl2019-10-171-0/+3
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | Merge pull request #17617 from nextcloud/backport/17595/stable17Roeland Jago Douma2019-10-221-1/+2
|\ \ \ | |_|/ |/| | [stable17] treat LDAP error 50 as auth issue, prevents lost server connection errors
| * | treat LDAP error 50 as auth issue, prevents lost server connection errorsArthur Schiwon2019-10-211-1/+2
| | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | Merge pull request #17638 from nextcloud/backport/stable17/17627Roeland Jago Douma2019-10-227-266/+295
|\ \ \ | | | | | | | | [stable17] Fix browser back button
| * | | Fix browser back buttonRoeland Jago Douma2019-10-227-266/+295
|/ / / | | | | | | | | | | | | | | | | | | Fixes #17108 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | | Merge pull request #17621 from nextcloud/backport/17450/stable17blizzz2019-10-227-41/+54
|\ \ \ | | | | | | | | [stable17] hide strange Everyone and Disabled group numbers with LDAP
| * | | Compile assetsnpmbuildbot[bot]2019-10-214-7/+7
| | | | | | | | | | | | | | | | Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
| * | | backport of #17450Arthur Schiwon2019-10-213-34/+47
| |/ / | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | Merge pull request #17581 from nextcloud/backport/stable17/17548Roeland Jago Douma2019-10-225-2/+16
|\ \ \ | | | | | | | | [stable17] Pass on direct query parameter during login
| * | | [stable17] Pass on direct query parameter during loginRoeland Jago Douma2019-10-215-2/+16
| | |/ | |/| | | | | | | | | | | | | | | | | | | If direct is set we should forward it again. This to make SAML direct login work again. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | | [tx-robot] updated from transifexNextcloud bot2019-10-2214-0/+56
| |/ |/|
* | Merge pull request #17597 from nextcloud/backport/17575/stable17Roeland Jago Douma2019-10-212-3/+14
|\ \ | | | | | | [stable17] Include the share in the Files_Sharing::loadAdditionalScripts event
| * | Include the share in the Files_Sharing::loadAdditionalScripts eventDaniel Calviño Sánchez2019-10-192-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | This provides a better context for apps using the event, for example to load one script or another depending on whether the share is a file or a folder. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | [tx-robot] updated from transifexNextcloud bot2019-10-2134-4/+118
| | |
* | | [tx-robot] updated from transifexNextcloud bot2019-10-2032-28/+52
|/ /
* | Merge pull request #17579 from nextcloud/backport/17543/stable17Roeland Jago Douma2019-10-191-2/+6
|\ \ | | | | | | [stable17] Let SCSS cleanup only run once
| * | Make sure the cache is only reset once at a timeJulius Härtl2019-10-171-1/+5
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Use a distributed cache for the isCachedCacheJulius Härtl2019-10-171-1/+1
| |/ | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | Merge pull request #17589 from nextcloud/backport/17585/stable17Roeland Jago Douma2019-10-194-2/+6
|\ \ | | | | | | [stable17] added documentation links on settings pages
| * | added documentation links on settings pagesSascha Wiswedel2019-10-184-2/+6
| | | | | | | | | | | | Signed-off-by: Sascha Wiswedel <sascha.wiswedel@nextcloud.com>
* | | [tx-robot] updated from transifexNextcloud bot2019-10-1910-22/+22
|/ /
* | [tx-robot] updated from transifexNextcloud bot2019-10-1816-36/+164
| |
* | Merge pull request #17538 from nextcloud/backport/17332/stable17Roeland Jago Douma2019-10-171-15/+35
|\ \ | |/ |/| [stable17] Only cache the mimetype if the file exists
| * Only cache the mimetype if the file existsJoas Schilling2019-10-141-15/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise files access control will cache "application/octet-stream" for all the target node on: rename, move, copy and all other methods which create a new item To check this: 1. Add an automated tagging rule which tags on mimetype NOT "httpd/unix-directory" 2. Add an access control rule which checks for any mimetype 3. Create a folder and rename it, the folder should not be tagged, but it is Signed-off-by: Joas Schilling <coding@schilljs.com>
* | [tx-robot] updated from transifexNextcloud bot2019-10-174-0/+96
| |
* | [tx-robot] updated from transifexNextcloud bot2019-10-164-0/+60
| |
* | Merge pull request #17455 from nextcloud/fix/stable17-axios-packageRoeland Jago Douma2019-10-1537-537/+615
|\ \ | | | | | | [stable17] Use @nextcloud/axios to keep the CSRF token in sync
| * | Use @nextcloud/axios to keep the CSRF token in syncChristoph Wurst2019-10-1537-537/+615
| | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | | Merge pull request #17541 from nextcloud/backport/17503/stable17Roeland Jago Douma2019-10-155-0/+92
|\ \ \ | | | | | | | | [stable17] Set the proper filename for version downloads
| * | | Set the proper filename for version downloadsRoeland Jago Douma2019-10-145-0/+92
| | |/ | |/| | | | | | | | | | | | | | | | Before it just used the internalid (timestamp often) which is not really user friendly. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>