Skip to content
Closed

test #1632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
cdb9587
fix: interpret mjs as text/javascript
Jun 30, 2026
7d7bfa2
fix: add test
Jun 30, 2026
bd98c58
chore(deps): bump linkify-it and mailparser in /apps/backend
dependabot[bot] Jun 30, 2026
b3c4466
Merge branch 'develop' into SWAP-5650-bug-cant-load-pdf-preview
yoganandaness Jul 2, 2026
8f06677
fix: fix the test mock data so that the template can render in factorh
Jul 2, 2026
4e5133d
Merge branch 'develop' into SWAP-5650-bug-cant-load-pdf-preview
jekabs-karklins Jul 3, 2026
8609c73
fix: interpret mjs as text/javascript (#1612)
jekabs-karklins Jul 3, 2026
d15b634
Merge branch 'develop' into merge-back-release-2026-07-03
simonfernandes Jul 3, 2026
46a2633
fix: invite chips overflow out of invites-chips box (#1595)
shivoomiess Jul 4, 2026
06e3e93
chore(deps-dev): bump lint-staged from 17.0.7 to 17.0.8
dependabot[bot] Jul 4, 2026
cdf7a19
chore(deps-dev): bump lint-staged from 17.0.7 to 17.0.8 (#1624)
github-actions[bot] Jul 4, 2026
41a2eac
fix: wrong Modal Header when adding users (#1594)
shivoomiess Jul 6, 2026
346cdc7
Merge branch 'develop' into merge-back-release-2026-07-03
mutambaraf Jul 6, 2026
75133db
feat: diamond email handler changes (#1617)
GrantDLS Jul 6, 2026
e56210d
feat: add baseURL option for dynamic http question (#1541)
zacharyjhankin Jul 6, 2026
accbb5c
feat: diamond production/staging settings no longer gets overwritten …
zacharyjhankin Jul 6, 2026
51f58f3
Merge branch 'develop' into dependabot-npm_and_yarn-apps-backend-mult…
jekabs-karklins Jul 7, 2026
4954655
Merge branch 'develop' into merge-back-release-2026-07-03
simonfernandes Jul 7, 2026
3e008d3
chore: merge back releases from master (#1623)
simonfernandes Jul 7, 2026
83cc7f0
fix: update proposals and assignment columns (#1526)
TCMeldrum Jul 7, 2026
6e84d1b
Merge branch 'develop' into dependabot-npm_and_yarn-apps-backend-mult…
Scott-James-Hurley Jul 7, 2026
1d5888f
chore(deps): bump linkify-it and mailparser in /apps/backend (#1609)
github-actions[bot] Jul 8, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions apps/backend/db_patches/0209_addBaseulrtodynamiccs.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
DO
$$
BEGIN
IF register_patch('addBaseulrtodynamiccs.sql', 'Zachary Hankin', 'Adds an option to the dynamic HTTP question type allowing use of base domain', '2026-5-21') THEN
UPDATE questions
SET default_config = jsonb_set(
default_config::jsonb,
'{useBaseDomain}',
'false'::jsonb,
true
)
WHERE data_type = 'DYNAMIC_MULTIPLE_CHOICE';
END IF;
END;
$$
LANGUAGE plpgsql;
4 changes: 2 additions & 2 deletions apps/backend/db_patches/db_seeds/0005_ProposalQuestions.sql
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ VALUES
(
'dynamic_multiple_choice_question',
'DYNAMIC_MULTIPLE_CHOICE', 'Dynamic multiple choice question from seeds',
'{"variant":"dropdown", "url":"", "jsonPath":"","isMultipleSelect":true, "apiCallRequestHeaders":[], "readPermissions":[]}',
'{"variant":"dropdown", "url":"", "jsonPath":"","isMultipleSelect":true, "apiCallRequestHeaders":[], "readPermissions":[], "useBaseDomain":false}',
'2023-02-08 10:23:10.285415+00',
'2023-02-08 10:23:10.285415+00',
'dynamic_multiple_choice_question',
Expand All @@ -389,7 +389,7 @@ INSERT INTO templates_has_questions(
VALUES
(
'dynamic_multiple_choice_question',
proposal_template_id_var, proposal_topic_id_var, 10, '{"variant":"dropdown", "url":"", "jsonPath":"","isMultipleSelect":true, "apiCallRequestHeaders":[],"readPermissions":[]}'
proposal_template_id_var, proposal_topic_id_var, 10, '{"useBaseDomain":false, "variant":"dropdown", "url":"", "jsonPath":"","isMultipleSelect":true, "apiCallRequestHeaders":[],"readPermissions":[]}'
);
INSERT INTO answers(
questionary_id, question_id, answer
Expand Down
2 changes: 1 addition & 1 deletion apps/backend/example.development.env
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ NODE_ENV=development
# DEPENDENCY_CONFIG=<e2e|ess|stfc|test>
PING_PUBLIC_CRT=dummypingsecret
DATABASE_URL=postgres://duouser:duopassword@127.0.0.1:5432/duo
BASE_URL=localhost:3000
BASE_URL=http://localhost:3000
JWT_TOKEN_LIFE=7d
JWT_SECRET=qMyLZALzs229ybdQXNyzYRdju7X784TH
# SPARKPOST_TOKEN=insertokenhere
Expand Down
Loading
Loading