Commit Graph

8375 Commits

Author SHA1 Message Date
Bernat Exposito 8976034bb0 fix fixtures
gitea/salix/pipeline/head This commit looks good Details
2020-11-03 08:15:49 +01:00
Bernat Exposito f2ee122778 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2557-export_production 2020-11-03 07:51:25 +01:00
Juan Ferrer fc957eda6c Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2020-11-02 19:58:45 +01:00
Juan Ferrer b3ab1fe059 Sync fixes & improvements
gitea/salix/pipeline/head This commit looks good Details
2020-11-02 19:58:07 +01:00
Javi Gallego 65f4a432aa Merge pull request '2565-address_fixtures' (#440) from 2565-address_fixtures into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #440
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2020-11-02 14:44:16 +00:00
Bernat Exposito b2d69127cb Merge branch 'dev' into 2565-address_fixtures
gitea/salix/pipeline/head This commit looks good Details
2020-11-02 14:31:36 +00:00
Carlos Jimenez Ruiz 4235055274 Merge pull request '2538-supplier_contact + e2e' (#437) from 2538-supplier_contact into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #437
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2020-11-02 14:12:18 +00:00
Carlos Jimenez Ruiz 7ac1807495 removed focus from html template
gitea/salix/pipeline/head This commit looks good Details
2020-11-02 14:04:11 +01:00
Carlos Jimenez Ruiz 0e7c294f46 e2e path for supplier contacts 2020-11-02 13:23:03 +01:00
Carlos Jimenez Ruiz 71b7d27623 Merge branch '2538-supplier_contact' of https://gitea.verdnatura.es/verdnatura/salix into 2538-supplier_contact 2020-11-02 11:28:09 +01:00
Bernat Exposito a42d24ebb4 Merge branch '2538-supplier_contact' of https://gitea.verdnatura.es/verdnatura/salix into 2538-supplier_contact 2020-11-02 11:15:07 +01:00
Bernat Exposito d07e95a7e9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2538-supplier_contact 2020-11-02 11:14:42 +01:00
Bernat Exposito e700f11863 acls 2020-11-02 11:14:21 +01:00
Carlos Jimenez Ruiz ffaf93ab83 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2538-supplier_contact 2020-11-02 11:14:20 +01:00
Bernat Exposito 7e2555ddf1 export production 2020-11-02 10:58:27 +01:00
Juan Ferrer c33aef2407 Package lock 2020-11-02 10:45:44 +01:00
Juan Ferrer b6da896fe7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2020-11-02 10:11:34 +01:00
Bernat Exposito d6c5e0ef0a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2565-address_fixtures
gitea/salix/pipeline/head This commit looks good Details
2020-11-02 09:27:35 +01:00
Carlos Jimenez Ruiz 117270e3fc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2538-supplier_contact 2020-11-02 09:19:23 +01:00
Javi Gallego e81aef74a9 Merge pull request '2510-client-address-create-test' (#418) from 2510-client-address-create-test into dev
Reviewed-on: #418
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2020-11-02 07:53:53 +00:00
Bernat Exposito e68453c047 fix test 2020-11-02 08:26:53 +01:00
Juan Ferrer e25a978b19 Merge branch 'test' into dev 2020-11-01 00:03:05 +01:00
Juan Ferrer 414c0931eb Sync management UI 2020-10-31 22:56:02 +01:00
Juan Ferrer 9b4f8697b9 User sync fixes 2020-10-31 21:16:58 +01:00
Bernat Exposito 459f4068ab fix fixtures
gitea/salix/pipeline/head This commit looks good Details
2020-10-31 11:05:16 +01:00
Juan Ferrer 937d5beefe User sync fixes
gitea/salix/pipeline/head This commit looks good Details
2020-10-31 03:13:17 +01:00
Juan Ferrer f39fa33b83 User sync fixes
gitea/salix/pipeline/head This commit looks good Details
2020-10-31 02:53:48 +01:00
Juan Ferrer 7763bcc1ef User sync fixes
gitea/salix/pipeline/head This commit looks good Details
2020-10-31 02:34:59 +01:00
Juan Ferrer fdf6df4ca8 User sync fixes
gitea/salix/pipeline/head This commit looks good Details
2020-10-31 02:31:42 +01:00
Juan Ferrer 1354d4647d User sync fixes
gitea/salix/pipeline/head This commit looks good Details
2020-10-31 02:26:17 +01:00
Juan Ferrer ae94d7db02 User sync fixes
gitea/salix/pipeline/head This commit looks good Details
2020-10-31 02:20:43 +01:00
Juan Ferrer ba5a03c980 User sync fixes
gitea/salix/pipeline/head This commit looks good Details
2020-10-31 01:56:19 +01:00
Juan Ferrer 15c39f93ca root id changed from 0 to 100 due to loopback join problems with id 0
gitea/salix/pipeline/head This commit looks good Details
2020-10-31 01:10:32 +01:00
Juan Ferrer 76ee8e6f38 User sync fixes
gitea/salix/pipeline/head This commit looks good Details
2020-10-31 00:40:54 +01:00
Juan Ferrer 9b563cb8bf LDAP & Samba synchronization fixes + improvements
gitea/salix/pipeline/head This commit looks good Details
2020-10-31 00:02:27 +01:00
Javi Gallego a472ce9a81 Merge branch 'dev' into 2510-client-address-create-test
gitea/salix/pipeline/head This commit looks good Details
2020-10-30 17:24:20 +01:00
Javi Gallego 0825042a6b Merge pull request 'refactor to catch wrong strings' (#430) from 2482-fix_worker_timeControl_e2e into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #430
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2020-10-30 16:23:13 +00:00
Carlos Jimenez Ruiz 22ba4a3e4f removed code obfuscation
gitea/salix/pipeline/head This commit looks good Details
2020-10-30 17:09:11 +01:00
Javi Gallego b50ae7b8ca testback arreglados
gitea/salix/pipeline/head This commit looks good Details
2020-10-30 15:50:59 +01:00
Bernat Exposito 89c9a1e858 add title in notes.contact
gitea/salix/pipeline/head This commit looks good Details
2020-10-30 13:26:56 +01:00
Bernat Exposito 18ebbe80d7 supplier contact
gitea/salix/pipeline/head This commit looks good Details
2020-10-30 11:40:12 +01:00
Javi Gallego 71fe677a7e fix getSummary
gitea/salix/pipeline/head This commit looks good Details
2020-10-30 10:50:13 +01:00
Carlos Jimenez Ruiz 28ec55b440 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2482-fix_worker_timeControl_e2e
gitea/salix/pipeline/head This commit looks good Details
2020-10-30 10:46:05 +01:00
Carlos Jimenez Ruiz 2f6b3f0c38 small refactors for #2512 2020-10-30 10:45:55 +01:00
Bernat Exposito 39de960b9d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2538-supplier_contact 2020-10-30 10:23:47 +01:00
Bernat Exposito 7200aa3dfc fixtures and sql for supplierContact 2020-10-30 10:23:42 +01:00
Javi Gallego 59cbe276f4 Merge branch 'dev' into 2510-client-address-create-test
gitea/salix/pipeline/head This commit looks good Details
2020-10-30 10:08:38 +01:00
Javi Gallego 31b5a140d4 test completados 2020-10-30 10:07:53 +01:00
Carlos Jimenez Ruiz 66a77f395f Merge pull request 'create section supplier log' (#429) from 2539-supplier_log into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #429
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
2020-10-30 08:29:45 +00:00
Javi Gallego 3fdc9c315d Merge branch 'dev' into 2510-client-address-create-test
gitea/salix/pipeline/head This commit looks good Details
2020-10-30 08:40:47 +01:00