Commits · 257dabb64385756019940499798f43ae98c1c602 · MAS / SDT

13 Mar, 2019 2 commits

Merge branch 'RDM-2019-0010-SDT_4_0_–_Align_types_of_names_and_identifiers'... · 257dabb6

ankraft authored Mar 13, 2019

Merge branch 'RDM-2019-0010-SDT_4_0_–_Align_types_of_names_and_identifiers' into WI-0081-Smart_Device_Template_4_0

# Conflicts:
#	SDT/schema4.0/docs/SDT_UML.uxf
#	SDT/schema4.0/docs/images/SDT_UML_Basic_Elements.png

257dabb6

Prepared merge · 0d8616ee
ankraft authored Mar 13, 2019

0d8616ee

07 Mar, 2019 4 commits
- Merge branch 'RDM-2019-0009-SDT_4_0_–_Align_spelling_of_import' into... · 2531ce86
  ankraft authored Mar 07, 2019
```
Merge branch 'RDM-2019-0009-SDT_4_0_–_Align_spelling_of_import' into WI-0081-Smart_Device_Template_4_0

# Conflicts:
#	SDT/schema4.0/docs/images/SDT_UML_Basic_Elements.png
```
  2531ce86
- Prepared merge · 55e29e66
  ankraft authored Mar 07, 2019
  
  55e29e66
- Merge branch 'RDM-2019-0008-SDT_4_0_-_Changes_to_Data_Points_and_Actions' into... · 14a22fb3
  ankraft authored Mar 07, 2019
```
Merge branch 'RDM-2019-0008-SDT_4_0_-_Changes_to_Data_Points_and_Actions' into WI-0081-Smart_Device_Template_4_0
```
  14a22fb3
- Minor position arrangement. · ff24a3aa
  ankraft authored Mar 07, 2019
  
  ff24a3aa
01 Feb, 2019 1 commit
- Changed all names and identiers to (XSD:)Name type. · da51e62d
  ankraft authored Feb 01, 2019
  
  da51e62d
31 Jan, 2019 1 commit
- Changed "import" element from lower to upper camel case. · 6e155138
  ankraft authored Jan 31, 2019
  
  6e155138
28 Jan, 2019 2 commits
- New UML image · c2865fd4
  ankraft authored Jan 28, 2019
  
  c2865fd4
- Added "default" to Arg and DataPoint, and "optional" to Arg. · 74250375
  ankraft authored Jan 28, 2019
  
  74250375
17 Jan, 2019 12 commits
- Aligned multiplicity syntax with TS-0001 style. · b0394a28
  ankraft authored Jan 17, 2019
  
  b0394a28
- Merge branch... · dd8d18d7
  ankraft authored Jan 17, 2019
```
Merge branch 'MAS-2018-0161-SDT_4_0_-_Support_for_excluding_certain_components_when_inheriting' into WI-0081-Smart_Device_Template_4_0
```
  dd8d18d7
- Merged changes from WI branch · c6a6aaf2
  ankraft authored Jan 17, 2019
  
  c6a6aaf2
- Merge branch 'MAS-2018-0158-SDT_4_0_–_Removing_BasicType_enum' into... · 6081870c
  ankraft authored Jan 17, 2019
```
Merge branch 'MAS-2018-0158-SDT_4_0_–_Removing_BasicType_enum' into WI-0081-Smart_Device_Template_4_0
```
  6081870c
- Merged changed from WI branch · 82ae354f
  ankraft authored Jan 17, 2019
  
  82ae354f
- Merge branch... · 072dd79c
  ankraft authored Jan 17, 2019
```
Merge branch 'MAS-2018-0141-SDT_4_0_–_Adding_support_for_defining_and_referencing_data_types' into WI-0081-Smart_Device_Template_4_0
```
  072dd79c
- Merged changes from WI branch · f50290ca
  ankraft authored Jan 17, 2019
  
  f50290ca
- Merge branch 'MAS-2018-0140-SDT_4_0_–_Adding_support_for_semantic_references'... · 30c5d0ef
  ankraft authored Jan 17, 2019
```
Merge branch 'MAS-2018-0140-SDT_4_0_–_Adding_support_for_semantic_references' into WI-0081-Smart_Device_Template_4_0
```
  30c5d0ef
- Merged previous changes · 28110418
  ankraft authored Jan 17, 2019
  
  28110418
- Merge branch... · c2cd7a6a
  ankraft authored Jan 17, 2019
```
Merge branch 'MAS-2018-0139-SDT_4_0_–_Adding_support_for_enumeration_types_and_values' into WI-0081-Smart_Device_Template_4_0
```
  c2cd7a6a
- Included changes from WI branch · 43c1c2cf
  ankraft authored Jan 17, 2019
  
  43c1c2cf
- Merge branch 'MAS-2018-0135-SDT_4_0_-_Introducing_void_data_type_to_BasicType'... · 452073aa
  ankraft authored Jan 17, 2019
```
Merge branch 'MAS-2018-0135-SDT_4_0_-_Introducing_void_data_type_to_BasicType' into WI-0081-Smart_Device_Template_4_0
```
  452073aa
06 Dec, 2018 1 commit
- Extended the <extend> element · 0f72aaf7
  ankraft authored Dec 06, 2018
  
  0f72aaf7
03 Dec, 2018 1 commit
- Removed BasicType : enum · d7bcd0f5
  ankraft authored Dec 03, 2018
  
  d7bcd0f5
21 Nov, 2018 1 commit
- Added support for defining domain specific data types and the posibility to reference them. · f7723370
  ankraft authored Nov 21, 2018
  
  f7723370
20 Nov, 2018 2 commits
- Added semantic references in UML diagram · 648e5e0a
  ankraft authored Nov 20, 2018
  
  648e5e0a
- Added EnumType TypeChoice to DataTypes. · a140b93f
  ankraft authored Nov 20, 2018
  
  a140b93f
12 Nov, 2018 1 commit
- Added "void" data type to BasicType. · 45762efe
  ankraft authored Nov 12, 2018
  
  45762efe
19 Jul, 2018 5 commits
- Merge branch 'MAS-2018-0084-SDT4_JSON' into 'WI-0081-Smart_Device_Template_4_0' · dfa909c2
  Andreas Kraft authored Jul 19, 2018
```
Mas 2018 0084 sdt4 json

As agreed during TP#36

See merge request !7
```
  dfa909c2
- Merge branch 'MAS-2018-0082-Introducing_Product' into WI-0081-Smart_Device_Template_4_0 · 78206d85
  ankraft authored Jul 19, 2018
  
  78206d85
- Merge branch 'MAS-2018-0081-SDT4_change_log' into WI-0081-Smart_Device_Template_4_0 · 9a442e33
  ankraft authored Jul 19, 2018
  
  9a442e33
- update the 'Note' of name conflict note for Product · 291f6adb
  Yongjing Zhang authored Jul 19, 2018
  
  291f6adb
- UPDATE the Product.png · d3b9bbaa
  Yongjing Zhang authored Jul 19, 2018
  
  d3b9bbaa
18 Jul, 2018 7 commits
- update the relationship between Product and DeviceClass · 3c32c91b
  Yongjing Zhang authored Jul 18, 2018
  
  3c32c91b
- update the relationship between Product and DeviceClass · 678ffb68
  Yongjing Zhang authored Jul 18, 2018
  
  678ffb68
- Merge branch 'MAS-2018-0085-SDT4_removing_Module' into 'WI-0081-Smart_Device_Template_4_0' · 1fae9626
  Andreas Kraft authored Jul 18, 2018
```
add editor's note as reminder to update TS-0023

as agreed during TP#36

See merge request !4
```
  1fae9626
- add editor's note as reminder to update TS-0023 · 4cbeea71
  Yongjing Zhang authored Jul 18, 2018
  
  4cbeea71
- Merge branch 'MAS-2018-0085-SDT4_removing_Module' into 'WI-0081-Smart_Device_Template_4_0' · 139825c3
  Andreas Kraft authored Jul 18, 2018
```
Mas 2018 0085 sdt4 removing module

As agreed during TP#36

See merge request !3
```
  139825c3
- fix some typos · 0b05f890
  Yongjing Zhang authored Jul 18, 2018
  
  0b05f890
- fix char-set symbols in readme.md · 66adf790
  Yongjing Zhang authored Jul 18, 2018
  
  66adf790