summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #15202 from nextcloud/version/16.0.0/finalv16.0.0Roeland Jago Douma2019-04-241-2/+2
|\ | | | | 16.0.0 Final
| * 16.0.0 FinalRoeland Jago Douma2019-04-241-2/+2
|/ | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Merge pull request #15219 from nextcloud/backport/15141/stable16Roeland Jago Douma2019-04-247-11/+9
|\ | | | | [stable16] fix searching all users in repair regenerate birthday cal reparir job
| * remove obsolete use statementsArthur Schiwon2019-04-243-6/+4
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * avoids users searches on backend, faster processingArthur Schiwon2019-04-244-5/+5
|/ | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* Merge pull request #15218 from nextcloud/fix/stable16-fix-js-vulns-IRoeland Jago Douma2019-04-246-37/+30
|\ | | | | [stable16] Update js packages
| * Apply `npm audit fix` on stable16Christoph Wurst2019-04-246-37/+30
| | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | Merge pull request #15215 from nextcloud/backport/15148/stable16Roeland Jago Douma2019-04-241-4/+4
|\ \ | | | | | | [stable16] Fix mapper not properly casting int in oauth2 code
| * | Use the proper names when setting entity typesRoeland Jago Douma2019-04-241-4/+4
| |/ | | | | | | | | | | Else this does :boom: Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #15203 from nextcloud/backport/15168/stable16Roeland Jago Douma2019-04-241-8/+3
|\ \ | | | | | | [stable16] Always use a temp file for swift writes
| * | Always use a temp file for swift writesRoeland Jago Douma2019-04-241-8/+3
| |/ | | | | | | | | | | | | | | Apparently the if statement doesn't work in all cases (even if I could not reproduce it). So for the time being we will just not directly stream to swift. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #15204 from nextcloud/backport/15146/stable16Roeland Jago Douma2019-04-242-11/+0
|\ \ | |/ |/| [stable16] Prefetching blows up if there are a lot of files.
| * Prefetching blows up if there are a lot of files.Roeland Jago Douma2019-04-242-11/+0
|/ | | | | | | | I saw instances where people had a lot of files (each with custom properties) and all this prefetching blew up and started to consume an insane amount of RAM resulting in the process getting killed. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Merge pull request #15198 from nextcloud/backport/15164/stable16John Molakvoæ2019-04-231-6/+3
|\ | | | | [stable16] Fix multiselect bar overlapping recommendations
| * Use sticky position include for Safari supportJan-Christoph Borchardt2019-04-231-2/+1
| | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * Add webkit/safari fixMorris Jobke2019-04-231-0/+1
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * Fix multiselect bar overlapping recommendationsJan-Christoph Borchardt2019-04-231-6/+3
|/ | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* Merge pull request #15157 from nextcloud/backport/15153/stable16Morris Jobke2019-04-181-0/+1
|\ | | | | [stable16] Load apps before running repair steps
| * Fix #15042Temtaime2019-04-181-0/+1
|/
* Merge pull request #15137 from nextcloud/version/16.0.0/rc216.0.0RC2Roeland Jago Douma2019-04-181-2/+2
|\ | | | | 16.0.0 RC2
| * 16.0.0 RC2Roeland Jago Douma2019-04-171-2/+2
|/ | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Merge pull request #15138 from nextcloud/backport/15129/stable16Morris Jobke2019-04-178-1/+316
|\ | | | | Backport/15129/stable16
| * Add return typesJoas Schilling2019-04-171-7/+7
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Use the querybuilder for the queriesJoas Schilling2019-04-171-34/+49
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Allow to use Subqueries in fromJoas Schilling2019-04-171-0/+4
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Repair step for link sharesRoeland Jago Douma2019-04-177-1/+297
|/ | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Merge pull request #15127 from nextcloud/backport/15123/stable16Morris Jobke2019-04-166-4/+14
|\ | | | | [stable16] Improve the share link password error feedback with a red border
| * Improve the share link password error feedback with a red borderChristoph Wurst2019-04-166-4/+14
|/ | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* Merge pull request #15118 from nextcloud/backport/15115/stable16John Molakvoæ2019-04-161-1/+1
|\ | | | | [stable16] Do not use spaces in generated passwords
| * Do not use spaces in generated passwordsMorris Jobke2019-04-151-1/+1
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #15111 from nextcloud/backport/15110/stable16Morris Jobke2019-04-151-0/+5
|\ \ | |/ |/| [stable16] Make sure we have a proper node before parsing
| * Make sure we have a proper node before parsingJohn Molakvoæ (skjnldsv)2019-04-151-0/+5
|/ | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* Merge pull request #15108 from nextcloud/backport/15057/stable16Morris Jobke2019-04-151-1/+1
|\ | | | | [stable16] Use slient option to switch for regular file actions as well
| * Use slient option to switch for regular file actions as wellJulius Härtl2019-04-151-1/+1
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | Merge pull request #15109 from nextcloud/backport/15107/stable16Roeland Jago Douma2019-04-152-0/+2
|\ \ | | | | | | [stable16] Add animation-slow var
| * | Add animation-slow varJohn Molakvoæ (skjnldsv)2019-04-152-0/+2
|/ / | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | Merge pull request #15101 from nextcloud/backport/15097/stable16Roeland Jago Douma2019-04-151-2/+2
|\ \ | |/ |/| [stable16] Pass proper TEST_SELECTION to drone objectstore
| * Pass proper TEST_SELECTION to drone objectstoreRoeland Jago Douma2019-04-151-2/+2
|/ | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Merge pull request #15043 from nextcloud/version/16/rc1v16.0.0RC1Morris Jobke2019-04-111-2/+2
|\ | | | | 16.0.0 RC 1
| * 16.0.0 RC 1Roeland Jago Douma2019-04-111-2/+2
|/ | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Merge pull request #14967 from nextcloud/lib-private-user-trigger-pass-oldMorris Jobke2019-04-112-2/+4
|\ | | | | Do not issue update command if nothing has changed in user values
| * Return true in the dummy backend for successful display name changeMorris Jobke2019-04-111-0/+1
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * lib/private/User: do not change user properties if value has not changedLeon Klingele2019-04-111-1/+1
| |
| * lib/private/User,apps/user_ldap/lib/User: always pass old value to ↵Leon Klingele2019-04-111-1/+2
|/ | | | User::triggerChange
* Merge pull request #15020 from nextcloud/bugfix/noid/fix-too-many-event-triggersMorris Jobke2019-04-112-7/+6
|\ | | | | Bugfix/noid/fix too many event triggers
| * Only update the lookup server if it is enabled AND a server is setJoas Schilling2019-04-091-1/+1
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Remove unnecessary event dispatcherJoas Schilling2019-04-091-2/+1
| | | | | | | | | | | | The event is already triggered in OC\User\User::triggerChange Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Don't get the avatar when we don't operate anywayJoas Schilling2019-04-092-5/+5
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #15052 from nextcloud/fix/noid/pass-oldvalueMorris Jobke2019-04-113-27/+15
|\ \ | | | | | | Pass old value to user triggerChange hook & do not update unchanged attributes
| * | lib/private/User: do not change user properties if value has not changedLeon Klingele2019-04-112-22/+10
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>