Commit 4078161b authored 9 years ago by Maxime

Merge

parents 2c64a17b 6ef31d11

No related branches found

No related tags found

No related merge requests found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

org.eclipse.om2m/org.eclipse.om2m.webapp.resourcesbrowser/src/main/resources/webapps/cima/ManualConfiguration.html 14 additions, 9 deletions

.../src/main/resources/webapps/cima/ManualConfiguration.html
org.eclipse.om2m/org.eclipse.om2m.webapp.resourcesbrowser/src/main/resources/webapps/cima/css/loading.css 9 additions, 0 deletions

...esbrowser/src/main/resources/webapps/cima/css/loading.css
org.eclipse.om2m/org.eclipse.om2m.webapp.resourcesbrowser/src/main/resources/webapps/cima/js/app.js 56 additions, 8 deletions

...esourcesbrowser/src/main/resources/webapps/cima/js/app.js
org.eclipse.om2m/org.eclipse.om2m.webapp.resourcesbrowser/src/main/resources/webapps/cima/js/controller/auth.js 27 additions, 0 deletions

...ser/src/main/resources/webapps/cima/js/controller/auth.js
org.eclipse.om2m/org.eclipse.om2m.webapp.resourcesbrowser/src/main/resources/webapps/cima/js/controller/device.js 76 additions, 67 deletions

...r/src/main/resources/webapps/cima/js/controller/device.js
org.eclipse.om2m/org.eclipse.om2m.webapp.resourcesbrowser/src/main/resources/webapps/cima/js/controller/home.js 53 additions, 11 deletions

...ser/src/main/resources/webapps/cima/js/controller/home.js
org.eclipse.om2m/org.eclipse.om2m.webapp.resourcesbrowser/src/main/resources/webapps/cima/js/directive/search.js 12 additions, 0 deletions

...er/src/main/resources/webapps/cima/js/directive/search.js
org.eclipse.om2m/org.eclipse.om2m.webapp.resourcesbrowser/src/main/resources/webapps/cima/js/service/auth.js 26 additions, 0 deletions

...rowser/src/main/resources/webapps/cima/js/service/auth.js
org.eclipse.om2m/org.eclipse.om2m.webapp.resourcesbrowser/src/main/resources/webapps/cima/js/service/device.js 50 additions, 65 deletions

...wser/src/main/resources/webapps/cima/js/service/device.js
org.eclipse.om2m/org.eclipse.om2m.webapp.resourcesbrowser/src/main/resources/webapps/cima/js/url/url.js 7 additions, 6 deletions

...rcesbrowser/src/main/resources/webapps/cima/js/url/url.js
org.eclipse.om2m/org.eclipse.om2m.webapp.resourcesbrowser/src/main/resources/webapps/cima/json/capabilities.json 81 additions, 6 deletions

...er/src/main/resources/webapps/cima/json/capabilities.json
org.eclipse.om2m/org.eclipse.om2m.webapp.resourcesbrowser/src/main/resources/webapps/cima/json/devices.json 26 additions, 1 deletion

...browser/src/main/resources/webapps/cima/json/devices.json
org.eclipse.om2m/org.eclipse.om2m.webapp.resourcesbrowser/src/main/resources/webapps/cima/json/goodjson.json 420 additions, 0 deletions

...rowser/src/main/resources/webapps/cima/json/goodjson.json
org.eclipse.om2m/org.eclipse.om2m.webapp.resourcesbrowser/src/main/resources/webapps/cima/json/newformatdevices.json 11 additions, 11 deletions

...rc/main/resources/webapps/cima/json/newformatdevices.json
org.eclipse.om2m/org.eclipse.om2m.webapp.resourcesbrowser/src/main/resources/webapps/cima/lib/angular-jsonld.js 468 additions, 0 deletions

...ser/src/main/resources/webapps/cima/lib/angular-jsonld.js
org.eclipse.om2m/org.eclipse.om2m.webapp.resourcesbrowser/src/main/resources/webapps/cima/lib/jsonld.js 4050 additions, 2166 deletions

...rcesbrowser/src/main/resources/webapps/cima/lib/jsonld.js
org.eclipse.om2m/org.eclipse.om2m.webapp.resourcesbrowser/src/main/resources/webapps/cima/lib/jsonld11.js 6206 additions, 0 deletions

...esbrowser/src/main/resources/webapps/cima/lib/jsonld11.js
org.eclipse.om2m/org.eclipse.om2m.webapp.resourcesbrowser/src/main/resources/webapps/cima/lib/lodash-compat.min.js 102 additions, 0 deletions

.../src/main/resources/webapps/cima/lib/lodash-compat.min.js
org.eclipse.om2m/org.eclipse.om2m.webapp.resourcesbrowser/src/main/resources/webapps/cima/lib/ngstorage.js 221 additions, 0 deletions

...sbrowser/src/main/resources/webapps/cima/lib/ngstorage.js
org.eclipse.om2m/org.eclipse.om2m.webapp.resourcesbrowser/src/main/resources/webapps/cima/lib/restangular.js 1355 additions, 0 deletions

...rowser/src/main/resources/webapps/cima/lib/restangular.js

with 13270 additions and 2350 deletions

Please register or to comment