Merge branch 'feature/3DComponentInitialization' into feature/integration-graph-2d-3d
# Conflicts: # Frontend Angular 4/src/app/app.module.ts # Frontend Angular 4/src/app/shared/config.ts
Showing
- Frontend Angular 4/src/app/app.module.ts 2 additions, 2 deletionsFrontend Angular 4/src/app/app.module.ts
- Frontend Angular 4/src/app/layout/layout.module.ts 1 addition, 1 deletionFrontend Angular 4/src/app/layout/layout.module.ts
- Frontend Angular 4/src/app/layout/matefun/codemirror/matefun-mode-EN.js 258 additions, 0 deletions...ar 4/src/app/layout/matefun/codemirror/matefun-mode-EN.js
- Frontend Angular 4/src/app/layout/matefun/codemirror/matefun-mode-ES.js 2 additions, 2 deletions...ar 4/src/app/layout/matefun/codemirror/matefun-mode-ES.js
- Frontend Angular 4/src/app/layout/matefun/matefun.component.ts 3 additions, 2 deletions...end Angular 4/src/app/layout/matefun/matefun.component.ts
- Frontend Angular 4/src/app/layout/plotter/graph3D/graph3D.component.html 179 additions, 67 deletions...r 4/src/app/layout/plotter/graph3D/graph3D.component.html
- Frontend Angular 4/src/app/layout/plotter/graph3D/graph3D.component.scss 23 additions, 1 deletion...r 4/src/app/layout/plotter/graph3D/graph3D.component.scss
- Frontend Angular 4/src/app/layout/plotter/graph3D/graph3D.component.ts 79 additions, 19 deletions...lar 4/src/app/layout/plotter/graph3D/graph3D.component.ts
- Frontend Angular 4/src/app/layout/plotter/graph3D/graph3D.helper.ts 52 additions, 5 deletions...ngular 4/src/app/layout/plotter/graph3D/graph3D.helper.ts
- Frontend Angular 4/src/app/layout/plotter/graph3D/graph3D.module.ts 4 additions, 1 deletion...ngular 4/src/app/layout/plotter/graph3D/graph3D.module.ts
- Frontend Angular 4/src/app/shared/config.ts 9 additions, 6 deletionsFrontend Angular 4/src/app/shared/config.ts
- Frontend Angular 4/src/app/shared/config_BACKUP_716.ts 28 additions, 0 deletionsFrontend Angular 4/src/app/shared/config_BACKUP_716.ts
- Frontend Angular 4/src/app/shared/utils/closePopoverDirective.ts 34 additions, 0 deletions...d Angular 4/src/app/shared/utils/closePopoverDirective.ts
Loading
Please register or sign in to comment