Commit Graph

10551 Commits

Author SHA1 Message Date
Joan Sanchez f4a63e0876 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-08-27 14:32:10 +02:00
Joan Sanchez 7c4d9b9460 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2020-08-27 14:31:54 +02:00
Joan Sanchez a75938b6d0 Updated error handler
gitea/salix/pipeline/head This commit looks good Details
2020-08-27 14:23:40 +02:00
Joan Sanchez 55d047c0dd Renamed error var
gitea/salix/pipeline/head This commit looks good Details
2020-08-27 14:11:22 +02:00
Joan Sanchez fd67a85fe8 Changed to 1 second
gitea/salix/pipeline/head This commit looks good Details
2020-08-27 14:09:21 +02:00
Joan Sanchez 0c4939830b Fixed error
gitea/salix/pipeline/head This commit looks good Details
2020-08-27 14:00:40 +02:00
Joan Sanchez 6f3fb83cd7 Changes
gitea/salix/pipeline/head This commit looks good Details
2020-08-27 13:53:11 +02:00
Joan Sanchez 32de0e1e6f Removed focus
gitea/salix/pipeline/head This commit looks good Details
2020-08-27 12:43:57 +02:00
Joan Sanchez 914407012a Fixed bank search expression
gitea/salix/pipeline/head This commit looks good Details
2020-08-27 11:58:28 +02:00
Joan Sanchez f14b484faf Added ACL to td-editable
gitea/salix/pipeline/head This commit looks good Details
2020-08-27 11:23:39 +02:00
Joan Sanchez ac181bb845 Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2020-08-27 11:16:36 +02:00
Joan Sanchez 1b764e0b3a Merge branch 'dev' into 2394-order_index_total
gitea/salix/pipeline/head This commit looks good Details
2020-08-27 07:54:53 +00:00
Joan Sanchez 17542472da 2391 - Editable description
gitea/salix/pipeline/head This commit looks good Details
2020-08-27 08:24:21 +02:00
Carlos Jimenez Ruiz 3a82ef0e06 2375 entry lastBuy seccion
gitea/salix/pipeline/head This commit looks good Details
2020-08-26 16:33:47 +02:00
Joan Sanchez 30a4bbfe1a Css changes
gitea/salix/pipeline/head This commit looks good Details
2020-08-26 12:41:38 +02:00
Joan Sanchez a343d5eb9a 2394 - Removed call to order_total()
gitea/salix/pipeline/head This commit looks good Details
2020-08-26 11:27:36 +02:00
Carlos Jimenez Ruiz d23e3eff76 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2341-Entry_lastBuy_section 2020-08-26 09:49:52 +02:00
Joan Sanchez 55c88514bd Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-08-26 08:29:03 +02:00
Joan Sanchez e12612b0ea Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2020-08-26 08:28:41 +02:00
Joan Sanchez ea4f561bcf Added try-catch
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2020-08-26 07:33:00 +02:00
Joan Sanchez 17cd808015 Merge pull request 'Download route PDF on route index' (#357) from 2358-route_download_pdf into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #357
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
2020-08-25 13:17:58 +00:00
Joan Sanchez 7e494962cd Merge branch 'dev' into 2358-route_download_pdf
gitea/salix/pipeline/head This commit looks good Details
2020-08-25 12:27:17 +00:00
Joan Sanchez 9ef58cabd4 Removed console log
gitea/salix/pipeline/head This commit looks good Details
2020-08-25 14:10:38 +02:00
Joan Sanchez f480bdbd9a Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-08-25 13:46:50 +02:00
Joan Sanchez 74f3229fc5 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2020-08-25 13:45:20 +02:00
Joan Sanchez c15934aabc Updated e2e selector
gitea/salix/pipeline/head This commit looks good Details
2020-08-25 11:59:51 +02:00
Joan Sanchez 17497c3f2d Added unit test
gitea/salix/pipeline/head This commit looks good Details
2020-08-25 10:22:57 +02:00
Joan Sanchez cd74e9684a Download route PDF on route index
gitea/salix/pipeline/head This commit looks good Details
2020-08-25 10:00:21 +02:00
Joan Sanchez b2886bdca8 Merge pull request 'Html changes' (#356) from 2386-2380_html_fixes into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #356
2020-08-24 06:32:09 +00:00
Joan Sanchez 957c1c01b9 Html changes
gitea/salix/pipeline/head This commit looks good Details
2020-08-24 07:54:30 +02:00
Joan Sanchez 519580161e Merge pull request '2387-zone_delete_fix' (#355) from 2387-zone_delete_fix into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #355
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2020-08-20 10:52:19 +00:00
Joan Sanchez 80e1577d4f Updated e2e
gitea/salix/pipeline/head This commit looks good Details
2020-08-20 09:50:22 +02:00
Joan Sanchez 4d8a84e774 Fixed back unit tests
gitea/salix/pipeline/head This commit looks good Details
2020-08-20 08:45:03 +02:00
Joan Sanchez 7fdfd92a1c Removed sql
gitea/salix/pipeline/head This commit looks good Details
2020-08-19 13:13:16 +02:00
Joan Sanchez f0818acf32 2387 - Fixed error when deleting a zone
gitea/salix/pipeline/head This commit looks good Details
2020-08-19 13:04:12 +02:00
Joan Sanchez 904db8e2f8 Merge pull request '1361 - Añadir filtro por año' (#348) from 1361-calendar_date_filter into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #348
2020-08-18 12:18:27 +00:00
Joan Sanchez a3d3ed4aba Fixed unit test
gitea/salix/pipeline/head This commit looks good Details
2020-08-18 14:14:34 +02:00
Joan Sanchez 55b3e962a4 Merge branch 'dev' into 1361-calendar_date_filter
gitea/salix/pipeline/head There was a failure building this commit Details
2020-08-18 12:03:31 +00:00
Joan Sanchez cacf562954 Audit fix
gitea/salix/pipeline/head There was a failure building this commit Details
2020-08-18 14:01:43 +02:00
Joan Sanchez 1990f5172c Removed focus
gitea/salix/pipeline/head There was a failure building this commit Details
2020-08-18 13:57:34 +02:00
Joan Sanchez 1bcf4ff8a6 Descomentado test
gitea/salix/pipeline/head There was a failure building this commit Details
2020-08-18 13:55:38 +02:00
Joan Sanchez 540d5e9e71 Fixed errors
gitea/salix/pipeline/head There was a failure building this commit Details
2020-08-18 13:50:08 +02:00
Joan Sanchez 911ef3f11a Merge pull request '2324-ticket_problems' (#354) from 2324-ticket_problems into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #354
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2020-08-18 08:34:15 +00:00
Joan Sanchez 4ef540c8f3 Changed download path
gitea/salix/pipeline/head This commit looks good Details
2020-08-18 09:48:02 +02:00
Joan Sanchez 2a7495bac9 Image queue fixes
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2020-08-18 09:45:26 +02:00
Joan Sanchez 1ef6637ad3 Added clearInterval()
gitea/salix/pipeline/head This commit looks good Details
2020-08-18 08:37:39 +02:00
Joan Sanchez 8968f41b75 Queue changes
gitea/salix/pipeline/head This commit looks good Details
2020-08-18 08:10:40 +02:00
Joan Sanchez 10aed9d40d Merge branch 'dev' into 2324-ticket_problems
gitea/salix/pipeline/head This commit looks good Details
2020-08-17 12:33:05 +00:00
Joan Sanchez f13c47ce6d Ticket problems filter fix
gitea/salix/pipeline/head This commit looks good Details
2020-08-17 14:31:26 +02:00
Carlos Jimenez Ruiz dee3ab166a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2341-Entry_lastBuy_section 2020-08-17 14:18:44 +02:00