Node.js based forum software built for the modern web
Merge branch 'master' into develop
Barış Soner Uşaklıee765248a423
diff --cc install/package.jsonindex 2a4b237dec,4f0af2c02a..39422cd037--- a/install/package.json+++ b/install/package.json@@@ -105,19 -104,19 +105,19 @@@"nodebb-plugin-2factor": "8.0.5","nodebb-plugin-composer-default": "11.0.8","nodebb-plugin-dbsearch": "7.0.0",- "nodebb-plugin-emoji": "6.0.14",+ "nodebb-plugin-emoji": "6.0.16","nodebb-plugin-emoji-android": "4.1.1",- "nodebb-plugin-link-preview": "2.2.8",- "nodebb-plugin-markdown": "13.2.6",+ "nodebb-plugin-link-preview": "2.2.9",+ "nodebb-plugin-markdown": "13.2.7","nodebb-plugin-mentions": "5.0.0",- "nodebb-plugin-spam-be-gone": "2.3.4",- "nodebb-plugin-web-push": "0.8.1",+ "nodebb-plugin-spam-be-gone": "2.3.5",+ "nodebb-plugin-web-push": "0.9.2","nodebb-rewards-essentials": "1.0.3",- "nodebb-theme-harmony": "3.1.13",+ "nodebb-theme-harmony": "3.1.14",- "nodebb-theme-lavender": "8.0.6",- "nodebb-theme-peace": "3.0.6",+ "nodebb-theme-lavender": "8.1.0",+ "nodebb-theme-peace": "3.1.2",- "nodebb-theme-persona": "15.1.7",+ "nodebb-theme-persona": "15.1.8",- "nodebb-widget-essentials": "8.0.6",+ "nodebb-widget-essentials": "8.0.7","nodemailer": "9.0.3","nprogress": "0.2.0","passport": "0.7.0",diff --cc src/views/modals/change-picture.tplindex 2be534a923,7396c65372..812986d9f6--- a/src/views/modals/change-picture.tpl+++ b/src/views/modals/change-picture.tpl@@@ -28,12 -28,12 +28,12 @@@<hr/>{{{ if allowProfileImageUploads }}}<button type="button" class="btn btn-ghost border" data-action="upload">- [[user:upload-new-picture]]+ {{tx("user:upload-new-picture")}}</button>- {{{ end }}}<button type="button" class="btn btn-ghost border" data-action="upload-url">- [[user:upload-new-picture-from-url]]+ {{tx("user:upload-new-picture-from-url")}}</button>+ {{{ end }}}</div></div>- </div>+ </div>