jorgebl
|
5e549b4d0d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2776-add_boss_summary
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-23 10:42:19 +01:00 |
Carlos Jimenez Ruiz
|
2e838d9b97
|
Merge pull request '2764-Ticket_sale_consignee' (#537) from 2764-Ticket_sale_consignee into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #537
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
|
2021-02-22 11:59:43 +00:00 |
jorgebl
|
77d8388c43
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2764-Ticket_sale_consignee
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-22 09:59:38 +01:00 |
jorgebl
|
8deb11d333
|
Added boss on basic data and summary
|
2021-02-19 17:45:45 +01:00 |
Joan Sanchez
|
ddb443ab8f
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-18 13:17:34 +01:00 |
Joan Sanchez
|
8ddbcc24a7
|
Added priority to image download queue
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-18 13:03:49 +01:00 |
Joan Sanchez
|
bc9168aaa0
|
Merge pull request '2583-create_account_supplier' (#552) from 2583-create_account_supplier into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #552
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2021-02-17 15:22:43 +00:00 |
Joan Sanchez
|
5b40edb284
|
Line break
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-17 16:11:34 +01:00 |
Jorge Padawan
|
aa29f546ae
|
put global bank entity model
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-17 15:05:17 +01:00 |
Joan Sanchez
|
68dc2488ca
|
Updated sharp version
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-17 14:38:47 +01:00 |
Jorge Padawan
|
d5e53909c6
|
Fixed test
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-02-17 13:32:09 +01:00 |
Jorge Padawan
|
29ca6c52af
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2583-create_account_supplier
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-02-17 12:32:26 +01:00 |
Jorge Padawan
|
f10092d2cf
|
Added autocomplete on bank entity
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-02-17 12:07:04 +01:00 |
Jorge Padawan
|
2296727f8d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2764-Ticket_sale_consignee
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-16 08:32:24 +01:00 |
Carlos Jimenez Ruiz
|
661950f94a
|
Merge pull request 'refactor-loopback-context' (#549) from refactor-loopback-context into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #549
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
|
2021-02-15 15:57:45 +00:00 |
Javi Gallego
|
7c0e690f8f
|
sin console
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-15 14:34:13 +01:00 |
Jorge Padawan
|
bf3391f7f2
|
added test of lastActiveTickets
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-15 13:20:17 +01:00 |
Jorge Padawan
|
4e36fd118e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2764-Ticket_sale_consignee
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-15 10:45:46 +01:00 |
Javi Gallego
|
737f5a1c91
|
Merge branch 'dev' into refactor-loopback-context
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-12 18:11:50 +01:00 |
Carlos Jimenez Ruiz
|
c6333e7982
|
Merge pull request '2603-travel_create_autocomplete_date' (#547) from 2603-travel_create_autocomplete_date into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #547
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
|
2021-02-12 16:32:51 +00:00 |
Jorge Padawan
|
366f241b3f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2603-travel_create_autocomplete_date
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-12 17:04:10 +01:00 |
Carlos Jimenez Ruiz
|
e049d6ccfb
|
Merge pull request 'Added permissions to role administrative' (#543) from 2782-Add_permisions_administrative_entry_module into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #543
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
|
2021-02-12 16:01:39 +00:00 |
Jorge Padawan
|
2b8a4ca62e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2603-travel_create_autocomplete_date
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-12 16:55:15 +01:00 |
Jorge Padawan
|
bff88a13c8
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2782-Add_permisions_administrative_entry_module
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-12 16:42:39 +01:00 |
Jorge Padawan
|
4bcb948aff
|
Updated code for better read
|
2021-02-12 16:41:29 +01:00 |
Jorge Padawan
|
a2ad1887a4
|
ACL bug fixed + package lock updated
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-12 15:20:30 +01:00 |
Jorge Padawan
|
4b1d86c9b1
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2583-create_supplierAccount_section
|
2021-02-12 15:12:15 +01:00 |
Jorge Benedito
|
4e88f6d8c3
|
Merge pull request 'description clears before changes' (#548) from e2e_quick_fix into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
Reviewed-on: #548
Reviewed-by: Jorge Benedito <jorgebl@verdnatura.es>
|
2021-02-12 14:10:32 +00:00 |
Carlos Jimenez Ruiz
|
b3b99e651b
|
description clears before changes
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-12 15:02:30 +01:00 |
Javi Gallego
|
a3d7fc9313
|
done
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-12 13:18:02 +01:00 |
Jorge Padawan
|
1512a34a73
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2764-Ticket_sale_consignee
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-12 11:57:54 +01:00 |
Jorge Padawan
|
1ef2c2ff0a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2782-Add_permisions_administrative_entry_module
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-12 11:48:00 +01:00 |
Jorge Padawan
|
86580727e5
|
Requested changes resolved
|
2021-02-12 11:47:53 +01:00 |
Jorge Padawan
|
8800f76684
|
Translations recovered
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-12 11:35:33 +01:00 |
Jorge Padawan
|
dad3e7c155
|
Requested changes realized
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-12 11:27:24 +01:00 |
Jorge Padawan
|
2a2009b287
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2603-travel_create_autocomplete_date
|
2021-02-12 11:25:44 +01:00 |
Carlos Jimenez Ruiz
|
d3d94e8925
|
Merge pull request '2783-itemPriceFixed_advanced_search' (#546) from 2783-itemPriceFixed_advanced_search into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #546
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
|
2021-02-12 09:24:13 +00:00 |
Jorge Padawan
|
211ffb8f30
|
Delete supplierAccount from this branch
|
2021-02-12 09:50:23 +01:00 |
Jorge Padawan
|
433a0094c4
|
Fixed errors detected
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-12 09:11:43 +01:00 |
Jorge Padawan
|
eb3ac6de72
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2603-travel_create_autocomplete_date
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-11 18:48:58 +01:00 |
Jorge Padawan
|
53b06bc464
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2783-itemPriceFixed_advanced_search
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-11 18:41:41 +01:00 |
Jorge Padawan
|
1634c81682
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2782-Add_permisions_administrative_entry_module
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-11 18:38:27 +01:00 |
Jorge Padawan
|
0c335b9705
|
Put bankEntity on global components, and fixed conflict updates
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-11 18:35:23 +01:00 |
Jorge Padawan
|
a1ca8d90c3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2583-create_supplierAccount_section
|
2021-02-11 16:07:04 +01:00 |
Joan Sanchez
|
ec41fca964
|
Merge pull request 'both created tickets are now discarded after tests' (#544) from 2792-fix_backend_unit_test into dev
Reviewed-on: #544
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2021-02-11 14:07:49 +00:00 |
Carlos Jimenez Ruiz
|
3374356d58
|
both created tickets are now discarded after tests
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-11 11:53:30 +01:00 |
Jorge Padawan
|
f146c6a279
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2783-itemPriceFixed_advanced_search
|
2021-02-11 11:15:10 +01:00 |
Jorge Padawan
|
745d25f0c7
|
Showed filter on browser search bar
|
2021-02-11 11:14:52 +01:00 |
Jorge Padawan
|
31e5d3fd1e
|
Created test and optimized sql query
|
2021-02-11 08:32:16 +01:00 |
Jorge Padawan
|
bb02a0de6b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2603-travel_create_autocomplete_date
|
2021-02-10 16:59:29 +01:00 |