 Javi Gallego
|
5954cc7034
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-01-28 12:07:18 +01:00 |
|
Javi Gallego
|
086b773423
|
gulpfile para windows
|
2019-01-28 12:06:52 +01:00 |
 Juan Ferrer
|
cb85610c5d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-01-28 10:04:20 +01:00 |
|
Juan Ferrer
|
ce99ab64bd
|
#1058 Fixed
|
2019-01-28 10:04:08 +01:00 |
Bernat
|
7a879f5431
|
#996, new model personDepartment
|
2019-01-28 09:52:53 +01:00 |
|
Juan Ferrer
|
9b1a52e47d
|
Manifest color changed
|
2019-01-28 09:10:41 +01:00 |
|
Juan Ferrer
|
fca1595f6f
|
Login style fixes
|
2019-01-28 09:09:17 +01:00 |
|
Juan Ferrer
|
e940853840
|
Watch enabled in print services, unused icons remove from topbar
|
2019-01-28 09:07:46 +01:00 |
|
Juan Ferrer
|
d94090f2b0
|
Dockerfile fixes
|
2019-01-28 01:26:00 +01:00 |
|
Juan Ferrer
|
8898d394fa
|
Dockerfile fixes
|
2019-01-28 01:25:03 +01:00 |
|
Juan Ferrer
|
6f558ecad4
|
Login
|
2019-01-28 01:05:18 +01:00 |
|
Juan Ferrer
|
41caf1a158
|
HTML manifest
|
2019-01-28 00:54:37 +01:00 |
|
Juan Ferrer
|
18c7851fb7
|
Merge
|
2019-01-28 00:32:28 +01:00 |
|
Juan Ferrer
|
317102b612
|
Section titile in topbar, responsive
|
2019-01-28 00:26:01 +01:00 |
Carlos Jimenez Ruiz
|
cb99ac2811
|
#1052 e2e extension para refrescar formularios/vistas
|
2019-01-27 21:09:54 +01:00 |
|
Carlos Jimenez Ruiz
|
7333cb4114
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-01-27 20:49:21 +01:00 |
|
Carlos Jimenez Ruiz
|
b144f24f24
|
#1052 e2e extension para refrescar formularios/vistas
|
2019-01-27 20:49:15 +01:00 |
|
Juan Ferrer
|
005193c23c
|
Jenkins fixes
|
2019-01-27 11:15:20 +01:00 |
|
Juan Ferrer
|
87395d68cd
|
Jenkins fixes
|
2019-01-26 20:51:37 +01:00 |
|
Juan Ferrer
|
262d03689f
|
Merge branch 'test' into dev
|
2019-01-26 20:43:58 +01:00 |
|
Juan Ferrer
|
bf818e5822
|
Gulpfile mysql wait time reduced to 5 min
|
2019-01-26 20:43:31 +01:00 |
|
Juan Ferrer
|
14d958a44a
|
Jenkinsfile fixes
|
2019-01-26 20:42:48 +01:00 |
|
Juan Ferrer
|
c956ef59d6
|
Gulpfile fixes for CI
|
2019-01-26 20:30:45 +01:00 |
|
Juan Ferrer
|
69bb8173c0
|
Jenkins fixes for CI
|
2019-01-26 20:26:14 +01:00 |
|
Juan Ferrer
|
009a11fefe
|
Jenkins fixes
|
2019-01-26 19:38:53 +01:00 |
|
Juan Ferrer
|
773f24faee
|
Jenkins test
|
2019-01-26 19:36:36 +01:00 |
|
Carlos Jimenez Ruiz
|
84c680d8ed
|
e2e repairs
|
2019-01-26 15:53:06 +01:00 |
|
Juan Ferrer
|
424d9b706f
|
Jenkins fixes
|
2019-01-26 15:10:10 +01:00 |
|
Juan Ferrer
|
22571ed3f2
|
Jenkins test
|
2019-01-26 15:06:38 +01:00 |
|
Juan Ferrer
|
8b81e6cab9
|
Jenkins fixes
|
2019-01-26 15:01:06 +01:00 |
|
Juan Ferrer
|
50eb5e10e1
|
Jenkins fixes
|
2019-01-26 14:57:09 +01:00 |
|
Juan Ferrer
|
1a991c92b5
|
Jenkins testing fixes
|
2019-01-26 14:53:32 +01:00 |
|
Juan Ferrer
|
21e3fe9fc9
|
Jenkins testing fixes
|
2019-01-26 14:51:36 +01:00 |
|
Juan Ferrer
|
4ee7ed099e
|
Jenkins CI testing
|
2019-01-26 14:48:55 +01:00 |
|
Juan Ferrer
|
f47ce96ce8
|
Nginx conf fixed
|
2019-01-26 14:22:59 +01:00 |
|
Juan Ferrer
|
f584bd6953
|
Nginx fixes
|
2019-01-26 13:38:28 +01:00 |
|
Juan Ferrer
|
4aa3a839b7
|
Debug & watch enabled y default in gulp back, webpack HMR, e2e fixes
|
2019-01-26 13:12:18 +01:00 |
|
Carlos Jimenez Ruiz
|
20bea9679c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-01-26 13:04:20 +01:00 |
|
Javi Gallego
|
97badcdb5e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-01-26 12:18:01 +01:00 |
|
Javi Gallego
|
35375c856a
|
traduccion cesta
|
2019-01-26 12:17:48 +01:00 |
|
Juan Ferrer
|
af5ab770ec
|
More cleaning, deps in routes.json, module autodetection
|
2019-01-26 02:30:46 +01:00 |
|
Juan Ferrer
|
8fc8292e72
|
Obsolete code & files removed
|
2019-01-25 23:02:29 +01:00 |
|
Juan Ferrer
|
71af7f6d0e
|
#981 Login fixes
|
2019-01-25 17:05:53 +01:00 |
|
Javi Gallego
|
2a447c2107
|
package sin bcrypt
|
2019-01-25 16:27:26 +01:00 |
|
Javi Gallego
|
30a8bb5ce3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-01-25 16:26:25 +01:00 |
|
Javi Gallego
|
d234b188a7
|
gulpfile bug de windows solucionado
|
2019-01-25 16:26:07 +01:00 |
Gerard
|
bb54ec3bdc
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-01-25 16:22:04 +01:00 |
|
Gerard
|
c0a987b3d4
|
Revert "#1032 test failing"
This reverts commit 681ac605ff.
|
2019-01-25 16:21:23 +01:00 |
|
Gerard
|
681ac605ff
|
#1032 test failing
|
2019-01-25 16:20:47 +01:00 |
|
Juan Ferrer
|
f7980c49f5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-01-25 15:09:58 +01:00 |