Commit Graph

10269 Commits

Author SHA1 Message Date
Jorge Padawan a9eb0355d4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2650-add_button_edit_on_summaries
gitea/salix/pipeline/head This commit looks good Details
2021-01-12 09:17:53 +01:00
Joan Sanchez 880093921e Vn-th sortable icon hotfix
gitea/salix/pipeline/head This commit looks good Details
2021-01-12 07:52:11 +01:00
Joan Sanchez 4435f5e1b0 Vn-th sortable icon hotfix
gitea/salix/pipeline/head This commit looks good Details
2021-01-12 07:45:13 +01:00
Jorge Padawan 809811ea10 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2650-add_button_edit_on_summaries
gitea/salix/pipeline/head This commit looks good Details
2021-01-12 07:40:10 +01:00
Jorge Padawan f45aa7937d Added conditionals with rols to display or not the icons with link 2021-01-12 07:39:12 +01:00
Javi Gallego 6acfe7f1cf minorBugs
gitea/salix/pipeline/head This commit looks good Details
2021-01-11 17:18:37 +01:00
Javi Gallego d3b5300553 test
gitea/salix/pipeline/head This commit looks good Details
2021-01-11 16:30:14 +01:00
Joan Sanchez ac12d72c65 Merge pull request '2691 - Added "or" between date ranges and scope days' (#505) from 2691-ticket_scope_days into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #505
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2021-01-11 14:13:49 +00:00
Joan Sanchez 7568a1c066 Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2021-01-11 14:54:24 +01:00
Bernat Exposito db956ab64a delete sql
gitea/salix/pipeline/head This commit looks good Details
2021-01-11 11:30:26 +01:00
Bernat Exposito 8b3af8851c fix trigger itemTag 2021-01-11 11:29:47 +01:00
Jorge Padawan af55e2cc32 Add tooltip and modified sref for previews 2021-01-11 10:36:20 +01:00
Bernat Exposito 5f1cdc790a Merge branch '2609-travel_index_addEntry' of https://gitea.verdnatura.es/verdnatura/salix into 2609-travel_index_addEntry
gitea/salix/pipeline/head This commit looks good Details
2021-01-11 10:20:59 +01:00
Bernat Exposito a6c330cf49 change triger itemTag 2021-01-11 10:20:40 +01:00
Joan Sanchez 035bdfb1ad Rounded box
gitea/salix/pipeline/head This commit looks good Details
2021-01-11 10:08:33 +01:00
Bernat Exposito 0e0ce9f3e9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2609-travel_index_addEntry 2021-01-11 09:44:20 +01:00
Joan Sanchez b5676d40b4 Merge branch 'dev' into 2691-ticket_scope_days
gitea/salix/pipeline/head This commit looks good Details
2021-01-11 08:09:09 +00:00
Joan Sanchez ffdc753ad4 2691 - Added "or" between date ranges and scope days
gitea/salix/pipeline/head This commit looks good Details
2021-01-11 08:48:53 +01:00
Javi Gallego ea6e234cde minor fixes
gitea/salix/pipeline/head This commit looks good Details
2021-01-11 08:01:57 +01:00
Jorge Padawan b8827ec63d Fix problems with ACL and the autocomplete of bank entity
gitea/salix/pipeline/head There was a failure building this commit Details
2021-01-08 16:45:20 +01:00
Jorge Padawan 403964934d Change order of iban and entity name 2021-01-08 16:01:13 +01:00
Jorge Padawan 5a30bf5fa4 2650 add links to edit on summaries 2021-01-08 15:43:33 +01:00
Jorge Padawan ef4f7d7ca9 2650 new style icon edit button for summaries 2021-01-08 15:42:43 +01:00
Javi Gallego 6c2138a69a Merge branch 'dev' into 2517-clientBalanceCompensaciones
gitea/salix/pipeline/head This commit looks good Details
2021-01-08 15:24:05 +01:00
Javi Gallego a9ec319d4f test 2021-01-08 15:22:41 +01:00
Javi Gallego eecbdec7ad Merge pull request 'export table payment' (#504) from 2713-export_payment into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #504
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2021-01-08 14:20:46 +00:00
Javi Gallego 6184681d7b Merge branch 'dev' into 2713-export_payment
gitea/salix/pipeline/head This commit looks good Details
2021-01-08 13:52:00 +00:00
Joan Sanchez f8ba2534cc 2691 - Scope days changes
gitea/salix/pipeline/head This commit looks good Details
2021-01-08 14:32:48 +01:00
Jorge Padawan 5e201419f8 Second step, add component bankEntity 2021-01-08 10:46:50 +01:00
Bernat Exposito a2550ce128 export table payment
gitea/salix/pipeline/head This commit looks good Details
2021-01-08 10:24:41 +01:00
Joan Sanchez 1cc2710231 Fixes
gitea/salix/pipeline/head This commit looks good Details
2021-01-08 10:16:38 +01:00
Carlos Jimenez Ruiz 418774e5e0 Merge pull request '2605 - Ticket request send chat notification' (#500) from 2605-ticket_request_chat into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #500
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2021-01-08 09:07:17 +00:00
Carlos Jimenez Ruiz c623a5d1e4 Merge branch 'dev' into 2605-ticket_request_chat
gitea/salix/pipeline/head This commit looks good Details
2021-01-08 09:00:23 +00:00
Javi Gallego b5cd4e3c9f Merge branch 'dev' into 2517-clientBalanceCompensaciones
gitea/salix/pipeline/head This commit looks good Details
2021-01-08 09:44:13 +01:00
Javi Gallego 1884dc8789 fixtures
gitea/salix/pipeline/head This commit looks good Details
2021-01-08 09:43:36 +01:00
Jorge Padawan 344840d2c9 First step add-button-edit-summaries 2021-01-08 08:43:28 +01:00
Jorge Padawan 31f18db72d first step bankEntity 2021-01-07 15:14:50 +01:00
Jorge Padawan 6017894ba9 first step bankEntity 2021-01-07 15:14:38 +01:00
Joan Sanchez 88b2041fde Changed order
gitea/salix/pipeline/head This commit looks good Details
2021-01-07 14:33:42 +01:00
Joan Sanchez 7172d6bcd1 Merge branch 'dev' into 2609-travel_index_addEntry
gitea/salix/pipeline/head This commit looks good Details
2021-01-07 13:32:37 +00:00
Joan Sanchez 56925be41f 2708 - Extra community changes
gitea/salix/pipeline/head This commit looks good Details
2021-01-07 14:21:17 +01:00
Carlos Jimenez Ruiz 2a948ddc33 Merge pull request 'refactor tag fixtures' (#502) from 2707-fixtures_tag into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #502
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2021-01-07 12:43:37 +00:00
Bernat Exposito 779b229dfc refactor tag fixtures
gitea/salix/pipeline/head This commit looks good Details
2021-01-07 12:11:14 +01:00
Javi Gallego c0cc91b6c3 Merge branch 'dev' into 2517-clientBalanceCompensaciones
gitea/salix/pipeline/head This commit looks good Details
2021-01-07 09:11:34 +01:00
Bernat Exposito 490c05f8a9 Merge pull request 'export production' (#501) from 2704-export_production into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #501
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2021-01-07 07:50:57 +00:00
Bernat Exposito 81edd9e57d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2704-export_production
gitea/salix/pipeline/head This commit looks good Details
2021-01-07 08:45:53 +01:00
Bernat Exposito 6179921978 export production
gitea/salix/pipeline/head This commit looks good Details
2021-01-07 08:37:56 +01:00
Joan Sanchez c454273405 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2021-01-06 12:44:28 +01:00
Joan Sanchez e5b13267e2 2605 - Ticket request send chat notification
gitea/salix/pipeline/head This commit looks good Details
2021-01-05 15:03:35 +01:00
Joan Sanchez 94c8c115e5 Font hotfix
gitea/salix/pipeline/head This commit looks good Details
2021-01-05 13:51:17 +01:00