Merge branch 'develop' into 'master'
v0.9.1 Closes #489 and #495 See merge request fatchan/jschan!270
Showing
- .gitlab-ci.yml 1 addition, 1 deletion.gitlab-ci.yml
- CHANGELOG.md 5 additions, 0 deletionsCHANGELOG.md
- INSTALLATION.md 1 addition, 1 deletionINSTALLATION.md
- configs/template.js.example 1 addition, 1 deletionconfigs/template.js.example
- controllers/forms/globalsettings.js 2 additions, 2 deletionscontrollers/forms/globalsettings.js
- gulp/res/js/forms.js 6 additions, 5 deletionsgulp/res/js/forms.js
- lib/captcha/font.ttf 0 additions, 0 deletionslib/captcha/font.ttf
- lib/captcha/generators/grid.js 11 additions, 3 deletionslib/captcha/generators/grid.js
- lib/captcha/generators/grid.test.js 12 additions, 12 deletionslib/captcha/generators/grid.test.js
- lib/captcha/generators/grid2.js 11 additions, 3 deletionslib/captcha/generators/grid2.js
- lib/captcha/generators/text.js 2 additions, 2 deletionslib/captcha/generators/text.js
- lib/captcha/generators/text.test.js 9 additions, 9 deletionslib/captcha/generators/text.test.js
- lib/misc/fonts.js 18 additions, 14 deletionslib/misc/fonts.js
- migrations/0.9.1.js 15 additions, 0 deletionsmigrations/0.9.1.js
- models/forms/changeglobalsettings.js 1 addition, 1 deletionmodels/forms/changeglobalsettings.js
- package-lock.json 8 additions, 8 deletionspackage-lock.json
- package.json 2 additions, 2 deletionspackage.json
- views/pages/globalmanagesettings.pug 5 additions, 5 deletionsviews/pages/globalmanagesettings.pug
Loading
Please register or sign in to comment