Commit Graph

834 Commits

Author SHA1 Message Date
Pau d9cf194873 fix lets
gitea/salix/pipeline/head This commit looks good Details
2023-02-03 12:38:56 +01:00
Pau a7ec8d6e69 requested changes
gitea/salix/pipeline/head This commit looks good Details
2023-02-03 12:37:55 +01:00
Pau 2e4e0b12ab fix front test not working
gitea/salix/pipeline/head This commit looks good Details
2023-01-27 12:53:27 +01:00
Pau baa7aa45b2 refs #4074 @2h new directive for the acls
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-23 14:42:38 +01:00
Pau 521586caed refs #4074 @2h change the acl service to take in consideration diferent permission types
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-23 12:35:03 +01:00
Pau 1572f21901 Merge branch 'dev' into 4074-download-user-ACL
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-23 11:30:51 +01:00
Pau 838df9e85a refs #4074 @4h acl model and methods in directive
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-23 11:29:58 +01:00
Joan Sanchez c489c4c6a9 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-13 08:55:01 +01:00
Joan Sanchez 882cf6b9c1 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix 2023-01-12 08:36:24 +01:00
Vicent Llopis eb3ed95b22 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2952-ticket.sale-checked 2023-01-10 08:32:44 +01:00
Vicent Llopis fa58ac2462 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2952-ticket.sale-checked
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-03 09:13:47 +01:00
Joan Sanchez 674fe49058 fix(icons): prevent icon translation when using google translator
gitea/salix/pipeline/head There was a failure building this commit Details
Refs: 5044
2023-01-03 08:41:58 +01:00
Pau db7fc594c8 refs #4074 @1h add method to retrieve a object containing all the roles
gitea/salix/pipeline/head This commit looks good Details
2022-12-29 13:50:49 +01:00
Pau 3c2981953d Merge branch 'dev' into 4074-download-user-ACL
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-29 10:04:10 +01:00
Alex Moreno 990bcc0f6e feat(app): only use ui-view for routing
gitea/salix/pipeline/head This commit looks good Details
2022-12-28 11:18:53 +01:00
Pau 487c687666 methods to use en the angular service 2022-12-27 09:05:50 +01:00
Pau 93de49eb98 created new service and removed unused back route 2022-12-26 12:36:02 +01:00
Vicent Llopis 682b6d8961 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2952-ticket.sale-checked
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-23 09:59:21 +01:00
Joan Sanchez 606bacbad7 Merge branch 'dev' into 4531-monitor_duplicates
gitea/salix/pipeline/head This commit looks good Details
2022-12-22 10:37:48 +00:00
Vicent Llopis 8880a83b89 feat: añadido saleTracking
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-21 15:03:41 +01:00
Alex Moreno 27288d011d fix(searchBar): applyParams
gitea/salix/pipeline/head This commit looks good Details
2022-12-21 15:01:05 +01:00
Joan Sanchez c063c0e72f fix(pagination): duplicated rows on paginate
gitea/salix/pipeline/head This commit looks good Details
Refs: #4531
2022-12-20 09:48:41 +01:00
Alexandre Riera 98c9e0ac50 refs #4962 autoload added and second header
gitea/salix/pipeline/head This commit looks good Details
2022-12-16 13:42:23 +01:00
Joan Sanchez a86636bee4 Use proper module codes
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-14 13:49:49 +01:00
Alex Moreno d9e4ff6772 fix: use $location
gitea/salix/pipeline/head This commit looks good Details
2022-11-28 11:48:25 +01:00
Alex Moreno 804db15ece Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password 2022-11-28 07:53:51 +01:00
Vicent Llopis 9a47b2fea4 Merge branch 'dev' into 4682-searchbar_filter
gitea/salix/pipeline/head This commit looks good Details
2022-11-23 10:00:27 +00:00
Alex Moreno 314e98b838 fix: nested router
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-22 14:57:52 +01:00
Alex Moreno 660648e01f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password 2022-11-22 14:35:25 +01:00
Vicent Llopis 89141419c1 fix: merge filter
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-22 10:36:40 +01:00
Alexandre Riera 2651081838 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4700-split-tour
gitea/salix/pipeline/head This commit looks good Details
2022-11-22 10:15:31 +01:00
Vicent Llopis cac8879ec7 fix: solo vuelve a buscar el mismo filtro en caso de que se encuentre en un index
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-22 09:22:06 +01:00
Vicent Llopis d4712e27c3 fix: no repite la llamada filter cada vez q cambias de seccion
gitea/salix/pipeline/head This commit looks good Details
2022-11-17 11:31:36 +01:00
Alexandre Riera 7dd87b1ea8 refs #4700 icons future
gitea/salix/pipeline/head This commit looks good Details
2022-11-14 09:56:23 +01:00
Alex Moreno 4c216c4556 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
gitea/salix/pipeline/head This commit is unstable Details
2022-11-10 14:40:55 +01:00
Alexandre Riera 897a7d079d Merge branch 'dev' into 2596-arrastrar-ficheros
gitea/salix/pipeline/head This commit looks good Details
2022-11-10 07:40:10 +00:00
Alex Moreno fcf46ade7d feat: reset-password section
gitea/salix/pipeline/head This commit is unstable Details
2022-11-07 15:15:00 +01:00
Alexandre Riera 07b2ac99ce refs #2596 css corregido
gitea/salix/pipeline/head This commit looks good Details
2022-11-03 15:45:36 +01:00
Alexandre Riera f3085bef66 refs #2596 css actualizado
gitea/salix/pipeline/head This commit looks good Details
2022-11-03 15:28:52 +01:00
Alex Moreno 36894c31de Merge branch 'dev' into 4077-login_recover-password
gitea/salix/pipeline/head This commit is unstable Details
2022-11-03 08:39:04 +00:00
Alexandre Riera e1eeb81696 refs #2596 tabulación y css
gitea/salix/pipeline/head This commit looks good Details
2022-11-03 08:18:24 +01:00
Alex Moreno 9891f7060d fix(smart-table): monitor only ticketFilter use url and add ?q in routes
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 09:40:09 +01:00
Alexandre Riera aaaa73644d refs #2596 drag and drop implementado
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 08:18:58 +01:00
Alex Moreno f8f44aaae7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4159-tableQ_filter 2022-11-02 07:37:28 +01:00
Alex Moreno 755a1667dc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
gitea/salix/pipeline/head This commit is unstable Details
2022-11-02 07:35:04 +01:00
Alex Moreno 3fd10dfc64 Merge branch 'dev' into 4075-ticket_boxing
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 09:58:17 +00:00
Alex Moreno 107a0a6555 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4159-tableQ_filter
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 11:35:12 +02:00
Alex Moreno bcfbeb7032 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password 2022-10-21 12:41:39 +02:00
Alex Moreno 0bc018ec02 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-17 14:06:31 +02:00
Pau cf50c4690a Merge branch 'dev' into 4153-supplier.fiscal-data
gitea/salix/pipeline/head This commit looks good Details
2022-10-17 08:41:39 +00:00