Merge branch 'development' of...
Merge branch 'development' of https://github.com/University-of-Potsdam-MM/contactJS into development Conflicts: js/modules/discoverer/discoverer.js
No related branches found
No related tags found
Showing
- build/contactJS.js 1 addition, 6 deletionsbuild/contactJS.js
- dist/contactJS.js 162 additions, 667 deletionsdist/contactJS.js
- examples/GeoLocationWidget.js 7 additions, 7 deletionsexamples/GeoLocationWidget.js
- js/config.js 1 addition, 3 deletionsjs/config.js
- js/modules/aggregator/aggregator.js 30 additions, 29 deletionsjs/modules/aggregator/aggregator.js
- js/modules/descriptions/interpreterDescription.js 0 additions, 106 deletionsjs/modules/descriptions/interpreterDescription.js
- js/modules/descriptions/widgetDescription.js 0 additions, 229 deletionsjs/modules/descriptions/widgetDescription.js
- js/modules/discoverer/discoverer.js 63 additions, 200 deletionsjs/modules/discoverer/discoverer.js
- js/modules/interpreter/interpreter.js 6 additions, 4 deletionsjs/modules/interpreter/interpreter.js
- js/modules/widget/widget.js 64 additions, 98 deletionsjs/modules/widget/widget.js
- qunitTest/aggregatorTest.js 4 additions, 4 deletionsqunitTest/aggregatorTest.js
- qunitTest/discovererTest.js 24 additions, 27 deletionsqunitTest/discovererTest.js
- qunitTest/interpret_AggregatorInterpreterTest.js 3 additions, 3 deletionsqunitTest/interpret_AggregatorInterpreterTest.js
- qunitTest/interpreterTest.js 0 additions, 9 deletionsqunitTest/interpreterTest.js
- qunitTest/widgetTest.js 3 additions, 3 deletionsqunitTest/widgetTest.js
Loading
Please register or sign in to comment