Commit Graph

10249 Commits

Author SHA1 Message Date
Carlos Jimenez Ruiz 6f0c48847a Merge branch 'dev' into 2815-ticket_without_state
gitea/salix/pipeline/head This commit looks good Details
2021-04-08 11:53:25 +00:00
Carlos Jimenez Ruiz 68fa14ca51 Merge pull request '2859 - Force translation for SMS' (#599) from 2859-sms_remove_hours into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #599
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2021-04-08 11:53:02 +00:00
Joan Sanchez af0307a419 2859 - Force translation for SMS
gitea/salix/pipeline/head This commit looks good Details
2021-04-08 13:39:11 +02:00
Joan Sanchez 418d7a2d12 Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2021-04-07 14:14:31 +02:00
Joan Sanchez e40911e833 2815 - Fix ticket without state
gitea/salix/pipeline/head This commit looks good Details
2021-04-07 13:39:36 +02:00
Joan Sanchez 465955d0c5 2483 - Added replyTo param when sending an email to client
gitea/salix/pipeline/head There was a failure building this commit Details
2021-04-07 13:09:53 +02:00
Joan Sanchez f5b95a0c4d Merge pull request '2631 - Notify claim status change to incomplete' (#596) from 2631-notify_incomplete into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #596
2021-04-07 09:54:50 +00:00
Carlos Jimenez Ruiz 2d041142c3 Merge branch 'dev' into 2631-notify_incomplete
gitea/salix/pipeline/head This commit looks good Details
2021-04-07 09:30:05 +00:00
Carlos Jimenez Ruiz fba7d4b1c4 Merge pull request '2615-waste_detail' (#595) from 2615-waste_detail into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #595
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2021-04-07 09:27:13 +00:00
Joan Sanchez 1a572ae256 Added english translation
gitea/salix/pipeline/head This commit looks good Details
2021-04-07 11:25:13 +02:00
Joan Sanchez 93399d6de6 Updated description
gitea/salix/pipeline/head This commit looks good Details
2021-04-07 11:18:44 +02:00
Joan Sanchez 6c36ab3905 Removed back button
gitea/salix/pipeline/head This commit looks good Details
2021-04-07 10:47:31 +02:00
Joan Sanchez d4c6695629 2631 - Notify status change to incomplete
gitea/salix/pipeline/head This commit looks good Details
2021-04-07 07:45:00 +02:00
Joan Sanchez 65dc0e3780 2615 - Waste breakdown
gitea/salix/pipeline/head This commit looks good Details
2021-04-06 13:46:38 +02:00
Joan Sanchez 5ef3ff40ce Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2615-waste_detail 2021-04-06 09:14:11 +02:00
Joan Sanchez a2144405ab Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-04-02 17:04:37 +02:00
Joan Sanchez 9bbf43c590 Replace http with https
gitea/salix/pipeline/head This commit looks good Details
2021-04-02 14:34:16 +02:00
Javi Gallego 63ec7677c6 test ok
gitea/salix/pipeline/head This commit looks good Details
2021-04-01 18:43:28 +02:00
Javi Gallego 47a3779c45 Merge branch 'dev' into 2873-create-supplier-beneficiary
gitea/salix/pipeline/head This commit looks good Details
2021-04-01 18:39:18 +02:00
Javi Gallego 336472291d test
gitea/salix/pipeline/head This commit looks good Details
2021-04-01 18:38:40 +02:00
Javi Gallego eec901684a reviso test
gitea/salix/pipeline/head This commit looks good Details
2021-04-01 17:36:27 +02:00
Carlos Jimenez Ruiz be1400ef51 Merge pull request '2866 - Limit descriptor photo size to width 100%' (#592) from 2866-descriptor_photo into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #592
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2021-04-01 14:55:17 +00:00
Carlos Jimenez Ruiz 893de63f74 Merge branch 'dev' into 2866-descriptor_photo
gitea/salix/pipeline/head This commit looks good Details
2021-04-01 14:51:05 +00:00
Carlos Jimenez Ruiz 129d3373d0 Merge pull request 'entry index changes' (#515) from 2589-entry_index into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #515
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2021-04-01 14:49:44 +00:00
Joan Sanchez b4cceff4cb 2866 - Limit descriptor photo size to width 100%
gitea/salix/pipeline/head This commit looks good Details
2021-04-01 14:20:00 +02:00
Joan Sanchez fa0b01a0d5 Fixed buttons alignment
gitea/salix/pipeline/head This commit looks good Details
2021-04-01 14:00:34 +02:00
Joan Sanchez 91c26ee5a5 Removed filter import
gitea/salix/pipeline/head This commit looks good Details
2021-04-01 13:55:01 +02:00
Joan Sanchez 389f10bda0 Removed entry import
gitea/salix/pipeline/head This commit looks good Details
2021-04-01 13:51:55 +02:00
Joan Sanchez f89419962d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2589-entry_index 2021-04-01 13:42:38 +02:00
Joan Sanchez 21de6a0f7c Updated readme
gitea/salix/pipeline/head This commit looks good Details
2021-04-01 13:34:21 +02:00
Joan Sanchez a84555430f Updated readme extensions
gitea/salix/pipeline/head This commit looks good Details
2021-04-01 13:32:42 +02:00
Javi Gallego 67f822ebdc Merge branch 'dev' into 2873-create-supplier-beneficiary
gitea/salix/pipeline/head This commit looks good Details
2021-04-01 13:14:26 +02:00
Joan Sanchez 5712f1c43b Changes 2021-04-01 13:12:02 +02:00
Joan Sanchez 41ee6e70a5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2615-waste_detail 2021-04-01 08:42:02 +02:00
Joan Sanchez a799458c50 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-04-01 08:29:45 +02:00
Joan Sanchez 4b9b29fc94 Hotfix: Removed default nRefs value for image model
gitea/salix/pipeline/head This commit looks good Details
2021-04-01 07:58:39 +02:00
Carlos Jimenez Ruiz b72357cb7d Merge pull request '2785-getBalance-tests' (#588) from 2785-getBalance-tests into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #588
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2021-03-31 07:17:32 +00:00
Carlos Jimenez Ruiz b1b2a1ee19 Merge branch 'dev' into 2785-getBalance-tests
gitea/salix/pipeline/head This commit looks good Details
2021-03-31 07:14:13 +00:00
Javi Gallego a034220ffa cambio descripcion del it
gitea/salix/pipeline/head This commit looks good Details
2021-03-31 07:54:50 +02:00
Javi Gallego c036c7c7fe model ok
gitea/salix/pipeline/head This commit looks good Details
2021-03-31 07:33:00 +02:00
Carlos Jimenez Ruiz 6a28318ed5 Merge pull request 'width changed from medium to large' (#591) from 2870-supplier_contact_width into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #591
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2021-03-30 16:14:16 +00:00
Carlos Jimenez Ruiz 694055f85c width changed from medium to large
gitea/salix/pipeline/head This commit looks good Details
2021-03-30 16:19:54 +02:00
Carlos Jimenez Ruiz 2bb050c535 Merge pull request '2869-getSuggestedTickets_started_to_created' (#589) from 2869-getSuggestedTickets_started_to_created into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #589
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2021-03-30 14:08:09 +00:00
Carlos Jimenez Ruiz 75155c796d removed unused code
gitea/salix/pipeline/head This commit looks good Details
2021-03-30 15:59:30 +02:00
Carlos Jimenez Ruiz 4207bfcc70 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2869-getSuggestedTickets_started_to_created
gitea/salix/pipeline/head This commit looks good Details
2021-03-30 15:19:38 +02:00
Carlos Jimenez Ruiz 9589f2efa7 Merge pull request '2855-claim_module_backend_transactions' (#587) from 2855-claim_module_backend_transactions into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #587
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2021-03-30 13:17:26 +00:00
Carlos Jimenez Ruiz 061626e521 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2855-claim_module_backend_transactions
gitea/salix/pipeline/head This commit looks good Details
2021-03-30 14:51:05 +02:00
Carlos Jimenez Ruiz ed5c5feea7 Merge pull request '2871-export_db' (#590) from 2871-export_db into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #590
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2021-03-30 12:48:04 +00:00
Carlos Jimenez Ruiz d69bc13170 Merge branch '2871-export_db' of https://gitea.verdnatura.es/verdnatura/salix into 2871-export_db
gitea/salix/pipeline/head This commit looks good Details
2021-03-30 14:43:42 +02:00
Carlos Jimenez Ruiz 847e0bd2c8 tests fixed for production sneaky changes 2021-03-30 14:43:21 +02:00