Merge branch 'pre_master' into LucasRama
Showing
- UyTube_estacion_de_trabajo/librerias/UyTube_logica.jar 0 additions, 0 deletionsUyTube_estacion_de_trabajo/librerias/UyTube_logica.jar
- UyTube_logica/.jacocoverage/project.json 6 additions, 0 deletionsUyTube_logica/.jacocoverage/project.json
- UyTube_logica/nbproject/project.properties 4 additions, 4 deletionsUyTube_logica/nbproject/project.properties
- UyTube_logica/src/Logica/Clases/Video.java 16 additions, 26 deletionsUyTube_logica/src/Logica/Clases/Video.java
- UyTube_logica/src/Logica/Controladores/CUsuario.java 5 additions, 2 deletionsUyTube_logica/src/Logica/Controladores/CUsuario.java
- UyTube_logica/src/Logica/DatosDePrueba.java 5 additions, 18 deletionsUyTube_logica/src/Logica/DatosDePrueba.java
- UyTube_web/libreria/UyTube_logica.jar 0 additions, 0 deletionsUyTube_web/libreria/UyTube_logica.jar
- UyTube_web/src/java/com/uytube/ConsultaVideo.java 86 additions, 11 deletionsUyTube_web/src/java/com/uytube/ConsultaVideo.java
- UyTube_web/web/AltaVideo.jsp 7 additions, 5 deletionsUyTube_web/web/AltaVideo.jsp
- UyTube_web/web/ConsultaUsuario.jsp 2 additions, 2 deletionsUyTube_web/web/ConsultaUsuario.jsp
- UyTube_web/web/ConsultaVideo.jsp 98 additions, 56 deletionsUyTube_web/web/ConsultaVideo.jsp
- UyTube_web/web/ConsultarListaReproduccion.jsp 13 additions, 21 deletionsUyTube_web/web/ConsultarListaReproduccion.jsp
- UyTube_web/web/css/.sass-cache/c5945467622b764634fe3b9fcf530060a0a026da/_alturas.sassc 0 additions, 0 deletions...e/c5945467622b764634fe3b9fcf530060a0a026da/_alturas.sassc
- UyTube_web/web/css/.sass-cache/c5945467622b764634fe3b9fcf530060a0a026da/_colores.sassc 0 additions, 0 deletions...e/c5945467622b764634fe3b9fcf530060a0a026da/_colores.sassc
- UyTube_web/web/css/.sass-cache/c5945467622b764634fe3b9fcf530060a0a026da/header.sassc 0 additions, 0 deletions...che/c5945467622b764634fe3b9fcf530060a0a026da/header.sassc
- UyTube_web/web/css/.sass-cache/c5945467622b764634fe3b9fcf530060a0a026da/menu.sassc 0 additions, 0 deletions...cache/c5945467622b764634fe3b9fcf530060a0a026da/menu.sassc
- UyTube_web/web/css/_alturas.sass 2 additions, 1 deletionUyTube_web/web/css/_alturas.sass
- UyTube_web/web/css/_colores.sass 0 additions, 0 deletionsUyTube_web/web/css/_colores.sass
- UyTube_web/web/css/body.sass 0 additions, 0 deletionsUyTube_web/web/css/body.sass
- UyTube_web/web/css/contenido-alta-usuario.css 33 additions, 320 deletionsUyTube_web/web/css/contenido-alta-usuario.css
Loading
Please register or sign in to comment