 Sergio De la torre
|
38d940fde4
|
refs #6276 feat:silex →salix
|
2024-03-14 07:10:36 +01:00 |
|
Sergio De la torre
|
817ac7750b
|
refs #6658 feat:tests
|
2024-03-12 12:27:25 +01:00 |
|
Sergio De la torre
|
281f33047a
|
refs #4683 feat:webFragment
|
2024-03-12 11:27:07 +01:00 |
|
Sergio De la torre
|
982713f4a2
|
refs #6193 feat:url
|
2024-03-12 11:24:42 +01:00 |
|
Sergio De la torre
|
66ee03032f
|
refs #6193 feat:url
|
2024-03-12 11:24:28 +01:00 |
|
Sergio De la torre
|
317aae6286
|
refs #4021 feat:packaging
|
2024-03-12 07:32:12 +01:00 |
|
Sergio De la torre
|
669b05826e
|
Merge branch '4021-gestion_embalajes' into dev-embalajes
# Conflicts:
# .idea/deploymentTargetDropDown.xml
# .idea/workspace.xml
# app/build.gradle
# app/src/main/java/es/verdnatura/domain/SalixService.kt
# app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt
# app/src/main/java/es/verdnatura/presentation/common/UIExtensions.kt
# app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/ObservFragment.kt
# app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingCountFragment.kt
# app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingSummaryFragment.kt
# app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingViewModel/SupplierViewModel.kt
# app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/SupplierFragment.kt
# app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt
# app/src/main/res/layout/fragment_packaging.xml
# app/src/main/res/layout/fragment_packaging_obs.xml
# app/src/main/res/layout/fragment_packaging_summary.xml
# app/src/main/res/layout/item_image_row.xml
# app/src/main/res/layout/item_itemsupplier_row.xml
# app/src/main/res/values-es/strings.xml
# app/src/main/res/values-fr/strings.xml
# app/src/main/res/values-pt/strings.xml
# app/src/main/res/values/strings.xml
|
2024-03-06 14:16:36 +01:00 |
|
Sergio De la torre
|
86bcb7e3dd
|
varios
|
2024-03-06 13:48:24 +01:00 |
|
Sergio De la torre
|
754d4c41c3
|
refs #5890 feat:itemShelvingSale
|
2024-03-06 13:33:59 +01:00 |
|
Sergio De la torre
|
f163ac5b11
|
refs #6078 feat:activityWorker
|
2024-03-06 13:28:40 +01:00 |
|
Sergio De la torre
|
bfcf7916b4
|
refs #6607 feat:checking_boxes
|
2024-03-06 13:27:33 +01:00 |
|
Sergio De la torre
|
8dd4a6dacf
|
version 24.8Beta
|
2024-03-06 12:49:55 +01:00 |
|
Sergio De la torre
|
47a768004b
|
refs #6964 feat:hasOlderItem
|
2024-03-06 12:49:02 +01:00 |
|
Sergio De la torre
|
e67b6fbf12
|
refs #6964 refactor:settings
|
2024-03-06 12:46:50 +01:00 |
|
Sergio De la torre
|
220c8e8062
|
refs #6560 refactor:settings
|
2024-03-06 12:43:30 +01:00 |
|
Sergio De la torre
|
0f4ed51427
|
refs #6560 refactor:settings
|
2024-03-06 10:51:08 +01:00 |
|
Sergio De la torre
|
24fd2152bb
|
refs #6284 feat:update and review xml
|
2024-03-01 10:37:53 +01:00 |
|
Sergio De la torre
|
27267c08a6
|
refs #6284 feat:update and review xml
|
2024-03-01 10:37:04 +01:00 |
|
Sergio De la torre
|
f5def21b26
|
refs #6284 feat:update and review xml
|
2024-02-29 09:23:31 +01:00 |
|
Sergio De la torre
|
5213ca1672
|
modify gitIgnore
|
2024-02-29 09:19:16 +01:00 |
|
Sergio De la torre
|
2082f7a9bc
|
modify gitIgnore
|
2024-02-29 09:17:31 +01:00 |
|
Sergio De la torre
|
a9447b7af8
|
refs #6284 feat:update && deprecated
|
2024-02-29 09:09:14 +01:00 |
|
Sergio De la torre
|
ff00e0a5ef
|
refs #6284 feat:update && deprecated
|
2024-02-29 08:46:54 +01:00 |
|
Sergio De la torre
|
6c2855a7a4
|
refs #5890 feat:itemShelvingSale
|
2024-02-28 09:41:39 +01:00 |
|
Sergio De la torre
|
ce33e2cb15
|
refs #6188 feat:UI changes
|
2024-02-28 09:40:14 +01:00 |
|
Sergio De la torre
|
1dc6f3fd80
|
refs #6295 feat:serialNumber
|
2024-02-28 09:39:49 +01:00 |
|
Sergio De la torre
|
f36ff5233e
|
refs #6413 feat:refactor Ubicador
|
2024-02-28 09:39:10 +01:00 |
|
Sergio De la torre
|
c9624beb7f
|
refs #6295 feat:serialNumber
|
2024-02-28 09:37:38 +01:00 |
|
Sergio De la torre
|
2c476e0bf2
|
refs #6284 refactor:deprecated
|
2024-02-28 09:35:52 +01:00 |
|
Sergio De la torre
|
51160cd1d3
|
refs #6284 refactor:deprecated
|
2024-02-28 09:33:56 +01:00 |
|
Sergio De la torre
|
37751d99dd
|
refs #6786 feat:inventary parking
|
2024-02-27 12:07:03 +01:00 |
|
Sergio De la torre
|
e85061f348
|
refs #6411 feat:update libraries
|
2024-02-27 12:02:52 +01:00 |
|
Sergio De la torre
|
e85939e211
|
refs #6411 feat:update libraries
|
2024-02-27 12:00:33 +01:00 |
|
Sergio De la torre
|
7571e7f6ea
|
refs #6078 feat:workerActivity
|
2024-02-27 10:45:17 +01:00 |
|
Sergio De la torre
|
5a7afb66b6
|
version 24.8beta
|
2024-02-27 09:48:47 +01:00 |
|
Sergio De la torre
|
9818b0babe
|
refs #6531 feat:last tickets
|
2024-02-27 09:46:34 +01:00 |
|
Sergio De la torre
|
3afe9de1c9
|
refs #6413 feat:refactor Ubicador
|
2024-02-27 09:44:48 +01:00 |
|
Sergio De la torre
|
cb80d58006
|
refs #6284 feat:update and review xml
|
2024-02-27 09:44:17 +01:00 |
|
Sergio De la torre
|
1bfb376e19
|
refs #6531 feat:last tickets
|
2024-02-27 09:41:47 +01:00 |
|
Sergio De la torre
|
256f449630
|
refs #6531 feat:last tickets
|
2024-02-27 09:40:45 +01:00 |
|
Sergio De la torre
|
9bf43e6dd0
|
refs #6413 feat:refactor ubicador
|
2024-02-27 09:39:01 +01:00 |
|
Sergio De la torre
|
f8a17deded
|
refs #6531 feat:last tickets
|
2024-02-27 09:37:36 +01:00 |
|
Sergio De la torre
|
93ad15685f
|
refs #6188 feat:UI changes
|
2024-02-21 12:46:58 +01:00 |
|
Sergio De la torre
|
131dd2421b
|
refs #6188 feat:UI changes
|
2024-02-21 12:45:37 +01:00 |
|
Sergio De la torre
|
9cda22a4d9
|
refs #6004 feat:preferences by dataStore
|
2024-02-20 09:45:43 +01:00 |
|
Sergio De la torre
|
efd8ea47f5
|
refs #6413 feat:refactor Ubicador
|
2024-02-20 09:40:03 +01:00 |
|
Sergio De la torre
|
b3cd417673
|
refs #6413 feat:refactor Ubicador
|
2024-02-20 09:39:34 +01:00 |
|
Sergio De la torre
|
985a63b9c6
|
refs #6411 feat:update libraries
|
2024-02-20 09:35:16 +01:00 |
|
Sergio De la torre
|
3b245cb901
|
refs #6227 feat:modify options
|
2024-02-19 11:52:09 +01:00 |
|
Sergio De la torre
|
c4ed1168ea
|
refs #5618 feat:modify strings
|
2024-02-19 08:34:07 +01:00 |