Commit Graph

6558 Commits

Author SHA1 Message Date
Carlos Jimenez Ruiz 9650beedba e2e fixes after merge
gitea/salix/puppeteer There was a failure building this commit Details
2020-01-27 18:35:39 +01:00
Carlos Jimenez Ruiz 87ad594f8a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into puppeteer 2020-01-27 14:31:33 +01:00
Joan Sanchez 65ae94ef90 Merge branch '2022-update_model_zone' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-01-27 08:58:55 +00:00
Bernat Exposito Domenech 849faad6ea add m3Max in agency.basicData
gitea/salix/2022-update_model_zone This commit looks good Details
2020-01-27 09:45:13 +01:00
Carlos Jimenez Ruiz e53ce1ce1b removed debug info to prevent click issues
gitea/salix/puppeteer There was a failure building this commit Details
2020-01-27 09:34:05 +01:00
Joan Sanchez 9484a3e742 Merge branch '1997-client_log' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-01-27 07:01:35 +00:00
Carlos Jimenez Ruiz a1fd5a01a7 #1976 Implementar Puppeteer
gitea/salix/puppeteer There was a failure building this commit Details
2020-01-27 00:48:00 +01:00
Carlos Jimenez Ruiz 7fef6dc2b0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into puppeteer 2020-01-26 21:59:46 +01:00
Bernat Exposito Domenech 9f73c68210 udate client.log styles
gitea/salix/1997-client_log This commit looks good Details
2020-01-24 14:22:11 +01:00
Joan Sanchez 921af4dcc2 Merge branch '2014-remove_bi_from_db' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-01-24 12:52:30 +00:00
Carlos Jimenez Ruiz 9fd28bd0ca Merge branch '#2037-worked-hours' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-01-24 12:48:20 +00:00
Bernat Exposito Domenech b244df4807 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2014-remove_bi_from_db
gitea/salix/2014-remove_bi_from_db This commit looks good Details
2020-01-24 12:56:01 +01:00
Bernat Exposito Domenech 2bcd0caa06 update structure db 2020-01-24 12:55:54 +01:00
Javi Gallego 08fda3ed1b #workedHours
gitea/salix/%232037-worked-hours This commit looks good Details
2020-01-24 12:38:08 +01:00
Carlos Jimenez Ruiz f74792dbe9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into puppeteer 2020-01-24 10:17:08 +01:00
Carlos Jimenez Ruiz 0c5ce6586f #1976 Implementar Puppeteer ticket module + others
gitea/salix/puppeteer There was a failure building this commit Details
2020-01-23 16:01:29 +01:00
Bernat Exposito f6ad5696b4 Merge branch '2018-deprecate_message_send' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-01-23 13:14:21 +00:00
Bernat Exposito Domenech 937ddd7880 fix table componentType
gitea/salix/2014-remove_bi_from_db This commit has test failures Details
2020-01-23 13:53:39 +01:00
Bernat Exposito Domenech 439f9009ff fix model componentType
gitea/salix/2014-remove_bi_from_db This commit looks good Details
2020-01-23 13:47:00 +01:00
Joan Sanchez 57acca2f5e refactor & updated tests
gitea/salix/2018-deprecate_message_send This commit looks good Details
2020-01-23 13:31:07 +01:00
Bernat Exposito Domenech cf130b800a fix db test
gitea/salix/2014-remove_bi_from_db This commit looks good Details
2020-01-23 13:01:29 +01:00
Bernat Exposito Domenech 6700daf0e3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2014-remove_bi_from_db
gitea/salix/2014-remove_bi_from_db This commit looks good Details
2020-01-23 12:58:47 +01:00
Bernat Exposito Domenech 64bd721287 update structure db 2020-01-23 12:58:38 +01:00
Bernat Exposito 6c0cc3d204 Merge branch '1982-travel_add_thermograph' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-01-23 10:00:58 +00:00
Joan Sanchez de95127199 Merge branch '2012-2013_update_structure_bi' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-01-22 14:11:17 +00:00
Bernat Exposito Domenech 2790cc8057 update structure
gitea/salix/2012-2013_update_structure_bi This commit looks good Details
2020-01-22 14:34:45 +01:00
Bernat Exposito Domenech 960b3c3f75 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-01-22 09:51:35 +01:00
Bernat Exposito Domenech 0b848adf03 fix back test
gitea/salix/master This commit looks good Details
gitea/salix/test This commit looks good Details
2020-01-22 09:43:10 +01:00
Joan Sanchez c36e62a97b added front unit tests
gitea/salix/1982-travel_add_thermograph This commit looks good Details
2020-01-22 09:04:26 +01:00
Joan Sanchez 2339d347f7 Added back unit tests
gitea/salix/1982-travel_add_thermograph There was a failure building this commit Details
2020-01-22 08:26:54 +01:00
Joan Sanchez 77f6333aba Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1982-travel_add_thermograph 2020-01-21 12:23:10 +01:00
Joan Sanchez f0b4c26aea added travel thermograph create & remove methods
gitea/salix/1982-travel_add_thermograph There was a failure building this commit Details
2020-01-21 12:21:53 +01:00
Joan Sanchez 20b4f6ec74 updated tests
gitea/salix/dev This commit looks good Details
2020-01-21 09:33:26 +01:00
Joan Sanchez 1d6edabb10 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2020-01-21 09:23:58 +01:00
Joan Sanchez e93e9d2947 getWasteDetail() now calls weekWaste_getDetail()
gitea/salix/master This commit looks good Details
gitea/salix/test This commit looks good Details
2020-01-21 09:17:55 +01:00
Joan Sanchez 5e4ab8b128 Loggable errors
gitea/salix/1982-travel_add_thermograph There was a failure building this commit Details
2020-01-21 09:00:42 +01:00
Joan Sanchez 41e69a2e9d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1982-travel_add_thermograph
gitea/salix/1982-travel_add_thermograph There was a failure building this commit Details
2020-01-20 13:05:06 +01:00
Joan Sanchez 383f1f2864 added old method
gitea/salix/dev This commit looks good Details
2020-01-20 12:57:33 +01:00
Bernat Exposito 6bdabb1848 Merge branch '2015-chat_sendCheckingPresence' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-01-20 11:28:33 +00:00
Joan Sanchez 3ff1fb7d2d Added back unit tests
gitea/salix/2015-chat_sendCheckingPresence This commit looks good Details
2020-01-20 11:59:15 +01:00
Joan Sanchez 3226081081 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2015-chat_sendCheckingPresence 2020-01-20 11:46:57 +01:00
Joan Sanchez bca8c23c1d Merge branch '2010-worker_phone_refactor' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-01-20 10:24:51 +00:00
Bernat Exposito Domenech 8ae5a8705e fix test
gitea/salix/2010-worker_phone_refactor This commit looks good Details
2020-01-20 11:17:04 +01:00
Bernat Exposito Domenech 1898337d08 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2010-worker_phone_refactor
gitea/salix/2010-worker_phone_refactor This commit looks good Details
2020-01-20 11:03:56 +01:00
Bernat Exposito Domenech 0fe0596b3e worker phone refactor 2020-01-20 11:03:40 +01:00
Joan Sanchez 0355d9bc27 Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
2020-01-20 07:58:34 +01:00
Joan Sanchez 40172e5c8c corrección de formato
gitea/salix/master This commit looks good Details
gitea/salix/test This commit looks good Details
2020-01-20 07:39:11 +01:00
Joan Sanchez 59d0ecca67 send message to worker or channel
gitea/salix/2015-chat_sendCheckingPresence This commit has test failures Details
2020-01-20 07:33:24 +01:00
Joan Sanchez 1fcd54e8d7 Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
2020-01-17 13:33:57 +01:00
Joan Sanchez 6b314d8dbe fixed date bug
gitea/salix/master This commit looks good Details
gitea/salix/test This commit looks good Details
2020-01-17 13:22:32 +01:00