Commit bc9b5e49 authored by D’jalmar Gutierrez Titirico's avatar D’jalmar Gutierrez Titirico 🚲

Merge branch 'iss5955-corregir-bower.json' into desarrollo

parents 88bfd6a3 fe090399
Pipeline #23 running with stage
......@@ -2,7 +2,7 @@
"name": "modulo-personal",
"version": "0.0.0",
"dependencies": {
"angular": "1.4.11",
"angular": "1.4.12",
"json3": "~3.3.1",
"es5-shim": "~3.0.1",
"bootstrap-sass-official": "~3.1.1",
......@@ -15,8 +15,8 @@
"lodash": "~2.4.1",
"angular-ui-router": "~0.2.18",
"angular-validation-match": "~1.4.1",
"angular-animate": "1.4.11",
"ng-tags-input": "^3.1.1",
"angular-animate": "~1.4.11",
"ng-tags-input": "3.1.1",
"ui-router-extras": "^0.1.2",
"angular-i18n": "^1.5.6",
"angular-ui-tree": "^2.16.0"
......
'use strict';
describe('Service: migracionMoodle', function () {
// load the service's module
beforeEach(module('moduloPersonalApp'));
// instantiate service
var migracionMoodle;
beforeEach(inject(function (_migracionMoodle_) {
migracionMoodle = _migracionMoodle_;
}));
it('should do something', function () {
expect(!!migracionMoodle).to.be.true;
});
});
......@@ -75,13 +75,9 @@
<script src="components/autenticacion/autenticacion.module.js"></script>
<script src="components/modal/modal.module.js"></script>
<script src="components/util/util.module.js"></script>
<<<<<<< HEAD
<script src="app/migracionMoodle/migracionMoodle.js"></script>
<script src="app/cargos/cargos.js"></script>
<script src="app/cargos/cargos.service.js"></script>
=======
<script src="app/migracionMoodle/migracionMoodle.curso.controller.js"></script>
>>>>>>> iss5797-Crear-la-vista-para-la-migracion-de-datos-del-moodle
<script src="app/cargos/editar/cargos.editar.controller.js"></script>
<script src="app/cargos/modals/cargos.crear.modal.controller.js"></script>
<script src="app/cargos/modals/cargos.editar.modal.controller.js"></script>
......@@ -127,27 +123,12 @@
<script src="app/evaluacionesCargosEtapas/evaluacionesCargosEtapas.controller.js"></script>
<script src="app/evaluacionesCargosEtapas/evaluacionesCargosEtapas.js"></script>
<script src="app/evaluacionesCargosEtapas/evaluacionesCargosEtapas.service.js"></script>
<<<<<<< HEAD
<script src="app/main/main.controller.js"></script>
<script src="app/main/main.js"></script>
<script src="app/migracionMoodle/migracionMoodle.controller.js"></script>
<script src="app/migracionMoodle/migracionMoodle.curso.controller.js"></script>
<script src="app/migracionMoodle/migracionMoodle.examen.controller.js"></script>
<script src="app/calificaciones/calificaciones.service.js"></script>
=======
<script src="app/gruposConvocatoria/editar/gruposConvocatoria.editar.controller.js"></script>
<script src="app/gruposConvocatoria/gruposConvocatoria.controller.js"></script>
<script src="app/gruposConvocatoria/gruposConvocatoria.js"></script>
<script src="app/gruposConvocatoria/gruposConvocatoria.service.js"></script>
<script src="app/gruposConvocatoria/modals/gruposConvocatoria.crear.modal.controller.js"></script>
<script src="app/gruposConvocatoria/modals/gruposConvocatoria.editar.modal.controller.js"></script>
<script src="app/main/main.controller.js"></script>
<script src="app/main/main.js"></script>
<script src="app/migracionMoodle/migracionMoodle.controller.js"></script>
<script src="app/cargos/cargos.controller.js"></script>
<script src="app/migracionMoodle/migracionMoodle.examen.controller.js"></script>
<script src="app/migracionMoodle/migracionMoodle.js"></script>
>>>>>>> iss5797-Crear-la-vista-para-la-migracion-de-datos-del-moodle
<script src="app/migracionMoodle/migracionMoodle.service.js"></script>
<script src="app/oficinas/editar/oficinas.editar.controller.js"></script>
<script src="app/oficinas/modals/oficina.entidad.crear.modal.controller.js"></script>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment