Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
131 commits
Select commit Hold shift + click to select a range
e5bc62c
Work in progress
dclaux Jan 17, 2019
daf6092
Work in progress
dclaux Jan 18, 2019
1896eb8
Work in progress
dclaux Jan 19, 2019
8d400e8
Work in progress
dclaux Jan 22, 2019
6f48dff
Work in progress
dclaux Jan 22, 2019
71e8a8f
Work in progress
dclaux Jan 24, 2019
0483e90
Work in progress
dclaux Jan 24, 2019
a18c6e5
Work in progress
dclaux Jan 24, 2019
8ad05e7
Merge branch 'master' into js/template-engine
dclaux Jan 24, 2019
0a465cc
Work in progress
dclaux Jan 25, 2019
ac436be
Work in progress
dclaux Jan 25, 2019
647562c
Work in progress
dclaux Jan 25, 2019
3f16126
Adaptive template engine - fully functional
dclaux Jan 25, 2019
968bf70
Enhanced test app UI, add input box for data
dclaux Jan 25, 2019
8112cb7
Fix repeating elements wrongly generating an array
dclaux Jan 25, 2019
474b554
Add support for {?# expressions
dclaux Jan 26, 2019
d52860c
[Designer] Add support for multiple tool boxes per side panel
dclaux Jan 31, 2019
1b22e28
Fix cursor not always sticking to splitters when resizing
dclaux Jan 31, 2019
051ccad
[Designer] Add Data Explorer toolbox
dclaux Jan 31, 2019
3d27be2
Add drag/drop support of fields from data explorer
dclaux Feb 1, 2019
a1d31c1
Change a couple of strings
dclaux Feb 1, 2019
6da164d
[Designer] Add support for toolbox commands
dclaux Feb 1, 2019
38c10a0
[Designer] Integrated templating/data binding support
dclaux Feb 1, 2019
24b45d8
Fix expression parse conflicting with existing {{ }} notation
dclaux Feb 1, 2019
7af8a07
Fix data path generation bug
dclaux Feb 2, 2019
1a9eb24
Rework parser
dclaux Feb 2, 2019
fb9df8b
Fix {{ notation interfering with binding parser (again)
dclaux Feb 3, 2019
105394e
merge controls css into adaptivecards-designer.css so only one CSS re…
matthidinger Feb 4, 2019
47f3569
added sample data to designer
matthidinger Feb 4, 2019
3375f68
formatting
matthidinger Feb 4, 2019
292d542
fix sample data
matthidinger Feb 4, 2019
053f37a
fix designer sample payload in site
matthidinger Feb 4, 2019
e11d311
Rework data structure OM
dclaux Feb 5, 2019
f0990cc
Update designer.ejs
matthidinger Feb 5, 2019
a772412
Add support for full JSON rountrip
dclaux Feb 5, 2019
bd9041d
Merge branch 'js/template-engine' of https://github.com/Microsoft/Ada…
dclaux Feb 5, 2019
a4ecd80
Small fix
dclaux Feb 5, 2019
8f78bf4
Remove print function from parser
dclaux Feb 5, 2019
d7221b9
Fix FactSet not playing well with data binding
dclaux Feb 7, 2019
77c8395
Fix column bleeding bug
dclaux Feb 8, 2019
2cb96cd
Make Timeline a fizxed height container
dclaux Feb 8, 2019
9bb331f
Merge branch 'master' into js/template-engine
dclaux Feb 8, 2019
6d0cbfa
Revert "Merge branch 'master' into js/template-engine"
dclaux Feb 8, 2019
a1d95de
FIx multiple {{...}} in a single TextBlock breaking data binding
dclaux Feb 12, 2019
3f5f55a
Fix TextBlock.color not supporting data bidning
dclaux Feb 12, 2019
d7a49ea
adding payloads
matthidinger Feb 13, 2019
a8a55cb
Merge branch 'js/template-engine' of https://github.com/Microsoft/Ada…
matthidinger Feb 13, 2019
3b22f87
Force parsed string values to be of string type
dclaux Feb 14, 2019
fa24e81
Merge branch 'master' into js/template-engine
dclaux Feb 18, 2019
5f6b478
[Designer] Add built-in sample loader
dclaux Feb 21, 2019
6aad4b4
[Designer] Add default sample to catalogue
dclaux Feb 21, 2019
b21ae66
[Designer] Fix impossibility to close sample picker if an error occurs
dclaux Feb 21, 2019
42921e8
Update StockUpdate.data.json
matthidinger Feb 21, 2019
b3a08ca
[Designer] Change function calling pattern
dclaux Feb 22, 2019
b1e1891
Merge branch 'js/template-engine' of https://github.com/Microsoft/Ada…
dclaux Feb 22, 2019
994f399
Update sample payload
dclaux Feb 22, 2019
c05731d
Merge branch 'master' into js/template-engine
dclaux Feb 22, 2019
9ce20af
Merge branch 'master' into js/template-engine
dclaux Feb 25, 2019
414183f
Merge branch 'master' into js/template-engine
dclaux Feb 26, 2019
d1dfcb5
Manual merge from master
dclaux Feb 26, 2019
e93bd88
Fix entire object dropped if single field null during template expansion
dclaux Feb 26, 2019
6d7ec9a
Merge branch 'master' into js/template-engine
dclaux Feb 27, 2019
7284445
Replace import wqith require for HostCOnfig json files
dclaux Feb 27, 2019
eba7310
Merge branch 'master' into js/template-engine
dclaux Feb 27, 2019
1bd1279
Merge branch 'master' into js/template-engine
dclaux Mar 1, 2019
bad8e57
Quick fix
dclaux Mar 5, 2019
6012334
Merge branch 'master' into js/template-engine
dclaux Mar 7, 2019
2fcbcd2
Merge branch 'master' into js/template-engine
dclaux Mar 11, 2019
d78e49a
Merge branch 'master' into js/template-engine
dclaux Mar 14, 2019
b51fcea
Merge branch 'master' into js/template-engine
dclaux Mar 18, 2019
ed42bab
Fix JSON roundtrip bug
dclaux Mar 18, 2019
28b7b9d
Add experimental "if" function
dclaux Mar 18, 2019
bf8a36e
Merge branch 'master' into js/template-engine
dclaux Mar 18, 2019
16623ea
Merge branch 'master' into js/template-engine
dclaux Mar 18, 2019
eaaf89f
Update Outlook and WebChat CSS in visualizer
dclaux Mar 19, 2019
37e3665
Fix round trip serialization again
dclaux Mar 19, 2019
d83e3ee
Small fix when switching back to design mode
dclaux Mar 19, 2019
1b14fc4
Fix error when encoutering a property == null
dclaux Mar 20, 2019
e11baed
Bug fix in progress
dclaux Mar 20, 2019
db4b4d1
Fix payload rountripping, again
dclaux Mar 20, 2019
2f6baa2
Merge branch 'master' into js/template-engine
dclaux Mar 21, 2019
56ef16c
Merge branch 'master' into js/template-engine
dclaux Mar 22, 2019
cd6e93b
Merge branch 'js/template-engine' of https://github.com/Microsoft/Ada…
dclaux Mar 22, 2019
5193b02
Merge branch 'master' into js/template-engine
dclaux Mar 25, 2019
38ca6ee
Merge branch 'master' into js/template-engine
dclaux Mar 27, 2019
27a86c2
Merge branch 'master' into js/template-engine
dclaux Apr 1, 2019
68168c8
Merge branch 'master' into js/template-engine
dclaux Apr 3, 2019
1649076
Merge branch 'master' into js/template-engine
dclaux Apr 3, 2019
8ab9e00
Merge branch 'master' into js/template-engine
dclaux Apr 8, 2019
92b8580
Merge branch 'master' into js/template-engine
dclaux Apr 11, 2019
77ff71c
Merge branch 'master' into js/template-engine
dclaux Apr 14, 2019
a38b3ec
Merge branch 'master' into js/template-engine
dclaux Apr 17, 2019
7c1e26b
Merge branch 'master' into js/template-engine
dclaux Apr 18, 2019
951f5e7
Merge branch 'master' into js/template-engine
dclaux Apr 18, 2019
adea3db
Fix serialization roundtrip, again
dclaux Apr 18, 2019
e8ae66d
Roundtrip what wasn't (e.g. Fact, Choice, ...)
dclaux Apr 19, 2019
c0f2b90
More rountrip fixes
dclaux Apr 19, 2019
fc81917
Merge branch 'master' into js/template-engine
dclaux Apr 22, 2019
fc3e618
Merge branch 'master' into js/template-engine
dclaux Apr 24, 2019
ee10124
[Designer] Support for custom tool palette items
dclaux Apr 24, 2019
17b50e1
[Designer] Disable preview features by default
dclaux Apr 24, 2019
d2d75d5
Enable preview features in vnext site
dclaux Apr 25, 2019
37c83ed
Variable rename
dclaux Apr 25, 2019
cef62d1
Merge branch 'master' into js/template-engine
dclaux Apr 25, 2019
4da18d0
Merge branch 'master' into js/template-engine
dclaux Apr 25, 2019
3a21b4c
Merge branch 'master' into js/template-engine
dclaux Apr 25, 2019
90535fa
Merge branch 'master' into js/template-engine
dclaux Apr 26, 2019
42e6140
Merge branch 'master' into js/template-engine
dclaux Apr 30, 2019
57fe2ae
Merge branch 'master' into js/template-engine
dclaux Apr 30, 2019
c9e22ba
Merge branch 'master' into js/template-engine
dclaux May 1, 2019
7359742
Merge branch 'master' into js/template-engine
dclaux May 2, 2019
1bc9b98
Fix exception with Action.Submit
dclaux May 2, 2019
4f91f29
Fix invisible copy JSON button causing exception
dclaux May 2, 2019
f831677
Merge branch 'master' into js/template-engine
dclaux May 2, 2019
e42adb3
Merge branch 'master' into js/template-engine
dclaux May 2, 2019
304e6b3
Fix $when not deserialized properly
dclaux May 2, 2019
9b3648c
enable designer preview features in the vnext site
matthidinger May 6, 2019
c188e65
Merge branch 'master' into js/template-engine
dclaux May 10, 2019
0363d4e
Merge branch 'master' into js/template-engine
dclaux May 10, 2019
102cc50
Merge branch 'master' into js/template-engine
dclaux May 14, 2019
cd89272
Merge branch 'master' into js/template-engine
dclaux May 16, 2019
3d156c2
Merge branch 'master' into js/template-engine
dclaux May 16, 2019
53d2f88
Merge fixes
dclaux May 17, 2019
ca879c0
Merge branch 'master' into js/template-engine
dclaux May 22, 2019
407e079
Package the template engine
dclaux May 22, 2019
8ca2ed1
Merge branch 'master' into js/template-engine
dclaux May 22, 2019
7cec279
Merge branch 'master' into js/template-engine
dclaux May 23, 2019
52f6a48
Merge branch 'master' into js/template-engine
dclaux May 23, 2019
e5ac890
Merge branch 'master' into js/template-engine
dclaux May 24, 2019
5e2d40d
Merge branch 'master' into js/template-engine
dclaux May 24, 2019
49fbbe0
Merge branch 'master' into js/template-engine
dclaux May 29, 2019
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
  •  
  •  
  •  
23 changes: 0 additions & 23 deletions samples/Tests/Action.CustomParsing.json

This file was deleted.

42 changes: 20 additions & 22 deletions samples/Tests/CustomParsingTestUsingProgressBar.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,27 @@
"type": "AdaptiveCard",
"version": "1.0",
"body": [
{
"type": "TextBlock",
"text": "Custom parsing allows a custom type",
"wrap": true,
"horizontalAlignment": "center"
},
{
"type": "TextBlock",
"text": "**Progress Bar**",
"horizontalAlignment": "center"
},
{
"type": "ProgressBar",
"payload": [
{
"red":187,
"green":160,
"blue":209,
"alpha":1,
"progress":0.95,
"thickness":1
"type": "TextBlock",
"text": "Custom parsing allows a custom type",
"wrap": true,
"horizontalAlignment": "center"
},
{
"type": "TextBlock",
"text": "**Progress Bar**",
"horizontalAlignment": "center"
},
{
"type": "CustomIOSDelegate",
"payload": [
{
"red":187,
"green":160,
"blue":209,
"alpha":1
}
]
}
]
}
]
}
48 changes: 16 additions & 32 deletions samples/v1.1/Elements/Image.BackgroundColor.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,35 +2,19 @@
"$schema": "http://adaptivecards.io/schemas/adaptive-card.json",
"type": "AdaptiveCard",
"version": "1.0",
"body": [{
"type": "ColumnSet",
"columns": [{
"type": "Column",
"width": "stretch",
"items": [{
"type": "Image",
"backgroundColor": "#982374",
"url": "http://adaptivecards.io/content/cats/1.png"
}]
},
{
"type": "Column",
"width": "stretch",
"items": [{
"type": "Image",
"backgroundColor": "#128192",
"url": "http://adaptivecards.io/content/cats/1.png"
}]
},
{
"type": "Column",
"width": "stretch",
"items": [{
"type": "Image",
"backgroundColor": "#183774",
"url": "http://adaptivecards.io/content/cats/1.png"
}]

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey David Claux (@dclaux), are the changes to teh test samples related to your changes at all? My only concern is a bad merge accidentally overwriting stuff in master for 1.2 ..

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't remember making any changes here.

}
]
}]
}
"body": [
{
"type": "Image",
"size": "medium",
"url": "https://adaptivecards.io/content/circleontransparentbackground.png",
"backgroundColor": "#CCCCCC"
},
{
"type": "Image",
"size": "medium",
"url": "https://adaptivecards.io/content/circleontransparentbackground.png",
"backgroundColor": "#DDDDDD",
"style": "person"
}
]
}
40 changes: 40 additions & 0 deletions samples/v2.0/Scenarios/FlightUpdate.data.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"@context": "http://schema.org",
"@type": "FlightReservation",
"reservationId": "RXJ34P",
"reservationStatus": "http://schema.org/ReservationConfirmed",
"passengerPriorityStatus": "Fast Track",
"passengerSequenceNumber": "ABC123",
"securityScreening": "TSA PreCheck",
"underName": {
"@type": "Person",
"name": "Eva Green"
},
"reservationFor": {
"@type": "Flight",
"flightNumber": "UA110",
"provider": {
"@type": "Airline",
"name": "Continental",
"iataCode": "CO",
"boardingPolicy": "http://schema.org/ZoneBoardingPolicy"
},
"seller": {
"@type": "Airline",
"name": "United",
"iataCode": "UA"
},
"departureAirport": {
"@type": "Airport",
"name": "San Francisco Airport",
"iataCode": "SFO"
},
"departureTime": "2017-03-04T20:15:00-08:00",
"arrivalAirport": {
"@type": "Airport",
"name": "John F. Kennedy International Airport",
"iataCode": "JFK"
},
"arrivalTime": "2017-03-05T06:30:00-05:00"
}
}
Loading