wodka
|
1caf34c230
|
Merge remote-tracking branch 'origin/fixUXBugs' into features/missing
# Conflicts:
# .gitignore
# app/views/form.server.view.pug
# package-lock.json
# package.json
# public/form_modules/forms/base/config/i18n/french.js
# public/modules/core/config/core.client.routes.js
# public/modules/core/config/i18n/french.js
# public/modules/core/controllers/header.client.controller.js
# public/modules/forms/admin/css/admin-form.css
# public/modules/users/controllers/authentication.client.controller.js
# public/modules/users/services/auth.client.service.js
# scripts/create_admin.js
# server.js
|
2019-07-11 23:32:25 +02:00 |
|
wodka
|
423154790a
|
Merge branch '2.20' into features/missing
# Conflicts:
# app/models/form.server.model.js
# package-lock.json
# package.json
# public/modules/forms/admin/views/admin-form.client.view.html
# public/modules/forms/admin/views/directiveViews/form/edit-submissions-form.client.view.html
|
2019-07-11 23:22:49 +02:00 |
|
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 |
|
David Baldwynn
|
80fdcb5d4f
|
added support for computing analytics on backend
|
2019-07-11 22:49:26 +02:00 |
|
David Baldwynn
|
b9428a5df5
|
fixed configure tab in form
|
2019-07-11 22:44:35 +02:00 |
|
David Baldwynn
|
b5702f72a5
|
fixed title overflow bug for list-forms and admin-form pages
|
2019-07-11 22:42:07 +02:00 |
|
David Baldwynn
|
13d9bd9ece
|
fixed bugs with authentication
|
2018-09-11 14:09:17 -07:00 |
|
Mattias Axell
|
e725aa1ea3
|
Create swedish.js first translation
|
2018-02-28 17:22:21 +01:00 |
|
Maxime
|
1ace06555c
|
Fix french translations in modules, form_modules and locales.
|
2018-02-14 17:28:19 +01:00 |
|
David Baldwynn
|
bc2f49b090
|
Merge branch 'fixUXBugs' into updateSetupScript
|
2017-11-21 15:59:18 -08:00 |
|
David Baldwynn
|
6213ec227d
|
updated field-icon test
|
2017-11-21 15:56:10 -08:00 |
|
David Baldwynn
|
f6546deb59
|
removed globalId
|
2017-11-21 11:37:01 -08:00 |
|
David Baldwynn
|
d8268e4a9b
|
Added test for preserving visitorData on update and removed debugger statements
|
2017-11-21 10:50:58 -08:00 |
|
David Baldwynn
|
68858ca1a3
|
fixed fieldType constant
|
2017-11-21 10:42:32 -08:00 |
|
David Baldwynn
|
801677bdd7
|
fixed angular-ui sorting bug
|
2017-11-21 07:24:22 -08:00 |
|
David Baldwynn
|
91528889e5
|
got tests to pass
|
2017-11-21 00:05:01 -08:00 |
|
David Baldwynn
|
94bcae9d5b
|
added clarifying comment for formatDeviceData
|
2017-11-20 21:24:20 -08:00 |
|
David Baldwynn
|
75d06037a3
|
removed formValidity filter from admin js
|
2017-11-20 20:54:38 -08:00 |
|
David Baldwynn
|
4d8fe4c23a
|
removed redundant ng-true-value and ng-false-value from bs-switch
|
2017-11-20 20:28:56 -08:00 |
|
David Baldwynn
|
218d96dc2b
|
changed loading to saveInProgress for v-busy button in configure directive
|
2017-11-20 20:27:14 -08:00 |
|
David Baldwynn
|
00d437ea1e
|
added 'copied' label after copy button is clicked
|
2017-11-20 20:23:25 -08:00 |
|
David Baldwynn
|
f3f9232c62
|
removed getUserState from Auth service
|
2017-11-20 19:58:43 -08:00 |
|
David Baldwynn
|
1c4ce87084
|
removed deprecated properties from mock models
|
2017-11-20 19:56:49 -08:00 |
|
David Baldwynn
|
a3e0e89019
|
removed unused template property from configureTabs array
|
2017-11-20 18:57:43 -08:00 |
|
David Baldwynn
|
8d3e605261
|
fixed create new form bug
|
2017-11-20 18:30:16 -08:00 |
|
David Baldwynn
|
5ad2875378
|
fixed icon bug on field dragging
|
2017-11-19 22:42:59 -08:00 |
|
David Baldwynn
|
d74c04fa86
|
added padding for share panel
|
2017-11-19 22:10:07 -08:00 |
|
David Baldwynn
|
f897b39549
|
fixed disabled switch for respondent notifications bug
|
2017-11-19 21:37:27 -08:00 |
|
David Baldwynn
|
66409c15d8
|
fixed bugs in listForms duplication
|
2017-11-19 21:31:26 -08:00 |
|
David Baldwynn
|
9d040e9672
|
fixed flashing between configure tabs
|
2017-11-19 21:26:49 -08:00 |
|
David Baldwynn
|
56b7497dca
|
set default form language to user's language
|
2017-11-19 21:09:57 -08:00 |
|
David Baldwynn
|
14243285bb
|
fixed form create modal bug
|
2017-11-19 21:07:00 -08:00 |
|
David Baldwynn
|
b6b93d15f0
|
fixed delete button state change bug
|
2017-11-19 21:15:26 -05:00 |
|
David Baldwynn
|
d1159087d4
|
added tests for authentication controller
|
2017-11-19 13:12:18 -08:00 |
|
David Baldwynn
|
0e7eb457cc
|
got clientside tests to pass
|
2017-11-19 11:12:46 -08:00 |
|
David Baldwynn
|
ef9265576c
|
removed complex form save logic
|
2017-11-15 11:23:21 -08:00 |
|
David Baldwynn
|
22fab93a55
|
added default values for analytics page
|
2017-11-15 11:02:28 -08:00 |
|
David Baldwynn
|
c21477fb02
|
added styling for quilljs editor
|
2017-11-15 10:56:10 -08:00 |
|
David Baldwynn
|
2a0cdcca20
|
added routable tabs for share form config panel
|
2017-11-15 10:47:57 -08:00 |
|
David Baldwynn
|
69f1f42816
|
reorganized css for admin-form
|
2017-11-15 10:12:01 -08:00 |
|
David Baldwynn
|
ab830fdc9e
|
fixed form footer toggle in config general admin panel
|
2017-11-15 09:41:19 -08:00 |
|
David Baldwynn
|
3606c9444b
|
fixed by zero mongodb bug for aggregation
|
2017-11-15 04:31:14 -08:00 |
|
David Baldwynn
|
965962b5e0
|
removed console.logs from server and client side
|
2017-11-15 04:19:14 -08:00 |
|
David Baldwynn
|
d23342ac57
|
removed textAngular
|
2017-11-15 04:14:39 -08:00 |
|
David Baldwynn
|
522ee6f54f
|
got 'view my form link' to open a new tab
|
2017-11-15 04:13:00 -08:00 |
|
David Baldwynn
|
a193d78d90
|
fixes language dropdown for form create modal
|
2017-11-15 03:57:46 -08:00 |
|
David Baldwynn
|
146cf9256d
|
removed unused code from edit-form directive
|
2017-11-15 03:48:34 -08:00 |
|
David Baldwynn
|
f619b6e1ca
|
added subject quilljs fields for self and respondent notifications
|
2017-11-15 03:46:40 -08:00 |
|
David Baldwynn
|
98d874783f
|
got email notifications to work with quilljs
|
2017-11-15 02:46:54 -08:00 |
|
David Baldwynn
|
f3638a1d42
|
fixed small ux bugs
|
2017-11-15 00:29:45 -08:00 |
|