Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
SistemaGestionAdministrativa
ModuloPersonalCliente
Commits
71e3f381
Commit
71e3f381
authored
Jul 04, 2016
by
D’jalmar Gutierrez Titirico
🚲
Browse files
se modifico la version de angular a 1.4.12
parent
88bfd6a3
Pipeline
#21
failed with stage
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
bower.json
View file @
71e3f381
...
...
@@ -2,7 +2,7 @@
"name"
:
"modulo-personal"
,
"version"
:
"0.0.0"
,
"dependencies"
:
{
"angular"
:
"1.4.1
1
"
,
"angular"
:
"1.4.1
2
"
,
"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"
...
...
client/index.html
View file @
71e3f381
...
...
@@ -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>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment