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.

Sign up for GitHub

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

Jump to bottom

More designer fixes #3169

Merged
merged 70 commits into from
Aug 28, 2019
Merged

More designer fixes #3169

Changes from 1 commit
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
5db2c2a
Inject TS source from js/template-engine
dclaux May 29, 2019
ddb2739
Post build changes
dclaux May 29, 2019
47531f1
Cleanup
dclaux May 29, 2019
05e85dd
Fix compilation issues (WIP)
dclaux May 31, 2019
822b1ad
Merge branch 'master' into clean-template-engine-branch
dclaux May 31, 2019
0f0135d
Merge branch 'master' into clean-template-engine-branch
dclaux May 31, 2019
325dfaf
Fixes packaging problems
dclaux Jun 5, 2019
39159de
Merge branch 'master' into clean-template-engine-branch
dclaux Jun 5, 2019
eee0ed7
Update README
dclaux Jun 5, 2019
a75f999
Publish
dclaux Jun 5, 2019
e7c52c6
adaptivecards-data --> adaptivecards-templating
dclaux Jun 6, 2019
b308d72
Update README for adaptivecards-templating
dclaux Jun 7, 2019
4c92da9
Fix a couple typos in README
dclaux Jun 7, 2019
28a6938
Merge branch 'master' into clean-template-engine-branch
dclaux Jun 7, 2019
229aec8
Significant designer code simplification (WIP)
dclaux Jun 7, 2019
26da92c
More designer code simplification
dclaux Jun 10, 2019
81bb71d
Finalize designer code simplification
dclaux Jun 11, 2019
b63a4ad
Merge branch 'master' into clean-template-engine-branch
dclaux Jun 11, 2019
f78d1ab
Fix minHeight serialization regression
dclaux Jun 11, 2019
7e533de
[Designer] Basic versioning support
dclaux Jun 13, 2019
6f83770
Merge branch 'master' into clean-template-engine-branch
dclaux Jun 13, 2019
1193c22
[JS] Hotfix bleed regression in ColumnSet
dclaux Jun 18, 2019
dd80654
cleaning up sample payloads, fixing some site bugs
matthidinger Jun 19, 2019
eab64e7
[Designer] Hide more preview features
dclaux Jun 19, 2019
5563e49
Merge branch 'master' into clean-template-engine-branch
dclaux Jun 19, 2019
2355ee1
Update package-lock.json
matthidinger Jun 19, 2019
3bbede2
Publish
matthidinger Jun 19, 2019
ce49897
dts not working, revert tnhis commit
matthidinger Jun 23, 2019
7d315ce
Merge branch 'master' into clean-template-engine-branch
dclaux Jun 24, 2019
cd454de
Merge branch 'master' into clean-template-engine-branch
dclaux Jun 25, 2019
30792ab
Merge branch 'master' into clean-template-engine-branch
dclaux Jun 26, 2019
6e6f9fd
Add comment
dclaux Jun 26, 2019
9eb5e80
Merge branch 'master' into clean-template-engine-branch
dclaux Jun 26, 2019
902db4c
Update example.html
dclaux Jun 26, 2019
c65ad6d
Merge branch 'clean-template-engine-branch' of https://github.com/mic…
dclaux Jun 26, 2019
f3e626f
Turn off preview features
dclaux Jun 26, 2019
5fdb420
Comment update
dclaux Jun 26, 2019
e804e6b
Merge branch 'master' into mahiding/sitefix
matthidinger Jun 28, 2019
e32cc7c
site fixes, sample updates, and designer package fixes
matthidinger Jun 29, 2019
d93588e
remove unused files
matthidinger Jun 29, 2019
9de7dc6
fix script
matthidinger Jul 1, 2019
8642c33
Merge branch 'clean-template-engine-branch' of https://github.com/Mic…
matthidinger Jul 2, 2019
72f6e05
Merge branch 'master' into clean-template-engine-branch
matthidinger Jul 2, 2019
8e6782a
Merge branch 'mahiding/sitefix' into clean-template-engine-branch
matthidinger Jul 2, 2019
b7248f4
updating packages and fixing a merge issue
matthidinger Jul 2, 2019
27affd0
add helper test scripts
matthidinger Jul 2, 2019
dd31acf
Code review fixes into templating branch
shalinijoshi19 Jul 3, 2019
99f96f2
readme fixes and package fix
matthidinger Jul 3, 2019
bf19474
Merge branch 'master' into clean-template-engine-branch
dclaux Jul 5, 2019
f65c12d
Resolve merge from master problems
dclaux Jul 5, 2019
2be549d
Merge branch 'master' into clean-template-engine-branch
dclaux Jul 10, 2019
d522c6d
Fix double "Maximum value" mistake
dclaux Jul 10, 2019
506f138
[Designer] Fix inlineAction and selectAction
dclaux Jul 11, 2019
b32e883
Fix Input.Number min/max serialized as strings
dclaux Jul 12, 2019
fe5718d
Merge branch 'master' into clean-template-engine-branch
dclaux Jul 12, 2019
2bdd27a
Merge branch 'master' into clean-template-engine-branch
dclaux Jul 12, 2019
31b0751
Remove duplicate valueOn in designer
dclaux Jul 12, 2019
9cf465c
Merge branch 'master' into clean-template-engine-branch
dclaux Aug 12, 2019
07e1747
Merge branch 'master' into clean-template-engine-branch
dclaux Aug 12, 2019
8dcf498
Designer bug fixes
dclaux Aug 14, 2019
4c4ec14
Merge branch 'master' into clean-template-engine-branch
dclaux Aug 15, 2019
dc2b22c
Fix incorrect action button size in IE11
dclaux Aug 15, 2019
fb4e8e0
Merge branch 'clean-template-engine-branch' of https://github.com/mic…
dclaux Aug 15, 2019
0c95658
Merge branch 'master' into clean-template-engine-branch
dclaux Aug 26, 2019
f72a586
Merge branch 'master' into clean-template-engine-branch
dclaux Aug 26, 2019
85ba32e
Merge branch 'master' into clean-template-engine-branch
dclaux Aug 26, 2019
b13cdf4
Merge branch 'master' into clean-template-engine-branch
dclaux Aug 27, 2019
fde283b
Merge branch 'master' into clean-template-engine-branch
dclaux Aug 28, 2019
6404f81
Address code review comments
dclaux Aug 28, 2019
b35bc51
Merge branch 'master' into clean-template-engine-branch
dclaux Aug 28, 2019
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
Next Next commit
Merge branch 'master' into clean-template-engine-branch
  • Loading branch information
@dclaux
dclaux committed Aug 26, 2019
commit f72a586e97672b5e23eb78c7858570645ab6d52b

This merge commit was added into this branch cleanly.

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