Commit graph

6 commits

Author SHA1 Message Date
witzig
b09af60fac Merge branch 'master' into custom-forms-mjml
# Conflicts:
#	lib/tools.js
#	package.json
2017-03-19 13:44:24 +01:00
witzig
2e50fbc8ae Custom Forms 2017-03-19 13:36:57 +01:00
Andris Reinman
ae6affda81 do not allow script tags in description html 2017-03-19 14:22:44 +02:00
Andris Reinman
d25565b6f8 Updated translation support 2017-03-07 16:30:56 +02:00
Andris Reinman
0392473ecd Fixed a bunch of MySQL pooling issues where connections were not properly released or were double-released 2016-04-05 15:29:42 +03:00
Andris Reinman
54fa30701e Initial import 2016-04-04 15:36:30 +03:00