 Juan Ferrer
|
3a56044634
|
Jenkinsfile fixes
|
2019-02-17 18:35:29 +01:00 |
|
Juan Ferrer
|
9346c7adc3
|
Merge remote-tracking branch 'upstream/dev' into dev
|
2019-02-15 22:08:44 +01:00 |
 Joan Sanchez
|
42e3fede23
|
fixed ng-repeat transition
|
2019-02-15 17:33:03 +01:00 |
|
Juan Ferrer
|
4b027f015d
|
Pull request: test 1
|
2019-02-15 15:23:39 +01:00 |
|
Juan Ferrer
|
588583d63d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-15 13:33:07 +01:00 |
|
Joan Sanchez
|
08c252fb9b
|
updated check component
|
2019-02-15 13:31:14 +01:00 |
|
Juan Ferrer
|
34ace7f5d4
|
Strict dependency injection enabled
|
2019-02-15 12:34:21 +01:00 |
Gerard
|
90a4e5a7d1
|
#1144 fixed bugs with $destroy
|
2019-02-15 11:03:27 +01:00 |
|
Gerard
|
c3903b8d51
|
added tripleState setter
|
2019-02-15 08:49:44 +01:00 |
|
Joan Sanchez
|
fe2c74c8c8
|
fixed event emiter
|
2019-02-15 08:40:18 +01:00 |
|
Joan Sanchez
|
e373e603bf
|
checkbox component noew emits change event
|
2019-02-15 08:02:29 +01:00 |
|
Joan Sanchez
|
cf9831473b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-15 06:49:31 +01:00 |
|
Gerard
|
fd0e46516c
|
#1060 añadir al componente check la popiedad intermediate
|
2019-02-14 20:17:22 +01:00 |
|
Joan Sanchez
|
e49512d152
|
updated fonts
|
2019-02-14 14:47:05 +01:00 |
|
Gerard
|
f7968ff15b
|
tests fixed
|
2019-02-14 11:41:06 +01:00 |
|
Juan Ferrer
|
f3e3c1bbae
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-13 14:01:38 +01:00 |
|
Juan Ferrer
|
1f759b6b8c
|
Style fixes
|
2019-02-13 14:01:37 +01:00 |
|
Gerard
|
b93e2f5359
|
#1114 item.regularize
|
2019-02-13 09:49:41 +01:00 |
Carlos Jimenez Ruiz
|
fefd6f45af
|
removed deprecation
|
2019-02-13 08:43:09 +01:00 |
|
Carlos Jimenez Ruiz
|
fb4a4cd3de
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-13 08:19:44 +01:00 |
|
Gerard
|
8fa7abe191
|
#1128 User view directive first version
|
2019-02-12 17:24:37 +01:00 |
|
Carlos Jimenez Ruiz
|
06db624fd6
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-12 15:07:43 +01:00 |
|
Gerard
|
4287457692
|
fixed translate in tables
|
2019-02-12 14:57:40 +01:00 |
|
Carlos Jimenez Ruiz
|
9c0613e8e7
|
#1127
|
2019-02-12 14:40:13 +01:00 |
|
Carlos Jimenez Ruiz
|
b0e22febd3
|
#1127 mover ticket.descriptor al modulo ticket
|
2019-02-12 09:03:56 +01:00 |
 Javi Gallego
|
66c2714233
|
storage-services eliminados cr Juan
|
2019-02-11 11:05:28 +01:00 |
|
Juan Ferrer
|
796a3e1a76
|
Style fixes
|
2019-02-10 23:01:21 +01:00 |
|
Juan Ferrer
|
ed5f76d164
|
Style fixes
|
2019-02-10 22:56:11 +01:00 |
|
Juan Ferrer
|
c0dd1624f6
|
Table style
|
2019-02-10 22:52:35 +01:00 |
|
Juan Ferrer
|
1ee60ea629
|
Style fixes
|
2019-02-08 18:09:14 +01:00 |
|
Juan Ferrer
|
20382b2b14
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-08 17:49:53 +01:00 |
|
Juan Ferrer
|
f52d306db4
|
Color style unified
|
2019-02-08 17:49:51 +01:00 |
|
Gerard
|
815985e5de
|
#1024 th-editable
|
2019-02-08 15:09:47 +01:00 |
|
Gerard
|
77600d4d11
|
#1024 td-editable component created
|
2019-02-08 15:08:36 +01:00 |
|
Joan Sanchez
|
b890ade406
|
docker scale 2 back containers
|
2019-02-07 08:03:23 +01:00 |
|
Javi Gallego
|
6e421d8442
|
Tarea #808 order.basic-data cr juan
|
2019-02-06 14:56:36 +01:00 |
|
Juan Ferrer
|
2bf9244770
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-06 11:24:31 +01:00 |
|
Juan Ferrer
|
03406a7d9b
|
Style fixes
|
2019-02-06 11:24:29 +01:00 |
|
Gerard
|
f59d022da8
|
#1078 risk.create
|
2019-02-05 16:46:02 +01:00 |
|
Gerard
|
48bb876bea
|
Revert "#1012 claim.action"
This reverts commit 44893b57e7.
|
2019-02-05 16:42:28 +01:00 |
|
Gerard
|
44893b57e7
|
#1012 claim.action
|
2019-02-05 16:41:36 +01:00 |
|
Juan Ferrer
|
8f72fbad23
|
Merge
|
2019-02-05 09:14:22 +01:00 |
|
Juan Ferrer
|
1dbb75a1b8
|
vnSideMenu, vnBackground, style fixes
|
2019-02-05 09:13:15 +01:00 |
|
Joan Sanchez
|
af6a9d8022
|
fixed zone treeview bugs
|
2019-02-04 12:14:07 +01:00 |
|
Juan Ferrer
|
84c0002cb1
|
Hot bugs fixed
|
2019-02-01 17:11:14 +01:00 |
|
Gerard
|
89826182c2
|
bugs with some elements not showing fixed
|
2019-02-01 13:52:26 +01:00 |
|
Juan Ferrer
|
1752ffbcaa
|
css zindex fixes
|
2019-02-01 13:01:09 +01:00 |
|
Juan Ferrer
|
50f580e883
|
nginx config fixes
|
2019-02-01 12:17:23 +01:00 |
|
Juan Ferrer
|
a781346f17
|
nginx conf fixes
|
2019-02-01 11:54:36 +01:00 |
|
Juan Ferrer
|
8889f8d5cf
|
Jenkinsfile fixes, back scaled to 3 servers, nginx conf improved
|
2019-02-01 11:46:54 +01:00 |