wodka
2276ca100f
Merge branch 'master' into 2.20
...
# Conflicts:
# config/env/secure.js
# package-lock.json
# package.json
# public/form_modules/forms/base/css/form.css
# public/modules/forms/admin/config/i18n/french.js
2019-07-11 23:18:55 +02:00
wodka
77cabf15e5
attach socket.io to current server if ports are equal
2019-07-01 11:49:27 +02:00
Mattias
6453716c99
fix translations
2019-01-31 10:15:21 +01:00
Arielle Baldwynn
188705b640
Merge pull request #301 from pshah123/master
...
Fix Issues from PR #299
2018-08-31 13:27:24 -07:00
David Baldwynn
d9ef557edd
u
2018-08-31 15:26:13 -04:00
David Baldwynn
52a1ab2bff
got form running and fixed swedish translations
2018-08-31 15:25:43 -04:00
Priansh Shah
eaab2ff339
Revert "disable signups"
...
This reverts commit ca875ed01d57c69c0001719bda5375f94db4c46e.
2018-04-24 23:03:15 +03:00
Priansh Shah
f99049d155
Revert "fix jsep import, add fillin for HTTPS server, remove debug flag"
...
This reverts commit 78082f7152204158a1b7548bdb0dfb1ba49c097d.
2018-04-24 23:01:58 +03:00
Priansh Shah
ca875ed01d
disable signups
2018-04-09 20:30:44 +00:00
Priansh Shah
78082f7152
fix jsep import, add fillin for HTTPS server, remove debug flag
2018-04-09 20:22:41 +00:00
Mattias Axell
a0092baf31
Update typo in Swedish translation
2018-02-28 15:55:06 +01:00
Mattias Axell
b6f5c5f897
First translation to Swedish
...
Proposing first translation of TellForm into Swedish.
2018-02-28 15:52:24 +01:00
Maxime
1ace06555c
Fix french translations in modules, form_modules and locales.
2018-02-14 17:28:19 +01:00
Andrew Phillips
7357756625
Fix MAILER_STMP_SECURE
...
This should resolve https://github.com/tellform/tellform/issues/281 ,
matching the description in the Configuration section of `README.md`.
This also corrects the case of `TRUE` in an example.
2018-01-25 13:31:04 -04:00
David Baldwynn
9ff247fde7
Merge branch 'master' into 2.20
2017-11-21 13:39:27 -08:00
David Baldwynn
f5e32e9548
got validity working for rating field
2017-11-13 21:07:27 -08:00
David Baldwynn
4f2682554d
merged with master
2017-11-11 20:05:06 -08:00
David Baldwynn
084a8005fd
fixed form vendor files
2017-11-11 19:56:41 -08:00
David Baldwynn
24cffeee37
fixed problem with production assets
2017-11-08 11:31:46 -08:00
David Baldwynn
5c58db879c
got server tests to pass
2017-11-02 11:14:25 -07:00
David Baldwynn
ddd4c2b22c
Merge branch '2.20' into emailNotifications
2017-11-01 12:46:15 -07:00
David Baldwynn
bbb3137372
got all tests to pass
2017-11-01 12:17:35 -07:00
David Baldwynn
8ea1f63c96
fixed travis settings
2017-10-29 21:32:02 -07:00
David Baldwynn
d0d273a718
removed secure configuration
2017-10-29 20:23:36 -07:00
David Baldwynn
9a0a301c3d
got rid of unnessecary user middleware
2017-10-29 20:11:58 -07:00
David Baldwynn
3e3e7ccfe6
removed hasRole and hasAdminRole from passport_helpers
2017-10-29 19:02:01 -07:00
David Baldwynn
e1db98ec95
added tests for api routes
2017-10-29 18:17:20 -07:00
David Baldwynn
759a4efdd1
got all tests to pass
2017-10-29 12:44:12 -07:00
David Baldwynn
3b9f01f92a
fixed form_fields translation bug
2017-10-28 00:45:04 -07:00
David Baldwynn
34b2cba461
added client side validation for email, username and password inputs
2017-10-27 23:23:50 -07:00
David Baldwynn
c45d248c3c
internationalized transactional emails
2017-10-27 20:46:00 -07:00
David Baldwynn
4f7d646edd
got email pug templates to work
2017-10-27 19:30:05 -07:00
David Baldwynn
b0f03d1f0a
got i18n transaltions for all serverside views
2017-10-27 17:23:24 -07:00
David Baldwynn
25ce55b4c7
moved to pug from swig and fixed public form when subdomains are disabled
2017-10-27 16:00:04 -07:00
David Baldwynn
d2bac982cd
fixed config prod
2017-10-18 20:27:07 -04:00
David Baldwynn
3835a8aa3a
Merge branch 'master' of github.com:whitef0x0/tellform into HEAD
...
Conflicts:
config/env/all.js
config/env/development.js
2017-10-18 20:20:15 -04:00
David Baldwynn
154fddff75
fixed editField bug
2017-10-18 17:18:18 -07:00
David Baldwynn
b14822d1fa
Update all.js
2017-10-11 12:12:20 -07:00
David Baldwynn
d1039c7fc2
got all tests to pass
2017-10-10 22:07:13 -07:00
David Baldwynn
92fd374e87
Update production.js
2017-10-10 16:30:12 -07:00
David Baldwynn
c4e097275c
Update express.js
2017-10-10 16:27:07 -07:00
David Baldwynn
91d5deabcf
Update all.js
2017-10-10 16:26:18 -07:00
David Baldwynn
6bf5c6d3ee
Update all.js
2017-10-10 16:25:51 -07:00
David Baldwynn
101f28ea88
Update all.js
2017-10-10 15:24:45 -07:00
David Baldwynn
08c7bc19e9
Update socket.io.js
2017-10-10 15:21:23 -07:00
David Baldwynn
4d6a337e45
Update all.js
2017-10-10 15:20:03 -07:00
David Baldwynn
8218521a2b
Update all.js
2017-10-10 15:12:31 -07:00
David Baldwynn
4e9a68e628
Removed OAuth providers from env/secure.js
2017-10-10 15:09:57 -07:00
David Baldwynn
2c736fe184
Removed upload config from env/all.js
2017-10-10 15:07:24 -07:00
David Baldwynn
c13e09bd2e
Removed OAuth ENV from test.js
2017-10-10 15:05:35 -07:00
