Skip to content

Magetwo 84934 fix bluefoot advance slider alignment #2

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

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1091 commits
Select commit Hold shift + click to select a range
0f640ea
MAGETWO-81980: Reading / writing of storage format for the column
Nov 2, 2017
5fccb19
Merge branch 'MAGETWO-66176-column-configuration' of github.com:magen…
Nov 2, 2017
db00e86
MAGETWO-81982: Add appearance field
Nov 2, 2017
0198109
MAGETWO-81984: Polish opening form work
davemacaulay Nov 2, 2017
e6ac01e
MAGETWO-81984: Polish opening form work
davemacaulay Nov 2, 2017
436cf2f
MAGETWO-81984: Polish opening form work
davemacaulay Nov 2, 2017
b6e9fb1
MAGETWO-66176: Column Configuration
IvanChepurnyi Nov 2, 2017
c9a8ffc
Merge branch 'MAGETWO-66176-column-configuration' of github.com:magen…
IvanChepurnyi Nov 2, 2017
e7c3e57
MAGETWO-81984: Polish opening form work
davemacaulay Nov 2, 2017
c4657c8
Merge branch 'MAGETWO-66176-column-configuration' of github.com:magen…
davemacaulay Nov 2, 2017
db37733
MAGETWO-81984: Polish opening form work
davemacaulay Nov 2, 2017
7a6fe8c
MAGETWO-81984: Polish opening form work
davemacaulay Nov 2, 2017
46d40b9
MAGETWO-81984: Polish opening form work
davemacaulay Nov 2, 2017
7293f08
MAGETWO-81982: Add appearance field
Nov 3, 2017
cca66a6
MAGETWO-71566: Filtering Bluefoot content elements on the Panel
anthoula Nov 3, 2017
666bb5b
Merge branch 'MAGETWO-66176-column-configuration' of github.com:magen…
anthoula Nov 3, 2017
8575ddb
MAGETWO-81982: Add appearance field
Nov 3, 2017
84f9b36
MAGETWO-81982: Add appearance field
Nov 3, 2017
ab86d0a
MAGETWO-71566: Filtering Bluefoot content elements on the Panel
anthoula Nov 3, 2017
865d3ba
Merge branch 'MAGETWO-66176-column-configuration' of github.com:magen…
anthoula Nov 3, 2017
cbffec0
MAGETWO-81984: Polish opening form work
davemacaulay Nov 3, 2017
5a13a21
Merge branch 'MAGETWO-66176-column-configuration' of github.com:magen…
davemacaulay Nov 3, 2017
b84ad73
MAGETWO-81980: Reading / writing of storage format for the column
Nov 3, 2017
075ffdd
Merge branch 'MAGETWO-66176-column-configuration' of github.com:magen…
Nov 3, 2017
e1e3a4d
MAGETWO-81984: Polish opening form work
davemacaulay Nov 3, 2017
ecb4fbe
Merge branch 'MAGETWO-66176-column-configuration' of github.com:magen…
davemacaulay Nov 3, 2017
6aa9e35
MAGETWO-81980: Reading / writing of storage format for the column
Nov 3, 2017
cd6a55e
Merge branch 'MAGETWO-66176-column-configuration' of github.com:magen…
Nov 3, 2017
9a473cd
MAGETWO-81982: Add appearance field
Nov 3, 2017
d328dad
MAGETWO-81981: UI component form configuration for column
anthoula Nov 3, 2017
f581830
Merge branch 'MAGETWO-66176-column-configuration' of github.com:magen…
anthoula Nov 3, 2017
94b7376
MAGETWO-81980: Reading / writing of storage format for the column
Nov 4, 2017
083f80f
MAGETWO-81980: Reading / writing of storage format for the column
Nov 4, 2017
339b37b
MAGETWO-81980: Reading / writing of storage format for the column
Nov 6, 2017
30f79f3
MAGETWO-81982: Add appearance field
owlpelletz Nov 6, 2017
a754302
MAGETWO-81984: Polish opening form work
davemacaulay Nov 7, 2017
6bc3ba5
MAGETWO-81984: Polish opening form work
davemacaulay Nov 7, 2017
59d330a
MAGETWO-81984: Polish opening form work
davemacaulay Nov 7, 2017
22b1aba
MAGETWO--81983: Add file upload field
Nov 7, 2017
bcb0521
MAGETWO-81984: Polish opening form work
davemacaulay Nov 7, 2017
b354113
Merge branch 'MAGETWO-66176-column-configuration' of github.com:magen…
davemacaulay Nov 7, 2017
f537491
MAGETWO--81983: Add file upload field
Nov 7, 2017
ed07c4e
MAGETWO-66176: Bluefoot Column Configuration
anthoula Nov 7, 2017
1629b83
MAGETWO--81983: Add file upload field
Nov 7, 2017
73bdf03
Merge branch 'MAGETWO-66176-column-configuration' of https://github.c…
Nov 7, 2017
db8d8a4
MAGETWO-66176: Bluefoot Column Configuration
Nov 7, 2017
2e08a27
MAGETWO--81983: Add file upload field
Nov 8, 2017
7f45bbf
MAGETWO-81984: Polish opening form work
davemacaulay Nov 8, 2017
417cec9
MAGETWO-81984: Polish opening form work
davemacaulay Nov 8, 2017
b2ce28c
MAGETWO-81984: Polish opening form work
davemacaulay Nov 8, 2017
a95bcbb
MAGETWO-81981: UI component form configuration for column
davemacaulay Nov 8, 2017
4b22433
Merge pull request #15 from magento-obsessive-owls/MAGETWO-66176-colu…
davemacaulay Nov 8, 2017
d315960
MAGETWO-81980: Reading / writing of storage format for the column
Nov 8, 2017
f70fb21
MAGETWO-81980: Reading / writing of storage format for the column
Nov 8, 2017
c1463df
MAGETWO-81983: Add file upload field
davemacaulay Nov 9, 2017
197781a
MAGETWO-81983: Add file upload field
davemacaulay Nov 9, 2017
d6043c1
MAGETWO--81983: Add file upload field
Nov 9, 2017
1f8f101
MAGETWO-81984: Polish opening form work
Nov 9, 2017
4065b5c
MAGETWO-71566: Filtering Bluefoot content elements on the Panel
anthoula Nov 10, 2017
ec8dfcf
Merge branch 'MAGETWO-66176-column-configuration' of github.com:magen…
anthoula Nov 10, 2017
6627b49
MAGETWO-81983: Add file upload field
anthoula Nov 10, 2017
9c8d789
MAGETWO-81982: Add appearance field
anthoula Nov 10, 2017
1defeff
MAGETWO-66176: Bluefoot Column Configuration
anthoula Nov 10, 2017
a7c9c13
MAGETWO-81982: Add appearance field
owlpelletz Nov 10, 2017
7c7b9ef
Merge branch 'MAGETWO-66176-column-configuration' into MAGETWO-66176-…
davemacaulay Nov 13, 2017
1cef89a
MAGETWO-83684: Background Color of Column Changes on Edit Column Panel
anthoula Nov 13, 2017
b14c7ce
Merge branch 'MAGETWO-66176-column-configuration' into MAGETWO-66176-…
davemacaulay Nov 14, 2017
8024591
MAGETWO--81983: Add file upload field
davemacaulay Nov 14, 2017
d83ce37
Merge pull request #16 from magento-obsessive-owls/MAGETWO-66176-colu…
heyitsroberthe Nov 14, 2017
b5175b6
MAGETWO-83684: Background Color of Column Changes on Edit Column Panel
owlpelletz Nov 15, 2017
fe532aa
MAGETWO-81983: Add file upload field
owlpelletz Nov 15, 2017
0c5b2d1
Merge pull request #13 from magento-obsessive-owls/MAGETWO-66176-colu…
Nov 15, 2017
601ccfb
MAGETWO-83951: Rendering of dynamic blocks
Nov 17, 2017
808133f
MAGETWO-83951: Rendering of dynamic blocks
Nov 17, 2017
a18b7f5
MAGETWO-83931: Divider
anthoula Nov 17, 2017
a124fb1
MAGETWO-83923: Header
anthoula Nov 16, 2017
c699a70
Merge pull request #17 from magento-obsessive-owls/MAGETWO-83923-header
Nov 17, 2017
61a8a3b
MAGETWO-83926: Image Content Block
Nov 17, 2017
566a362
Merge branch 'master' into MAGETWO-83931-divider
Nov 19, 2017
bfb1d40
MAGETWO-83937: Newsletter
Nov 19, 2017
266c798
MAGETWO-83951: Rendering of dynamic blocks
Nov 19, 2017
341c1b2
Merge branch 'master' of github.com:magento-obsessive-owls/bluefoot
Nov 19, 2017
5605786
Merge branch 'master' into MAGETWO-83937-newsletter
Nov 19, 2017
cb84020
MAGETWO-83941: Static Block
anthoula Nov 20, 2017
d965a55
Merge branch 'master' into MAGETWO-83941-static-block
anthoula Nov 20, 2017
d456d65
MAGETWO-83951: Rendering of dynamic blocks
Nov 20, 2017
76cbc90
MAGETWO-83922: Buttons
Nov 20, 2017
af3c547
MAGETWO-83934: Code
raith-hamzah Nov 20, 2017
ef523f5
MAGETWO-83939: Search
raith-hamzah Nov 20, 2017
0676814
MAGETWO-83925: Textarea
Nov 20, 2017
1de58e0
MAGETWO-83925: Textarea
Nov 20, 2017
f9c334e
MAGETWO-83926: Image Content Block
Nov 21, 2017
2b3c66d
MAGETWO-83926: Image Content Block
Nov 21, 2017
1dcd73b
MAGETWO-83925: Textarea
Nov 21, 2017
c76acf5
MAGETWO-83925: Textarea
Nov 21, 2017
bf22f9f
MAGETWO-83925: Textarea
Nov 21, 2017
bd82b4c
MAGETWO-83924: HTML
davemacaulay Nov 21, 2017
0e60b29
MAGETWO-83951: Rendering of dynamic blocks
Nov 21, 2017
4947b13
Merge branch 'master' into MAGETWO-83925-textarea
Nov 21, 2017
29daccf
Merge branch 'master' into MAGETWO-83937-newsletter
Nov 21, 2017
8cf3d43
Merge branch 'MAGETWO-83925-textarea' into MAGETWO-83937-newsletter
Nov 21, 2017
772a1d5
Merge branch 'master' into MAGETWO-83924-html
davemacaulay Nov 21, 2017
7bb4d73
MAGETWO-83941: Static Block
anthoula Nov 21, 2017
a35a8c8
MAGETWO-83951: Rendering of dynamic blocks
Nov 21, 2017
358193d
MAGETWO-83924: HTML
davemacaulay Nov 21, 2017
3eba1ef
MAGETWO-83924: HTML
davemacaulay Nov 21, 2017
4f2a49a
MAGETWO-83931: Divider
anthoula Nov 21, 2017
ee10178
MAGETWO-83931: Divider
Nov 21, 2017
da87bc6
Merge branch 'MAGETWO-83931-divider' of github.com:magento-obsessive-…
Nov 21, 2017
352c8f0
MAGETWO-83929: Video
davemacaulay Nov 21, 2017
7dc3055
MAGETWO-83934: Code
raith-hamzah Nov 21, 2017
0dfe7ab
MAGETWO-83934: Code
raith-hamzah Nov 21, 2017
3be5bcd
MAGETWO-83931: Divider
anthoula Nov 21, 2017
6b73531
Merge branch 'MAGETWO-83925-textarea' into MAGETWO-83924-html
Nov 21, 2017
d135485
MAGETWO-83934: Code
raith-hamzah Nov 21, 2017
101dae2
MAGETWO-83931: Divider
anthoula Nov 21, 2017
eb0e94e
Merge branch 'MAGETWO-83925-textarea' into MAGETWO-83929-video
Nov 21, 2017
71bc419
Merge branch 'master' into MAGETWO-83931-divider
anthoula Nov 21, 2017
24d5a88
Merge branch 'MAGETWO-83937-newsletter'
Nov 21, 2017
9c3d039
Merge branch 'master' into MAGETWO-83931-divider
anthoula Nov 21, 2017
9860d1a
MAGETWO-83931: Divider
anthoula Nov 21, 2017
07e133d
Merge branch 'master' into MAGETWO-83926-image
Nov 21, 2017
3e6e828
MAGETWO-83941: Static Block
Nov 21, 2017
a0b273b
MAGETWO-83941: Static Block
Nov 21, 2017
ac260ee
MAGETWO-83941: Static Block
Nov 21, 2017
21c8e8f
MAGETWO-83926: Image Content Block
Nov 21, 2017
34c3ae4
MAGETWO-83926: Image Content Block
Nov 21, 2017
dddc345
MAGETWO-83939: Search
raith-hamzah Nov 21, 2017
c5d1d2b
MAGETWO-83941: Static Block
Nov 21, 2017
1053c4e
MAGETWO-83937: Newsletter
Nov 21, 2017
c86a129
MAGETWO-83939: Search
Nov 21, 2017
dcd17b6
MAGETWO-83934: Code
raith-hamzah Nov 21, 2017
93c63aa
MAGETWO-83927: Advanced Form Section
tjwiebell Nov 21, 2017
8062c6f
MAGETWO-83939: Search
Nov 21, 2017
4fa9956
MAGETWO-83941: Static Block
Nov 22, 2017
c74f4c0
MAGETWO-83926: Image Content Block
Nov 22, 2017
ede586e
Merge branch 'MAGETWO-83939-search' into MAGETWO-83941-static-block
Nov 22, 2017
21b0f92
MAGETWO-83934: Code
Nov 22, 2017
d41417b
Merge branch 'MAGETWO-83931-divider'
Nov 22, 2017
c55511e
Merge branch 'MAGETWO-83937-newsletter'
Nov 22, 2017
83f22d6
Merge branches 'MAGETWO-83941-static-block' and 'MAGETWO-83934-code'
Nov 22, 2017
d658797
MAGETWO-83934: Code
Nov 22, 2017
efeb516
Merge branch 'MAGETWO-83926-image'
Nov 22, 2017
76d97bd
Merge remote-tracking branch 'origin/MAGETWO-83931-divider'
Nov 22, 2017
890806e
MAGETWO-83934: Code
Nov 22, 2017
ab0fa7e
MAGETWO-83934: Code
Nov 22, 2017
2cf9d83
MAGETWO-83934: Code
Nov 22, 2017
872b19e
MAGETWO-83926: Image Content Block
davemacaulay Nov 22, 2017
0bd140b
MAGETWO-83926: Image Content Block
davemacaulay Nov 22, 2017
ccd1b2f
Merge pull request #19 from magento-obsessive-owls/MAGETWO-83926-image
davemacaulay Nov 22, 2017
094a1a8
MAGETWO-83929: Video
davemacaulay Nov 22, 2017
da1188f
Merge branch 'MAGETWO-83929-video'
davemacaulay Nov 22, 2017
e3deea1
Merge branch 'master' into MAGETWO-83927-advanced-form
davemacaulay Nov 22, 2017
23e9497
MAGETWO-83927: Advanced Form Section
davemacaulay Nov 22, 2017
fc88f58
Merge branch 'MAGETWO-83927-advanced-form'
Nov 22, 2017
332b227
MAGETWO-83927: Advanced Form Section
Nov 22, 2017
dce8893
MAGETWO-83929: Video
davemacaulay Nov 22, 2017
a932f82
MAGETWO-83951: Rendering of dynamic blocks
Nov 22, 2017
4290b65
MAGETWO-83926: Image Content Block
davemacaulay Nov 22, 2017
854af3d
Merge branch 'master' of github.com:magento-obsessive-owls/bluefoot
davemacaulay Nov 22, 2017
1b050f9
MAGETWO-83929: Video
davemacaulay Nov 22, 2017
2073201
MAGETWO-83942: Tabs
davemacaulay Nov 24, 2017
d3cf7a7
MAGETWO-83942: Tabs
davemacaulay Nov 24, 2017
836aa7f
Merge branch 'MAGETWO-83942-tabs' into MAGETWO-83922-buttons
davemacaulay Nov 24, 2017
a5dbe9f
MAGETWO-83922: Buttons
davemacaulay Nov 24, 2017
931f8d3
MAGETWO-83935: Map
davemacaulay Nov 24, 2017
cd45a37
MAGETWO-83936: Product
davemacaulay Nov 27, 2017
aeef6c3
MAGETWO-83942: Tabs
davemacaulay Nov 24, 2017
6347de0
Merge branch 'MAGETWO-83942-tabs' into MAGETWO-83940-accordion
davemacaulay Nov 27, 2017
d97539f
MAGETWO-83940: Accordion
davemacaulay Nov 27, 2017
671f4d8
MAGETWO-83928: Driver
davemacaulay Nov 27, 2017
5a679dc
MAGETWO-83940: Accordion
davemacaulay Nov 27, 2017
ca01c0d
MAGETWO-83928: Driver
davemacaulay Nov 27, 2017
91d3afe
MAGETWO-83942: Tabs
tjwiebell Nov 27, 2017
c683d11
MAGETWO-83928:Driver - Fixed image typing and minor readability update
Nov 27, 2017
a1de02a
MAGETWO-83935: Map
anthoula Nov 27, 2017
48707e8
MAGETWO-83936: Product
Nov 27, 2017
b8996bc
MAGETWO-83940: Accordion
Nov 27, 2017
2c1229f
MAGETWO-83936: Product
Nov 27, 2017
bd64ce5
MAGETWO-83928:Driver - Fixed driver link_text error when link_text di…
Nov 27, 2017
25b64bc
MAGETWO-83936: Product
Nov 27, 2017
e1979df
MAGETWO-83936: Product
Nov 27, 2017
53d2737
Merge remote-tracking branch 'origin/MAGETWO-83940-accordion'
Nov 28, 2017
d770b09
Merge remote-tracking branch 'origin/MAGETWO-83928-driver'
Nov 28, 2017
235de05
Merge branch 'MAGETWO-83936-product'
Nov 28, 2017
fa2ea6e
Merge remote-tracking branch 'origin/MAGETWO-83922-buttons'
Nov 28, 2017
884de1f
MAGETWO-83935: Map
anthoula Nov 28, 2017
9b38d47
MAGETWO-83935: Map
Nov 28, 2017
4c04dbe
MAGETWO-83940: Accordion
davemacaulay Nov 28, 2017
a103410
MAGETWO-83940: Accordion
davemacaulay Nov 28, 2017
7a34bb0
MAGETWO-84648: Test automation
owlpelletz Nov 28, 2017
28c51bd
MAGETWO-83932: Anchor
anthoula Nov 28, 2017
349ba66
MAGETWO-84655: Test: Add Header content block in Bluefoot
Nov 28, 2017
2c845a4
Merge branch 'master' of github.com:magento-obsessive-owls/bluefoot
Nov 28, 2017
511b0cf
MAGETWO-83932: Anchor
anthoula Nov 28, 2017
7ce3870
Merge pull request #21 from magento-obsessive-owls/MAGETWO-84648-test…
Nov 28, 2017
97ab9aa
Merge remote-tracking branch 'origin/MAGETWO-83932-anchor'
Nov 28, 2017
d5bf859
Merge branch 'master' of github.com:magento-obsessive-owls/bluefoot
Nov 28, 2017
da25bfd
MAGETWO-83933: Advanced Slider - Added advanced slider content type a…
Nov 28, 2017
600f1f6
MAGETWO-84669: Test: Add Static content block in Bluefoot
Nov 29, 2017
4f33b47
MAGETWO-84669: Test: Add Static content block in Bluefoot
Nov 29, 2017
693684a
MAGETWO-83933: Advanced Slider
davemacaulay Nov 29, 2017
9711ba4
MAGETWO-84671: Test: Add Buttons content block in Bluefoot
tjwiebell Nov 29, 2017
b55e529
MAGETWO-83933: Advanced Slider - Added blockfactory for slides in adv…
Nov 29, 2017
25ee167
MAGETWO-84778: Hide slide content type in the menu
Nov 29, 2017
2778161
MAGETWO-84776: Refactor render templates
Nov 30, 2017
7c60a40
MAGETWO-84776: Refactor render templates
Nov 30, 2017
0df851f
MAGETWO-84782: Reading data for slider
davemacaulay Nov 30, 2017
272685f
MAGETWO-83938: Product List
raith-hamzah Nov 30, 2017
76a537f
MAGETWO-84777: Admin preview
davemacaulay Nov 30, 2017
4123885
Merge branch 'master' into MAGETWO-83938-product-list
Nov 30, 2017
af1759f
MAGETWO-84657: Basic image test
owlpelletz Nov 30, 2017
6bf95f8
MAGETWO-84657: Basic image test
owlpelletz Nov 30, 2017
0e83068
Merge branch 'MAGETWO-84648-testautomation' of github.com:magento-obs…
owlpelletz Nov 30, 2017
09cbdb5
MAGETWO-84777: Admin preview
davemacaulay Nov 30, 2017
c52c7f7
MAGETWO-84657: Basic image test
owlpelletz Nov 30, 2017
e307b0d
Merge branch MAGETWO-84648-testautomation of github.com:magento-obses…
owlpelletz Nov 30, 2017
793bacd
MAGETWO-84671: Test: Add Buttons content block in Bluefoot
tjwiebell Nov 29, 2017
27afb16
MAGETWO-84657: Basic image test
owlpelletz Nov 30, 2017
5527c41
Merge branch MAGETWO-84648-testautomation of github.com:magento-obses…
owlpelletz Nov 30, 2017
e5a03be
MAGETWO-84648: Test Automation
owlpelletz Nov 30, 2017
a9a25cf
MAGETWO-84676: Test: Add Map content block in Bluefoot
anthoula Nov 30, 2017
d1e5a79
Merge branch 'MAGETWO-84676-map-test' into MAGETWO-84648-testautomation
anthoula Nov 30, 2017
2b2a7b6
MAGETWO-83938: Product List
Nov 30, 2017
f8d074f
MAGETWO-84779: make-slider-functional-on-the-frontend
Nov 30, 2017
f14f317
MAGETWO-84779: make-slider-functional-on-the-frontend
Nov 30, 2017
d920d80
MAGETWO-84676: Test: Add Map content block in Bluefoot
anthoula Nov 30, 2017
355fa22
MAGETWO-84676: Test: Add Map content block in Bluefoot
anthoula Nov 30, 2017
76a2e68
MAGETWO-84779: make-slider-functional-on-the-frontend
Nov 30, 2017
b70c887
MAGETWO-83938: Product List
Dec 1, 2017
36c3f4e
MAGETWO-83938: Product List
Dec 1, 2017
73a382a
MAGETWO-83938: Product List
Dec 1, 2017
6d3313f
MAGETWO-84779: make-slider-functional-on-the-frontend
davemacaulay Dec 1, 2017
22ab1d3
MAGETWO-84672: Test: Add Divider content block in Bluefoot
anthoula Dec 1, 2017
b4f75b3
Merge branch 'master' into MAGETWO-84648-testautomation
owlpelletz Dec 1, 2017
a7208cd
MAGETWO-83938: Product List
Dec 1, 2017
3574baa
MAGETWO-83933: Advanced Slider
Dec 1, 2017
eae6c5c
MAGETWO-84678: Test: Add HTML content block in Bluefoot
Dec 1, 2017
7ff408c
MAGETWO-84674: Add driver test
owlpelletz Dec 1, 2017
6b9f7ae
MAGETWO-84679: Test: Add Textarea content block in Bluefoot
tjwiebell Dec 1, 2017
46ebc99
MAGETWO-84675: Test: Add Accordion content block in Bluefoot
raith-hamzah Dec 1, 2017
869b16f
Merge branch 'MAGETWO-84648-testautomation' of github.com:magento-obs…
raith-hamzah Dec 1, 2017
1e6513e
MAGETWO-84934: fix-bluefoot-advance-slider-alignment
Dec 3, 2017
dd5c344
MAGETWO-84934: fix-bluefoot-advance-slider-alignment
Dec 4, 2017
e288639
MAGETWO-84934: fix-bluefoot-advance-slider-alignment
Dec 4, 2017
e2b6120
Merge branch 'MAGETWO-84648-testautomation'
Dec 4, 2017
df6cdde
MAGETWO-84934: fix-bluefoot-advance-slider-alignment
Dec 4, 2017
efb4fb6
Merge branch 'master' into MAGETWO-84934-fix-bluefoot-advance-slider-…
Dec 5, 2017
8404058
MAGETWO-84934: fix-bluefoot-advance-slider-alignment
Dec 5, 2017
58480e2
MAGETWO-84934: fix-bluefoot-advance-slider-alignment
Dec 5, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
11 changes: 11 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
.idea
dev/build/
/var/*
**/node_modules/*
/robo.yml
/vendor/
/.requirejs-config.js
/.path-mapping.json
/jest.config.json
**.js.map
**.d.js
79 changes: 79 additions & 0 deletions NEW_REPOSITORY.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
# Development in new repository structure

### Development Installation

1. Install all dependencies
```bash
composer install && yarn install
```

2. Configure robo (docker or local mysql):

**Docker mysql** (make sure container has either port or ip address accessible to host)
```bash
vendor/bin/robo build:configuration-from-docker-container [name of mysql container]
```

**Local mysql**
```bash
vendor/bin/robo build:configuration [mysql host] [mysql username] [mysql password]
```


### Running Tests

Before running any tests, you need to create a development build

```bash
vendor/bin/robo build:create dev [your prefered url] [magento branch of current story]
```

#### JavaScript Tests

##### Command Line
To run a complete suite you can just execute this simple command

```bash
npx jest --no-cache
```

If you want to execute a separate test file, just specify its path

```bash
npx jest [path-to-file]
```

##### PHPStorm Integration

1. Enable Node & NPM integration in **PHPStorm > Preferences > Language & Frameworks > NodeJs & NPM > Enable**

2. Before you can run any javascript tests you need to export jest configuration file for PHPStorm.
```
npx gulp jestConfig
```

3. Then you have specify jest.config.json in **PHPStorm > Run > Edit Configurations > Defaults -> Jest:**

- Select your jest.config.json into **Configuration File** file

- Specify your repo directory in **Working directory** field

- Specify your "--no-cache" into **Jest options** field

- Node runtime & jest executable should be automatically pre-filled

Now you can just right click on any JS test file and run them in your IDE.

#### Functional Tests

As soon as your build is accessible via specified url in `build:create` command

```bash
vendor/bin/robo run:functional-test --build [buildname]
```

You can also execute tests byt name

```bash
vendor/bin/robo run:functional-test --build [buildname] --test-name [NameOfTestCest]
```
107 changes: 105 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,105 @@
# bluefoot
Bluefoot Extension
# BlueFoot Magento 2 module
The BlueFoot module provides drag & drop content building functionality to Magento 2. Originally produced by Gene Commerce and acquired at the start of 2017 by Magento.

### Development Installation

You will need to have Magento EE running alongside having this repository symlinked into your installation.

#### Installing Magento 2 EE

You need to run the following commands to install Magento EE:

- Clone the CE & EE repositories
- Run the `build-ee.php` script to create symlinks from the EE repository within the CE repository
- Copy over the EE composer.json file into the CE repository
- Remove the composer.lock file
- Install composer dependencies

```bash
git clone [email protected]:magento-obsessive-owls/magento2ce.git
git clone [email protected]:magento-obsessive-owls/magento2ee.git
php magento2ee/dev/tools/build-ee.php
cp magento2ee/composer.json magento2ce/
rm -rf magento2ce/composer.lock
cd magento2ce
composer install
```

You will then be working out of the `magento2ce` repository, this repository will be running EE code of the latest version available.

#### Installing BlueFoot

In the same directory you ran the above commands you will need to run the following:

```bash
git clone [email protected]:magento-obsessive-owls/bluefoot.git
mkdir magento2ce/app/code/Gene/
cd magento2ce/app/code/Gene/
ln -s ../../../../bluefoot/app/code/Gene/BlueFoot/ BlueFoot
```

This will symlink the module within `bluefoot` folder to your EE.

#### Linking Functional Acceptence Tests
The tests live in the core of our module and will need to be linked into your `magento2ce` project. This assumes you've already installed the acceptence framework within your installation.

> Installation of the framework is as simple as navigating to `dev/tests/acceptence` then running `composer install`

To link the acceptence tests you simply need to run the following commands from the root of the `magento2ce` folder:

```bash
cd dev/tests/acceptance/tests/functional/Magento/FunctionalTest/
ln -s ../../../../../../../../bluefoot/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/BlueFoot/ BlueFoot
```

The tests will then be available your Magento installation for running with MFTF.

#### Resolving Template Validation Issues

You need to replace the paths that the system tries to load template files from to stop Magento throwing an invalid path error for the EE & BlueFoot templates.

Open `magento2ce/lib/internal/Magento/Framework/Component/ComponentRegistrar.php` and modify the `render` function to replace the new paths with the `magento2ce` path like below.

```Php
/**
* Sets the location of a component.
*
* @param string $type component type
* @param string $componentName Fully-qualified component name
* @param string $path Absolute file path to the component
* @throws \LogicException
* @return void
*/
public static function register($type, $componentName, $path)
{
$path = str_replace(['magento2ee', 'bluefoot'], 'magento2ce', $path);

self::validateType($type);
if (isset(self::$paths[$type][$componentName])) {
throw new \LogicException(
ucfirst($type) . ' \'' . $componentName . '\' from \'' . $path . '\' '
. 'has been already defined in \'' . self::$paths[$type][$componentName] . '\'.'
);
} else {
self::$paths[$type][$componentName] = str_replace('\\', '/', $path);
}
}
```

Note: the addition here is the `str_replace` which is converting the file paths to resolve always to the `magento2ce` directory.

```php
$path = str_replace(['magento2ee', 'bluefoot'], 'magento2ce', $path);
```

#### Run Setup

Finally you'll need to run the Magento 2 setup upgrade command to perform any migrations & installation scripts of the module.

```bash
bin/magento setup:upgrade
```

### Usage

BlueFoot appears in areas where the TinyMCE WYSWIYG was previously available. You can validate if BlueFoot is working by an additional button to `Activate Advanced CMS` being placed above the WYSIWYG instance.
22 changes: 22 additions & 0 deletions RoboFile.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/

/**
* Robo tasks container
*
*/
class RoboFile extends \Robo\Tasks
{
use Magento\RoboFile\loadTasks;

/**
* Sets root project directory for dev tasks
*/
public function __construct()
{
$this->projectRoot = __DIR__;
}
}
8 changes: 8 additions & 0 deletions app/code/Gene/BlueFoot/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
config.codekit
.idea
node_modules
view/adminhtml/coverage
view/adminhtml/web/es6
view/adminhtml/web/css/magento2.css

package-lock\.json
54 changes: 54 additions & 0 deletions app/code/Gene/BlueFoot/Api/AttributeGroupRepositoryInterface.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
<?php

namespace Gene\BlueFoot\Api;

/**
* Interface AttributeGroupRepositoryInterface
*
* @package Gene\BlueFoot\Api
*
* @author Dave Macaulay <[email protected]>
*/
interface AttributeGroupRepositoryInterface
{
/**
* Save attribute group
*
* @param \Magento\Eav\Api\Data\AttributeGroupInterface $group
* @return \Magento\Eav\Api\Data\AttributeGroupInterface
*/
public function save(\Magento\Eav\Api\Data\AttributeGroupInterface $group);

/**
* Retrieve list of attribute groups
*
* @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
* @return \Magento\Eav\Api\Data\AttributeGroupSearchResultsInterface
* @throws \Magento\Framework\Exception\NoSuchEntityException
*/
public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria);

/**
* Retrieve attribute group
*
* @param int $groupId
* @return \Magento\Eav\Api\Data\AttributeGroupInterface
*/
public function get($groupId);

/**
* Remove attribute group
*
* @param \Magento\Eav\Api\Data\AttributeGroupInterface $group
* @return bool
*/
public function delete(\Magento\Eav\Api\Data\AttributeGroupInterface $group);

/**
* Remove attribute group by id
*
* @param int $groupId
* @return bool
*/
public function deleteById($groupId);
}
61 changes: 61 additions & 0 deletions app/code/Gene/BlueFoot/Api/AttributeRepositoryInterface.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
<?php

namespace Gene\BlueFoot\Api;

/**
* Interface AttributeRepositoryInterface
*
* @package Magento\Catalog\Api
*
* @author Dave Macaulay <[email protected]>
*/
interface AttributeRepositoryInterface extends \Magento\Framework\Api\MetadataServiceInterface
{
/**
* Retrieve all attributes for entity type
*
* @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
* @return \Magento\Catalog\Api\Data\ProductAttributeSearchResultsInterface
*/
public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria);

/**
* Retrieve specific attribute
*
* @param string $attributeCode
* @return \Magento\Catalog\Api\Data\ProductAttributeInterface
* @throws \Magento\Framework\Exception\NoSuchEntityException
*/
public function get($attributeCode);

/**
* Save attribute data
*
* @param \Magento\Catalog\Api\Data\ProductAttributeInterface $attribute
* @return \Magento\Catalog\Api\Data\ProductAttributeInterface
* @throws \Magento\Framework\Exception\NoSuchEntityException
* @throws \Magento\Framework\Exception\InputException
* @throws \Magento\Framework\Exception\StateException
*/
public function save(\Magento\Catalog\Api\Data\ProductAttributeInterface $attribute);

/**
* Delete Attribute
*
* @param \Magento\Catalog\Api\Data\ProductAttributeInterface $attribute
* @return bool True if the entity was deleted (always true)
* @throws \Magento\Framework\Exception\StateException
* @throws \Magento\Framework\Exception\NoSuchEntityException
*/
public function delete(\Magento\Catalog\Api\Data\ProductAttributeInterface $attribute);

/**
* Delete Attribute by id
*
* @param string $attributeCode
* @return bool
* @throws \Magento\Framework\Exception\StateException
* @throws \Magento\Framework\Exception\NoSuchEntityException
*/
public function deleteById($attributeCode);
}
Loading