Merge branch 'development' of...
Merge branch 'development' of https://github.com/University-of-Potsdam-MM/contactJS into development Conflicts: js/modules/attribute/attributeType.js
No related branches found
No related tags found
Showing
- build/contactJS.js 7 additions, 13 deletionsbuild/contactJS.js
- dist/contactJS.js 1026 additions, 1341 deletionsdist/contactJS.js
- examples/GeoLocationWidget.js 57 additions, 168 deletionsexamples/GeoLocationWidget.js
- examples/addressInterpreter.js 39 additions, 143 deletionsexamples/addressInterpreter.js
- js/config.js 2 additions, 4 deletionsjs/config.js
- js/modules/abstractList.js 0 additions, 15 deletionsjs/modules/abstractList.js
- js/modules/aggregator/aggregator.js 48 additions, 67 deletionsjs/modules/aggregator/aggregator.js
- js/modules/aggregator/interpretation.js 4 additions, 4 deletionsjs/modules/aggregator/interpretation.js
- js/modules/aggregator/storage/storage.js 33 additions, 27 deletionsjs/modules/aggregator/storage/storage.js
- js/modules/attribute/attribute.js 386 additions, 0 deletionsjs/modules/attribute/attribute.js
- js/modules/attribute/attributeList.js 324 additions, 0 deletionsjs/modules/attribute/attributeList.js
- js/modules/attribute/attributeTypeList.js 0 additions, 181 deletionsjs/modules/attribute/attributeTypeList.js
- js/modules/attribute/attributeValue.js 0 additions, 179 deletionsjs/modules/attribute/attributeValue.js
- js/modules/attribute/attributeValueList.js 0 additions, 240 deletionsjs/modules/attribute/attributeValueList.js
- js/modules/attribute/parameterList.js 1 addition, 2 deletionsjs/modules/attribute/parameterList.js
- js/modules/descriptions/interpreterDescription.js 5 additions, 5 deletionsjs/modules/descriptions/interpreterDescription.js
- js/modules/descriptions/widgetDescription.js 8 additions, 7 deletionsjs/modules/descriptions/widgetDescription.js
- js/modules/discoverer/discoverer.js 11 additions, 11 deletionsjs/modules/discoverer/discoverer.js
- js/modules/interpreter/interpreter.js 76 additions, 116 deletionsjs/modules/interpreter/interpreter.js
- js/modules/interpreter/interpreterResult.js 2 additions, 2 deletionsjs/modules/interpreter/interpreterResult.js
Loading
Please register or sign in to comment