Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[EPIC FOUR-18012] Screen Template V2 Implementation #1729

Merged
merged 51 commits into from
Oct 9, 2024
Merged
Changes from 1 commit
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
e58b019
Create ScreenTemplates Panel section
mcraeteisha Aug 27, 2024
41eff42
Update Template buttons styling; add functionality for fetching Templ…
mcraeteisha Aug 28, 2024
37991ef
Add watcher for sharedTemplatesData
mcraeteisha Aug 28, 2024
724f53f
Update ScreenTemplates Formatting; Add ScreenTemplatesCard
mcraeteisha Aug 30, 2024
2bf7af4
Merge pull request #1690 from ProcessMaker/subtask/FOUR-18286
sanjacornelius Sep 5, 2024
4417d82
Create cypress test for ScreenTemplateSection
mcraeteisha Sep 12, 2024
61537ea
Remove commented code
mcraeteisha Sep 12, 2024
46827c9
Add templates button to ScreenToolbar for use when package-versions n…
mcraeteisha Sep 12, 2024
eb2f7b5
Handle open and close of templates panel from screen-builder
mcraeteisha Sep 12, 2024
ee0babd
Remove cy.wait from test
mcraeteisha Sep 12, 2024
3ed4997
Rename test file; update test for displaying My Templates
mcraeteisha Sep 13, 2024
f07fcf8
Remove myTemplatesData as a prop in vue-form-builder
mcraeteisha Sep 13, 2024
2f5dd37
Fetch templates data from screen-builder
mcraeteisha Sep 13, 2024
9cc9495
Update shared templates display test
mcraeteisha Sep 13, 2024
d22d02e
Handle showing of templates panel in vue-form-builder
mcraeteisha Sep 13, 2024
4a9107b
Update showing of sharedTemplates in ScreenTemplates
mcraeteisha Sep 13, 2024
0f69cf3
Display 'No Templates Found' when users have no templates
mcraeteisha Sep 13, 2024
b2a9e88
Merge branch 'next' into epic/FOUR-18012
mcraeteisha Sep 13, 2024
c8b1a14
Merge branch 'epic/FOUR-18012' into task/FOUR-18303
mcraeteisha Sep 13, 2024
932d2e7
Merge branch 'epic/FOUR-18012' into task/FOUR-18315
mcraeteisha Sep 13, 2024
4e88c37
CSS Updates for Screen Template Cards
mcraeteisha Sep 15, 2024
b69ccd7
Merge pull request #1697 from ProcessMaker/task/FOUR-18303
sanjacornelius Sep 16, 2024
1c7ca31
Wrap hard-coded text in translation method
mcraeteisha Sep 16, 2024
bb4e8ee
Clean up code
mcraeteisha Sep 16, 2024
3709c79
Merge branch 'epic/FOUR-18012' into task/FOUR-18315
mcraeteisha Sep 16, 2024
c25ce9a
Merge pull request #1700 from ProcessMaker/task/FOUR-18315
sanjacornelius Sep 16, 2024
3e985ff
Add b-collapse and buttons to template cards; update styles
mcraeteisha Sep 17, 2024
a570428
Add translation methods to hardcoded text
mcraeteisha Sep 17, 2024
cc525e3
Merge branch 'epic/FOUR-18012' into observation/FOUR-19136
mcraeteisha Sep 17, 2024
7bddcf5
Add CssIcon component
mcraeteisha Sep 17, 2024
559566a
CSS Updates to Options Icons
mcraeteisha Sep 17, 2024
df2441d
Remove commented code
mcraeteisha Sep 17, 2024
fbb1c9e
Update styling to scroll inside of column
mcraeteisha Sep 17, 2024
3d2c148
Merge pull request #1704 from ProcessMaker/observation/FOUR-19136
mcraeteisha Sep 18, 2024
6f47434
Add applyTemplate method
mcraeteisha Sep 18, 2024
e4b41a0
Merge branch 'epic/FOUR-18012' into task/FOUR-18323
mcraeteisha Sep 18, 2024
e85e612
Pass currentScreenPage to ScreenTemplateCard.vue
mcraeteisha Sep 19, 2024
630e685
Pass screen-id to sharedTemplates Card
mcraeteisha Sep 19, 2024
01d85c1
Merge pull request #1708 from ProcessMaker/task/FOUR-18326
sanjacornelius Sep 20, 2024
afc9ca0
Styling update in ScreenTemplatesPanel
mcraeteisha Sep 24, 2024
c243363
Merge branch 'next' into epic/FOUR-18012
sanjacornelius Oct 7, 2024
cc4b437
filter templates by screenType
sanjacornelius Oct 7, 2024
7417bf1
Set default values for screen templates prop
sanjacornelius Oct 8, 2024
d8147d6
Fix failing tests to include screen_type in the intercept API call
sanjacornelius Oct 8, 2024
80278c9
Merge pull request #1730 from ProcessMaker/observation/FOUR-19177
sanjacornelius Oct 8, 2024
334408e
Merge branch 'release-2024-fall' into epic/FOUR-18012
sanjacornelius Oct 8, 2024
b6a207e
Merge branch 'release-2024-fall' into epic/FOUR-18012
sanjacornelius Oct 9, 2024
35fd6b3
Fix missing tag error
sanjacornelius Oct 9, 2024
1ec1517
Fix missing end tag
sanjacornelius Oct 9, 2024
d5952e2
Fix merge conflict issues
sanjacornelius Oct 9, 2024
1623f9a
Merge branch 'release-2024-fall' into epic/FOUR-18012
sanjacornelius Oct 9, 2024
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
Prev Previous commit
Merge branch 'release-2024-fall' into epic/FOUR-18012
sanjacornelius committed Oct 9, 2024
commit 1623f9a4ef17b4a7343a941f0ee9f9b939f00dfe

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.