Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
ModuloPersonalCliente
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
3
Issues
3
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
SistemaGestionAdministrativa
ModuloPersonalCliente
Commits
bc9b5e49
Commit
bc9b5e49
authored
Jul 06, 2016
by
D’jalmar Gutierrez Titirico
🚲
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'iss5955-corregir-bower.json' into desarrollo
parents
88bfd6a3
fe090399
Pipeline
#23
running with stage
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
40 deletions
+3
-40
bower.json
bower.json
+3
-3
client/app/migracionMoodle/migracionMoodle.service.spec.js
client/app/migracionMoodle/migracionMoodle.service.spec.js
+0
-18
client/index.html
client/index.html
+0
-19
No files found.
bower.json
View file @
bc9b5e49
...
...
@@ -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/app/migracionMoodle/migracionMoodle.service.spec.js
deleted
100644 → 0
View file @
88bfd6a3
'
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
;
});
});
client/index.html
View file @
bc9b5e49
...
...
@@ -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
Markdown
is supported
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