Carlos Jimenez Ruiz
|
d322c941a4
|
#1226 Ticket.index advanced filter añadir factura
gitea/salix/dev This commit looks good
Details
|
2019-03-25 15:16:56 +01:00 |
 Joan Sanchez
|
6eaf317b5e
|
added worker calendar #1147
gitea/salix/dev This commit looks good
Details
|
2019-03-22 08:28:57 +01:00 |
|
Carlos Jimenez Ruiz
|
92347cd9c4
|
#1233 route.index
|
2019-03-21 13:46:14 +01:00 |
|
Carlos Jimenez Ruiz
|
7a5124aca2
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-03-20 12:27:36 +01:00 |
|
Carlos Jimenez Ruiz
|
d38ca72fd8
|
orden de resultados por defecto DESC de id y fecha
|
2019-03-20 11:49:11 +01:00 |
|
Joan Sanchez
|
8521382838
|
updated fonts
gitea/salix/dev This commit looks good
Details
|
2019-03-20 08:48:24 +01:00 |
Gerard
|
4e085d930f
|
Merge branch 'test' into dev
gitea/salix/dev This commit looks good
Details
|
2019-03-15 07:47:02 +01:00 |
|
Gerard
|
496ac864c3
|
Merge branch 'master' into test
gitea/salix/test This commit looks good
Details
|
2019-03-15 07:41:47 +01:00 |
|
Gerard
|
60d43a795d
|
#1223 Añadir offset de hora a componente vn-input-time
gitea/salix/master This commit looks good
Details
|
2019-03-15 07:40:45 +01:00 |
|
Joan Sanchez
|
bf14eb8ffe
|
added module name translation
gitea/salix/dev This commit looks good
Details
|
2019-03-14 07:17:44 +01:00 |
|
Carlos Jimenez Ruiz
|
f4b74abe3b
|
#1179 invoice.index crear el módulo
|
2019-03-13 14:10:45 +01:00 |
|
Joan Sanchez
|
92170c34d5
|
worker department #1133
gitea/salix/dev This commit has test failures
Details
|
2019-03-12 15:04:09 +01:00 |
|
Gerard
|
759cca3989
|
Merge branch 'test' into dev
gitea/salix/dev This commit looks good
Details
|
2019-03-08 08:04:20 +01:00 |
|
Gerard
|
3c77f24462
|
Merge branch 'master' into test
gitea/salix/test This commit looks good
Details
|
2019-03-08 07:59:41 +01:00 |
|
Gerard
|
f5a95d3190
|
console log deleted
gitea/salix/master This commit looks good
Details
|
2019-03-08 07:58:46 +01:00 |
|
Gerard
|
7e7023c680
|
validation disabled when displaycontrols is false
gitea/salix/master This commit looks good
Details
|
2019-03-08 07:58:09 +01:00 |
|
Carlos Jimenez Ruiz
|
75fba75688
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-03-07 11:00:48 +01:00 |
|
Carlos Jimenez Ruiz
|
1bf7aa112a
|
Bug #1194 configuracion de usuario, buscar por id
|
2019-03-07 09:55:03 +01:00 |
|
Gerard
|
af960e5f5f
|
fonts updated to 1.26 version
gitea/salix/test This commit looks good
Details
|
2019-03-06 16:28:09 +01:00 |
|
Gerard
|
175c6ecd03
|
Merge branch 'master' into test
gitea/salix/test This commit looks good
Details
|
2019-03-06 12:35:04 +01:00 |
|
Gerard
|
9db3275b67
|
input time not showing icons fixed
gitea/salix/master This commit looks good
Details
|
2019-03-06 12:26:26 +01:00 |
|
Gerard
|
c5a2c125fd
|
Merge branch 'master' into test
gitea/salix/test This commit looks good
Details
|
2019-03-06 11:08:56 +01:00 |
|
Gerard
|
665f34b67e
|
#1216 uvc now deletes the styles when you change the state
gitea/salix/master This commit looks good
Details
|
2019-03-06 11:05:29 +01:00 |
|
Joan Sanchez
|
596eb8d695
|
Merge branch 'test' into dev
gitea/salix/dev This commit looks good
Details
|
2019-03-05 08:48:26 +01:00 |
|
Joan Sanchez
|
ef483bcc12
|
fixed zone calendar weekday offset
gitea/salix/master This commit looks good
Details
gitea/salix/test This commit looks good
Details
|
2019-03-05 08:24:09 +01:00 |
|
Carlos Jimenez Ruiz
|
f8a4ad0f28
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-03-04 16:49:41 +01:00 |
|
Carlos Jimenez Ruiz
|
d1d11233ad
|
#1039 ticket.summary
|
2019-03-04 16:34:41 +01:00 |
|
Gerard
|
b0be963541
|
Merge branch 'test' into dev
gitea/salix/dev This commit looks good
Details
|
2019-03-05 14:12:20 +01:00 |
|
Gerard
|
f5262954bc
|
bug with filter giving wrong dates fixed
gitea/salix/test This commit looks good
Details
|
2019-03-05 14:08:00 +01:00 |
|
Joan Sanchez
|
3c6d27a285
|
order sales by concept #1166
gitea/salix/dev This commit looks good
Details
|
2019-03-04 12:04:23 +01:00 |
|
Gerard
|
80ebf671e8
|
fonts rollback to version 1.24
gitea/salix/dev This commit looks good
Details
|
2019-03-05 10:45:07 +01:00 |
|
Gerard
|
269a2576b2
|
fonts updated
|
2019-03-04 19:47:10 +01:00 |
|
Gerard
|
7dd08dc6e5
|
merge test
gitea/salix/dev This commit looks good
Details
|
2019-02-28 10:19:31 +01:00 |
|
Gerard
|
9a7bd834df
|
date offset fixed
gitea/salix/test This commit looks good
Details
|
2019-02-27 17:04:32 +01:00 |
|
Gerard
|
87e8be0ede
|
time filter changed by dateTime
|
2019-02-27 17:04:00 +01:00 |
|
Gerard
|
fd1e380d7a
|
wrong comparision fixed
gitea/salix/dev This commit looks good
Details
|
2019-02-26 17:34:25 +01:00 |
|
Gerard
|
60ec49abbd
|
#1103 vnTextfield doesnt blur anymore
|
2019-02-26 17:33:51 +01:00 |
|
Joan Sanchez
|
4d53564602
|
Merge branch 'test' into dev
gitea/salix/dev This commit looks good
Details
|
2019-02-26 14:26:47 +01:00 |
|
Gerard
|
d404fc92c8
|
dates fixed, deleted tricks to change the hours
gitea/salix/test This commit looks good
Details
|
2019-02-26 12:51:01 +01:00 |
|
Gerard
|
43f26d1bc9
|
input number now has a option to hide the controls
gitea/salix/test This commit looks good
Details
|
2019-02-25 15:56:42 +01:00 |
|
Joan Sanchez
|
2862501475
|
Merge branch 'test' into dev
gitea/salix/dev This commit looks good
Details
|
2019-02-25 15:08:42 +01:00 |
|
Joan Sanchez
|
6068ede6ee
|
removed offset from agency module
gitea/salix/test This commit looks good
Details
|
2019-02-25 14:02:47 +01:00 |
|
Carlos Jimenez Ruiz
|
0be9458672
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-25 13:07:39 +01:00 |
|
Carlos Jimenez Ruiz
|
b5f29954ed
|
#796 Test front left-menu.js
|
2019-02-25 13:07:32 +01:00 |
|
Gerard
|
68aaade0a9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-02-25 12:37:20 +01:00 |
|
Joan Sanchez
|
23ed5e4ddf
|
added offset calendar remove selection
gitea/salix/test This commit looks good
Details
|
2019-02-25 12:22:04 +01:00 |
|
Joan Sanchez
|
7a7b2c67d0
|
offset changes
gitea/salix/test This commit looks good
Details
|
2019-02-25 11:55:59 +01:00 |
|
Carlos Jimenez Ruiz
|
4709a55b8f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-25 11:38:18 +01:00 |
|
Joan Sanchez
|
a389ca46a2
|
calendar offset
gitea/salix/test This commit looks good
Details
|
2019-02-25 11:32:29 +01:00 |
|
Gerard
|
2872dcdd3e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-25 10:10:47 +01:00 |
|
Gerard
|
007139f2f6
|
added disable property
|
2019-02-25 10:10:44 +01:00 |
|
Joan Sanchez
|
559a9fe96f
|
Merge branch 'test' into dev
gitea/salix/dev This commit looks good
Details
|
2019-02-25 10:04:53 +01:00 |
|
Joan Sanchez
|
ac1e619b06
|
fixed zone bugs
|
2019-02-25 10:03:50 +01:00 |
|
Gerard
|
54a835eefd
|
added disabled property
|
2019-02-25 09:50:51 +01:00 |
|
Carlos Jimenez Ruiz
|
f6a5fb106f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-25 09:35:08 +01:00 |
|
Carlos Jimenez Ruiz
|
69c5c8f1cd
|
#485
|
2019-02-25 09:28:25 +01:00 |
 Juan Ferrer
|
ba62f545f7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-02-22 16:17:08 +01:00 |
|
Juan Ferrer
|
26419e75c9
|
Style fixes
gitea/salix/test This commit looks good
Details
|
2019-02-22 16:15:54 +01:00 |
|
Juan Ferrer
|
961eb6edaf
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/test This commit looks good
Details
|
2019-02-22 14:38:45 +01:00 |
|
Juan Ferrer
|
9fc6a2c4c2
|
Style fixes
|
2019-02-22 14:34:11 +01:00 |
|
Gerard
|
6364239d8a
|
#1152 updated td-editable
gitea/salix/dev This commit looks good
Details
|
2019-02-22 12:27:56 +01:00 |
|
Gerard
|
6c46400d3d
|
checkbox styles fixed
gitea/salix/test This commit looks good
Details
|
2019-02-22 08:52:30 +01:00 |
|
Gerard
|
f1afe16c9e
|
icon not showing correctly fixed
gitea/salix/master This commit looks good
Details
gitea/salix/test This commit looks good
Details
|
2019-02-21 14:24:27 +01:00 |
|
Carlos Jimenez Ruiz
|
413d2f2855
|
merge
gitea/salix/dev This commit has test failures
Details
|
2019-02-21 11:53:19 +01:00 |
|
Carlos Jimenez Ruiz
|
050c5c1126
|
#1131 Refactor vn-icon a vn-icon-button en las templates.
|
2019-02-21 11:40:27 +01:00 |
|
Juan Ferrer
|
e42da544cd
|
Styles fixed
|
2019-02-21 10:10:38 +01:00 |
|
Juan Ferrer
|
8f1e41e744
|
Style fixes
|
2019-02-20 14:34:16 +01:00 |
|
Joan Sanchez
|
90092a4f48
|
fixed treeview order
gitea/salix/dev This commit looks good
Details
|
2019-02-20 12:31:08 +01:00 |
|
Joan Sanchez
|
031aeae950
|
fixed styles
gitea/salix/dev This commit has test failures
Details
|
2019-02-20 08:57:51 +01:00 |
|
Gerard
|
419778f67e
|
now has the proper title directive
gitea/salix/dev This commit looks good
Details
|
2019-02-20 08:26:53 +01:00 |
|
Gerard
|
927957aed8
|
Merge remote-tracking branch 'upstream/dev' into jgallego
|
2019-02-19 16:12:01 +01:00 |
|
Gerard
|
e041cef586
|
vn-empty-rows deleted as its not longer needed
|
2019-02-19 16:11:57 +01:00 |
|
Gerard
|
a8a17b72bd
|
Merge remote-tracking branch 'origin/dev' into jgallego
|
2019-02-19 16:10:16 +01:00 |
|
Gerard
|
9d39840449
|
performance problems with the component fetched tags fixed
gitea/salix/dev This commit looks good
Details
|
2019-02-19 15:54:01 +01:00 |
|
Joan Sanchez
|
d11a51b3f1
|
added color filter #1041
gitea/salix/dev This commit looks good
Details
|
2019-02-19 15:13:27 +01:00 |
|
Gerard
|
abfbf791f3
|
added one time bindings
|
2019-02-19 12:50:24 +01:00 |
|
Juan Ferrer
|
0580500359
|
Style fixes
gitea/salix/dev This commit looks good
Details
|
2019-02-19 09:40:36 +01:00 |
|
Joan Sanchez
|
4645e75f17
|
check fdescribe removed
gitea/salix/dev This commit looks good
Details
|
2019-02-19 07:05:39 +01:00 |
|
Joan Sanchez
|
79e8c1b19a
|
checkbox front unit test
gitea/salix/dev This commit looks good
Details
|
2019-02-19 07:04:56 +01:00 |
|
Joan Sanchez
|
75053618a2
|
zoneLocation order
gitea/salix/dev This commit looks good
Details
|
2019-02-18 13:39:48 +01:00 |
 Javi Gallego
|
da4d961c8b
|
Merge branch 'dev' into jgallego
gitea/salix/jgallego This commit has test failures
Details
|
2019-02-18 13:35:33 +01:00 |
|
Joan Sanchez
|
0ea161ff19
|
fixed zoneLocation search
gitea/salix/dev This commit looks good
Details
|
2019-02-18 13:23:24 +01:00 |
|
Gerard
|
3adc035cab
|
#1121 worker.descriptor
|
2019-02-18 12:54:33 +01:00 |
|
Gerard
|
cb78a6da65
|
not being able to translate titles fixed
gitea/salix/dev This commit looks good
Details
|
2019-02-18 11:35:16 +01:00 |
|
Joan Sanchez
|
87fff4e338
|
fixed intermediate on non triple-state checkbox
gitea/salix/dev This commit looks good
Details
|
2019-02-18 09:14:39 +01:00 |
|
Joan Sanchez
|
5eb4eb2e79
|
Merge branch 'dev' into test
gitea/salix/dev There was a failure building this commit
Details
gitea/salix/test Something is wrong with the build of this commit
Details
|
2019-02-18 08:38:14 +01:00 |
|
Joan Sanchez
|
3b0d003322
|
treeview refactor & zone #1140
gitea/salix/dev This commit looks good
Details
|
2019-02-18 08:37:26 +01:00 |
|
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 |
|
Gerard
|
cb9e2284eb
|
styles, imports of titles and traductions added
|
2019-02-15 17:30:22 +01:00 |
|
Juan Ferrer
|
4b027f015d
|
Pull request: test 1
|
2019-02-15 15:23:39 +01:00 |
|
Javi Gallego
|
00c7f28baf
|
Merge branch 'jgallego' of https://gitea.verdnatura.es/verdnatura/salix into jgallego
|
2019-02-15 14:36:50 +01:00 |
|
Javi Gallego
|
b81b8e18ed
|
$color-font-link
|
2019-02-15 14:29:47 +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 |
|
Juan Ferrer
|
c89090dba4
|
nginx config fixed for 404
|
2019-02-01 11:06:23 +01:00 |
|
Juan Ferrer
|
17d7945065
|
Nginx config fix for 404
|
2019-02-01 09:47:52 +01:00 |
|
Juan Ferrer
|
13ec9006a9
|
Nginx redirect to main page on 404 errors
|
2019-02-01 09:37:20 +01:00 |
|
Joan Sanchez
|
1bcaf27563
|
changed currency filter, fixed tag value errors
|
2019-01-31 11:44:03 +01:00 |
|
Joan Sanchez
|
a49d937fd9
|
ita-tag validation error + home shortcuts
|
2019-01-31 09:47:52 +01:00 |
|
Javi Gallego
|
4fb9d9a3f9
|
autocomplete bug CR juan
|
2019-01-31 07:08:26 +01:00 |
|
Juan Ferrer
|
6bd4b94f11
|
Karma test fixed
|
2019-01-31 01:05:02 +01:00 |
|
Juan Ferrer
|
6074c52202
|
Style fixes
|
2019-01-31 00:43:49 +01:00 |
|
Juan Ferrer
|
70fc851841
|
Style fixes
|
2019-01-31 00:39:40 +01:00 |
|
Juan Ferrer
|
f643261a85
|
Styles fixed, change language moved to user config popover
|
2019-01-31 00:33:43 +01:00 |