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
|
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 |
|
David Baldwynn
|
52a1ab2bff
|
got form running and fixed swedish translations
|
2018-08-31 15:25:43 -04:00 |
|
Mattias Axell
|
c63e905c25
|
Create swedish.js - Swedish translation
|
2018-02-28 16:31:35 +01:00 |
|
Maxime
|
1ace06555c
|
Fix french translations in modules, form_modules and locales.
|
2018-02-14 17:28:19 +01:00 |
|
David Baldwynn
|
9c24d15a32
|
remove empty test case from header.client.controller.test.js
|
2017-11-20 20:30:41 -08:00 |
|
David Baldwynn
|
ff509f2b5c
|
added updating of translation when user changes profile language
|
2017-11-19 15:23:38 -08: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
|
6c41e6fce2
|
fixed signout glitching bug
|
2017-11-15 04:10:15 -08:00 |
|
David Baldwynn
|
f3638a1d42
|
fixed small ux bugs
|
2017-11-15 00:29:45 -08:00 |
|
David Baldwynn
|
758eb5a786
|
got textAngular to semi-work with template variables
|
2017-11-14 23:26:47 -08:00 |
|
David Baldwynn
|
4f2682554d
|
merged with master
|
2017-11-11 20:05:06 -08:00 |
|
David Baldwynn
|
a77a59c3ba
|
Merge branch '2.20' into emailNotifications
|
2017-11-05 16:26:09 -08:00 |
|
David Baldwynn
|
3dc51d9d2c
|
fixed bug in core.routes.js
|
2017-11-05 19:23:01 -05:00 |
|
David Baldwynn
|
7451311403
|
removed empty authentication controller test
|
2017-11-02 11:37:33 -07:00 |
|
David Baldwynn
|
5c58db879c
|
got server tests to pass
|
2017-11-02 11:14:25 -07:00 |
|
David Baldwynn
|
6927f9d5ac
|
fixed signin redirect bug
|
2017-11-02 10:37:29 -07:00 |
|
David Baldwynn
|
ddd4c2b22c
|
Merge branch '2.20' into emailNotifications
|
2017-11-01 12:46:15 -07:00 |
|
David Baldwynn
|
12e1fd0947
|
got static url for admin tabs to work
|
2017-10-31 12:28:01 -07:00 |
|
David Baldwynn
|
86d8b88231
|
got url-linked tabs to work for admin panel
|
2017-10-31 10:21:10 -07:00 |
|
David Baldwynn
|
76d6d54cd5
|
got edit-submissions-form directive tests to pass
|
2017-10-29 11:54:40 -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
|
62a34f9ab6
|
fixed all translations on frontend
|
2017-10-27 12:52:39 -07:00 |
|
David Baldwynn
|
e6685154dd
|
added german and italian translateions for user and core views
|
2017-10-27 12:13:47 -07:00 |
|
David Baldwynn
|
154fddff75
|
fixed editField bug
|
2017-10-18 17:18:18 -07:00 |
|
David Baldwynn
|
45b378d16f
|
sped up list forms and fixed analytics bugs
|
2017-10-02 08:17:39 -07:00 |
|
David Baldwynn
|
f6bb23a3bf
|
fixed duplicate views bug
|
2017-09-29 17:33:55 -07:00 |
|
David Baldwynn
|
ed032d6db9
|
fixed edit-submission-form-directive test and removed unnessecary console.log() statements
|
2017-07-28 14:47:09 -07:00 |
|
David Baldwynn
|
2896677432
|
fixed ui bugs in list forms view
|
2017-07-27 01:44:27 -04:00 |
|
José Luis Di Biase
|
e256e63222
|
Spanish translation
Signed-off-by: José Luis Di Biase <josx@interorganic.com.ar>
|
2017-06-30 17:31:40 -03:00 |
|
David Baldwynn
|
b494b50ed5
|
Refactored menus.client.service.js
|
2017-04-22 19:38:37 -07:00 |
|
David Baldwynn
|
8122044a51
|
Removed unused variable from home.client.controller.test.js
|
2017-04-22 19:33:11 -07:00 |
|
David Baldwynn
|
ac91913501
|
Refactored subdomain.client.service.js
|
2017-04-22 19:28:30 -07:00 |
|
David Baldwynn
|
cc1b0bdf98
|
Update socket.io.client.service.js
|
2017-04-20 21:23:21 -07:00 |
|
David Baldwynn
|
27b8aad4af
|
Removed unreachable return statement in menus.client.service.js
|
2017-04-20 21:15:43 -07:00 |
|
David Baldwynn
|
74019318b3
|
updated favicon
|
2017-04-11 04:01:16 -07:00 |
|
David Baldwynn
|
d02573cc0a
|
readded modification for multichoice and rating inputs
|
2017-03-12 21:19:41 -07:00 |
|
David Baldwynn
|
878c6a38b5
|
fix delete form modal in /forms view
|
2017-03-06 12:39:29 -08:00 |
|
David Baldwynn
|
ecfccd803f
|
added dnsmasq setup file
|
2016-11-02 11:31:15 -07:00 |
|
David Baldwynn
|
5add4f2ce9
|
Redesign form admin view as well as added preview in design pane
|
2016-08-25 22:50:54 -07:00 |
|
David Baldwynn
|
75da4499a4
|
updated color scheme and login/signup pages
|
2016-08-25 18:14:50 -07:00 |
|
David Baldwynn
|
5f58f7b8ad
|
fixed logout bug
|
2016-08-25 16:33:10 -07:00 |
|
David Baldwynn
|
6af807491b
|
updated logo
|
2016-08-23 16:40:15 -07:00 |
|
David Baldwynn
|
f00edf73dd
|
got subdomain support to work
|
2016-06-20 15:19:18 -07:00 |
|
David Baldwynn
|
20b599680d
|
merged subdomains into stage
|
2016-06-20 14:02:03 -07:00 |
|