Merge branch 'feature/integration-graph-2d-3d' of...
Merge branch 'feature/integration-graph-2d-3d' of https://gitlab.fing.edu.uy/matefun/Frontend into feature/integration-graph-2d-3d # Conflicts: # Frontend Angular 4/package.json # Frontend Angular 4/src/app/layout/plotter/graph2D/graph2D.component.ts
Showing
- Frontend Angular 4/npm-debug.log 10690 additions, 0 deletionsFrontend Angular 4/npm-debug.log
- Frontend Angular 4/package-lock.json 2 additions, 2 deletionsFrontend Angular 4/package-lock.json
- Frontend Angular 4/package.json 1 addition, 1 deletionFrontend Angular 4/package.json
- Frontend Angular 4/src/app/layout/matefun/matefun.module.ts 8 additions, 1 deletionFrontend Angular 4/src/app/layout/matefun/matefun.module.ts
- Frontend Angular 4/src/app/layout/plotter/graph2D/graph2D.component.html 162 additions, 11 deletions...r 4/src/app/layout/plotter/graph2D/graph2D.component.html
- Frontend Angular 4/src/app/layout/plotter/graph2D/graph2D.component.scss 79 additions, 0 deletions...r 4/src/app/layout/plotter/graph2D/graph2D.component.scss
- Frontend Angular 4/src/app/layout/plotter/graph2D/graph2D.component.ts 203 additions, 75 deletions...lar 4/src/app/layout/plotter/graph2D/graph2D.component.ts
- Frontend Angular 4/src/app/layout/plotter/graph2D/graph2D.helper.ts 10 additions, 1 deletion...ngular 4/src/app/layout/plotter/graph2D/graph2D.helper.ts
- Frontend Angular 4/src/app/layout/plotter/graph2D/graph2D.module.ts 1 addition, 1 deletion...ngular 4/src/app/layout/plotter/graph2D/graph2D.module.ts
- Frontend Angular 4/src/app/layout/plotter/graph3D/graph3D.module.ts 1 addition, 3 deletions...ngular 4/src/app/layout/plotter/graph3D/graph3D.module.ts
Loading
Please register or sign in to comment