summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2019-04-1414-6/+94
|
* [tx-robot] updated from transifexNextcloud bot2019-04-1330-30/+104
|
* [tx-robot] updated from transifexNextcloud bot2019-04-1220-36/+292
|
* Merge pull request #15053 from nextcloud/a-new-journey-beginsJoas Schilling2019-04-1126-59/+60
|\ | | | | Bump versions of server and the requirements of apps
| * Disable acceptance test which should fail anywayJoas Schilling2019-04-111-8/+9
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Bump versions of server and the requirements of appsJoas Schilling2019-04-1125-51/+51
|/ | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* 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>
| * | Pass old value to user triggerChange hookMorris Jobke2019-04-112-5/+5
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #14965 from nextcloud/enh/install_fileMorris Jobke2019-04-115-0/+35
|\ \ \ | |/ / |/| | Prevent a reinstall
| * | Block install without CAN_INSTALL fileRoeland Jago Douma2019-04-115-0/+35
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #15049 from ↵Morris Jobke2019-04-111-2/+0
|\ \ \ | |/ / |/| | | | | | | | nextcloud/do-not-allow-javascript-eval-in-the-public-share-auth-page-with-talk Do not allow JavaScript "eval" in the public share auth page with Talk
| * | Do not allow JavaScript "eval" in the public share auth page with TalkDaniel Calviño Sánchez2019-04-101-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | Talk no longer uses JavaScript "eval", so the Content Security Policy can now be configured to prevent its use in the public share authentication page when the password is protected by Talk. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | [tx-robot] updated from transifexNextcloud bot2019-04-11108-150/+534
| | |
* | | Merge pull request #14994 from ↵Morris Jobke2019-04-102-3/+27
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/feature/noid/pre-releases-for-beta-and-daily Enable pre-releases for beta and daily channel
| * | | Enable pre-releases for beta and daily channelJoas Schilling2019-04-082-3/+27
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #15027 from nextcloud/enh/less-phan-processesMorris Jobke2019-04-101-1/+1
|\ \ \ \ | | | | | | | | | | Run less phan processes
| * | | | Run less phan processesRoeland Jago Douma2019-04-091-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #14987 from nextcloud/tests/14962/public-folder-openRoeland Jago Douma2019-04-101-0/+20
|\ \ \ \ \ | | | | | | | | | | | | Add acceptance test for public folder navigation
| * | | | | Add acceptance test for public folder navigationJulius Härtl2019-04-101-0/+20
| | |_|/ / | |/| | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | Merge pull request #14972 from nextcloud/fix/app-nav-toggle-missingRoeland Jago Douma2019-04-101-1/+3
|\ \ \ \ \ | | | | | | | | | | | | Disable the injected snapper logic when apps want to ship their own
| * | | | | Do not inject a #app-navigation-toggle if there is already oneChristoph Wurst2019-04-101-1/+3
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows apps to ship their own, as in some cases the #app-content element does not exist on page load and therefore the injection fails and the icon is missing afterwards. Fixes https://github.com/nextcloud/server/issues/14956 Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | Merge pull request #14990 from nextcloud/enhancement/noid/projectsRoeland Jago Douma2019-04-1014-23/+26
|\ \ \ \ \ | | | | | | | | | | | | Rename collections to projects
| * | | | | Bump bundlesJulius Härtl2019-04-098-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | | Use label from appsJulius Härtl2019-04-092-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | | Bump nextcloud-vue-collectionsJulius Härtl2019-04-092-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | | Rename collections to projectsJulius Härtl2019-04-091-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | | Add projects iconJulius Härtl2019-04-092-0/+2
| | |_|_|/ | |/| | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | Merge pull request #15035 from ↵Roeland Jago Douma2019-04-102-0/+25
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/enhancement/noid/add-isavailable-to-fulltextsearchmanager [nc16] Add a bool check isAvailable() to FullTextSearchManager
| * | | | | +isAvailable()Maxence Lange2019-04-102-0/+25
| | |/ / / | |/| | | | | | | | Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
* | | | | Merge pull request #15030 from nextcloud/fix/remove-2fa-admin-settings-debug-logRoeland Jago Douma2019-04-103-3/+2
|\ \ \ \ \ | |/ / / / |/| | | | Remove a debug log from the 2FA admin settings
| * | | | Remove a debug log from the 2FA admin settingsChristoph Wurst2019-04-103-3/+2
|/ / / / | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | Merge pull request #15022 from ↵Joas Schilling2019-04-101-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/noid/respect-lookup-server-disabling-master Respect the setting if the lookup server is disabled
| * | | | 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>
* | / / [tx-robot] updated from transifexNextcloud bot2019-04-1026-12/+554
| |/ / |/| |
* | | Merge pull request #15016 from nextcloud/enh/no-eval-default-responseMorris Jobke2019-04-091-1/+1
|\ \ \ | |/ / |/| | Forbid eval on legacy responses
| * | Forbid eval on legacy responsesRoeland Jago Douma2019-04-091-1/+1
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | [tx-robot] updated from transifexNextcloud bot2019-04-0918-16/+86
| | |
* | | Merge pull request #14989 from nextcloud/enh/check_failing_putcontent_appdataMorris Jobke2019-04-082-2/+12
|\| | | | | | | | Harden appdata putcontent
| * | Harden appdata putcontentRoeland Jago Douma2019-04-082-2/+12
| | | | | | | | | | | | | | | | | | | | | If for whatever reason appdata got into a strange state this will at least propegate up and not make it do boom the next run. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>