Marcelo Puebla / foca-botonera-principal | GitLab

30 Sep, 2019

5 commits

196de6fc8 Merge branch 'develop' of git.focasoftware.com:npm/foca-botonera-principal ... Browse Code »
```
# Conflicts:
#	src/views/foca-botonera-principal.html
```
Marcelo Puebla
2019-09-30 16:46:19 -0300
93d197c98 Merge branch 'master' into 'develop' ... Browse Code »
```
Master(benjamin)

See merge request !13
```
Marcelo Puebla
2019-09-30 16:30:33 -0300
38a34a953 correciones en identacion Browse Code »

Benjamin Rodriguez
2019-09-30 16:30:19 -0300
5a7851ca0 correciones en identacion Browse Code »

Benjamin Rodriguez
2019-09-30 16:28:27 -0300
f1caad73d cambio botonera tareas pausadas Browse Code »

Benjamin Rodriguez
2019-09-30 14:00:27 -0300

20 Sep, 2019

1 commit

c6b17148d Merge branch 'master' into 'develop' ... Browse Code »
```
Master(benjamin)

See merge request !12
```
Eric Fernandez
2019-09-20 10:47:17 -0300

19 Sep, 2019

1 commit

e86ad0a3c identacion corregida Browse Code »

Benjamin Rodriguez
2019-09-19 15:00:23 -0300

18 Sep, 2019

2 commits

f084967a8 agrego informacion al modal de info Browse Code »

Benjamin Rodriguez
2019-09-18 15:45:50 -0300
bf67f0746 Merge branch 'develop' of http://git.focasoftware.com/brodriguez/foca-botonera-principal Browse Code »

Benjamin Rodriguez
2019-09-18 11:15:10 -0300

30 Jul, 2019

1 commit

a799374e4 Alineada botonera principal. Browse Code »

Marcelo Puebla
2019-07-30 10:24:32 -0300

26 Jul, 2019

3 commits

608acb418 Merge branch 'master' into 'develop' ... Browse Code »
```
Master(mpuebla)

Este cambio no afecta a distribuidor.

See merge request !9
```
Eric Fernandez
2019-07-26 15:51:10 -0300
5b640ef46 Cambio clase de logo en botonera principal. Browse Code »

Marcelo Puebla
2019-07-26 15:38:27 -0300
1f37994f7 Agregado comando para refrescar. Browse Code »

Marcelo Puebla
2019-07-26 15:37:46 -0300

22 Jul, 2019

1 commit

a13b998b6 Agregado comando para refrescar. Browse Code »

Marcelo Puebla
2019-07-22 12:43:40 -0300

12 Jul, 2019

3 commits

abc54c2f3 Merge branch 'master' into 'develop' ... Browse Code »
```
Master(mpuebla)

See merge request !8
```
Eric Fernandez
2019-07-12 14:39:29 -0300
0bc0b0332 Merge branch 'develop' of git.focasoftware.com:npm/foca-botonera-principal ... Browse Code »
```
# Conflicts:
#	src/views/foca-botonera-principal.html
```
Marcelo Puebla
2019-07-12 11:37:10 -0300
9b3b26ff3 agregado directiva foca focus a botonera principal. Browse Code »

Marcelo Puebla
2019-07-12 11:31:17 -0300

13 May, 2019

1 commit

87308d050 Merge branch 'develop' into 'master' ... Browse Code »
```
Develop

See merge request !7
```
Eric Fernandez
2019-05-13 15:21:31 -0300

24 Apr, 2019

3 commits

ac72aa121 Merge branch 'master' into 'develop' ... Browse Code »
```
Master(efernandez)

See merge request !6
```
Eric Fernandez
2019-04-24 12:41:16 -0300
7c80f6f4f ng-show Browse Code »

Eric
2019-04-24 12:39:02 -0300
68a1ba330 btn mobile Browse Code »

Eric
2019-04-24 12:37:22 -0300

22 Apr, 2019

3 commits

846e49c55 Merge branch 'master' into 'develop' ... Browse Code »
```
Master(efernandez)

See merge request !5
```
Eric Fernandez
2019-04-22 15:23:55 -0300
933c1abfd no mostrar hoja ruta Browse Code »

Eric
2019-04-22 15:19:36 -0300
d50649e5c Merge branch 'develop' of git.focasoftware.com:npm/foca-botonera-principal Browse Code »

Marcelo Puebla
2019-04-22 11:05:22 -0300

18 Apr, 2019

2 commits

eae910d17 Merge branch 'master' into 'develop' ... Browse Code »
```
Master

See merge request !4
```
Eric Fernandez
2019-04-18 18:18:20 -0300
bf31ee8a8 Agregar mapa en el logo Browse Code »

Luigi
2019-04-18 17:42:47 -0300

04 Apr, 2019

2 commits

9c72c5f8a Merge remote-tracking branch 'origin/master' Browse Code »

Marcelo Puebla
2019-04-04 15:47:46 -0300
0a91d8be3 Ultimos cambios realizados por Jose. Browse Code »

Marcelo Puebla
2019-04-04 15:47:34 -0300

21 Mar, 2019

1 commit

4d3dc4d40 Merge branch 'develop' into 'master' ... Browse Code »
```
Develop

See merge request !3
```
Jose Pinto
2019-03-21 17:20:19 -0300

13 Mar, 2019

1 commit

767252147 Merge branch 'master' into 'develop' ... Browse Code »
```
Master

See merge request !2
```
Jose Pinto
2019-03-13 09:17:48 -0300

11 Mar, 2019

1 commit

d7090fca2 Boton Cancelar Browse Code »

Luigi
2019-03-11 16:35:31 -0300

18 Dec, 2018

3 commits

e7ed83b09 fuera espacio en blanco Browse Code »

Jose Pinto
2018-12-18 18:16:22 -0300
ff487d865 Merge branch 'master' into 'master' ... Browse Code »
```
10 elementos en swiper, agrego componente botonera

See merge request !1
```
Eric Fernandez
2018-12-18 18:13:30 -0300
014f46786 10 elementos en swiper, agrego componente botonera Browse Code »

Jose Pinto
2018-12-18 16:49:07 -0300

13 Nov, 2018

4 commits

ad4ad9b64 Merge branch 'master' into 'master' ... Browse Code »
```
Master (pmarco)

See merge request modulos-npm/foca-botonera-principal!10
```
Nicolás Guarnieri
2018-11-13 15:29:16 -0300
41fae26db Fix botonera principal. Browse Code »

Pablo Marco del Pont
2018-11-13 15:27:15 -0300
83f760e74 Merge branch 'master' into 'master' ... Browse Code »
```
arreglo en la muestra del terminalkey

See merge request modulos-npm/foca-botonera-principal!9
```
Pablo Marco del Pont
2018-11-13 12:33:19 -0300
5197d6a7f arreglo en la muestra del terminalkey Browse Code »

Nicolás Guarnieri
2018-11-13 12:28:51 -0300

10 Nov, 2018

2 commits

51253718a Merge branch 'master' into 'master' ... Browse Code »
```
Master (pmarco)

See merge request modulos-npm/foca-botonera-principal!8
```
Pablo Marco del Pont
2018-11-10 15:26:20 -0300
6b86c481f Solo pagina si es distribuidor. Browse Code »

Pablo Marco del Pont
2018-11-10 15:25:37 -0300