Commit Graph

4854 Commits

Author SHA1 Message Date
Carlos Jimenez Ruiz bd76be0e9d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-03-11 11:29:14 +01:00
Joan Sanchez 891c4b201a Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
2019-03-11 11:10:28 +01:00
Joan Sanchez 91f8f337f5 removed clog
gitea/salix/test This commit looks good Details
2019-03-11 11:09:59 +01:00
Carlos Jimenez Ruiz 2e4e7f8dd1 en.json update 2019-03-11 10:37:42 +01:00
Gerard 926ee532ae Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
2019-03-11 08:40:59 +01:00
Gerard 987fc1e4e3 tranlations added
gitea/salix/test This commit looks good Details
2019-03-11 08:40:35 +01:00
Gerard 562403cd0a Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
2019-03-11 08:15:00 +01:00
Gerard 63787a7beb showing client tickets from client descriptor works again
gitea/salix/test This commit looks good Details
2019-03-11 08:11:48 +01:00
Gerard 3afedbd89b merge
gitea/salix/dev This commit looks good Details
2019-03-11 08:02:06 +01:00
Gerard f6eb8315a3 #999 worker.index buscador
gitea/salix/test This commit looks good Details
2019-03-11 08:00:49 +01:00
Carlos Jimenez Ruiz 2269565dc2 #1124 E2E item descriptor icono no activo
gitea/salix/dev This commit has test failures Details
2019-03-10 13:14:13 +01:00
Carlos Jimenez Ruiz 7323ed03e7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-03-08 14:46:14 +01:00
Carlos Jimenez Ruiz 78103137bb Test #1221 e2e worker.pbx 2019-03-08 14:46:01 +01:00
Gerard f47a448131 e2e fixes
gitea/salix/dev This commit looks good Details
2019-03-08 14:12:16 +01:00
Gerard cd86b78596 Merge branch 'test' into dev 2019-03-08 13:46:59 +01:00
Gerard d1ce85c81e taxclass field temporally removed as it slows the query
gitea/salix/test This commit looks good Details
2019-03-08 13:46:33 +01:00
Bernat 99ef9d71fe new acl
gitea/salix/dev This commit looks good Details
2019-03-08 13:45:38 +01:00
Gerard 9d85094ccd Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
2019-03-08 13:12:33 +01:00
Gerard 720803facb #1220 item.index añadir campos a buscador avanzado
gitea/salix/test This commit looks good Details
2019-03-08 13:12:13 +01:00
Carlos Jimenez Ruiz f6c725d007 more e2e repairs
gitea/salix/dev This commit looks good Details
2019-03-08 11:01:10 +01:00
Carlos Jimenez Ruiz 479ca86196 e2e repairs 2019-03-08 11:00:47 +01:00
Carlos Jimenez Ruiz aceecd9c7a Tarea #1197 worker.centralita 2019-03-08 09:41:53 +01:00
Gerard 7f0d3279d1 #1189 ticket.index mostrar mas informacion
gitea/salix/dev This commit looks good Details
2019-03-08 08:14:22 +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
Gerard 7d8879a979 deleted default query on item index 2019-03-08 07:52:43 +01:00
Joan Sanchez 9f3f0224ab recovered sql
gitea/salix/dev This commit looks good Details
2019-03-07 13:53:06 +01:00
Carlos Jimenez Ruiz 6bb4f04bd1 #1211 client.billingData
gitea/salix/dev This commit looks good Details
2019-03-07 12:11:06 +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 8e28bb4312 #1211 client.billingData 2019-03-07 09:55:22 +01:00
Carlos Jimenez Ruiz 1bf7aa112a Bug #1194 configuracion de usuario, buscar por id 2019-03-07 09:55:03 +01:00
Bernat b709930db5 cau 10041 update fixtures for workers and fix test
gitea/salix/dev This commit looks good Details
2019-03-07 07:51:29 +01:00
Gerard b04dc02c61 Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
2019-03-06 16:29:15 +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 1cc196983e Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
2019-03-06 14:13:58 +01:00
Gerard f8d6d2fe98 Merge branch 'master' into test
gitea/salix/test This commit looks good Details
2019-03-06 14:10:36 +01:00
Gerard 0e3d568743 #1218 ticket.new quitar restricciones al crear un ticket abono
gitea/salix/master This commit looks good Details
2019-03-06 14:06:36 +01:00
Carlos Jimenez Ruiz bbe8e7988e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-03-06 12:37:45 +01:00
Gerard 22abeca53e Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
2019-03-06 12:35:37 +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
Carlos Jimenez Ruiz 73f4f80d83 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-03-06 12:28:52 +01:00
Carlos Jimenez Ruiz fdfddd260a #1208 Cambiar componente de icono papelera vn-icon por vn-icon-button 2019-03-06 12:27:56 +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
Bernat 5efce3699c cau 9994 new procedure ticketCalculateSale
gitea/salix/dev This commit looks good Details
2019-03-06 11:45:05 +01:00
Carlos Jimenez Ruiz eef85a47db #1210 e2e item.index ocultar columnas
gitea/salix/dev This commit looks good Details
2019-03-06 11:40:52 +01:00
Carlos Jimenez Ruiz 6289978de8 increased default timeout for 1 single test which failed constantly 2019-03-06 11:40:37 +01:00
Gerard bdfd7fad22 Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
2019-03-06 11:09:33 +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