wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity
6,822 Commits 155 Branches 0 Tags 30 MiB
Commit Graph

6822 Commits

Author SHA1 Message Date
Javier Segarra 0fae36c239 Merge branch 'dev' into 7679_improve_newPostcode_form 2024-10-14 09:01:15 +00:00
Jorge Penadés 12392444b9 Merge pull request '#8019 make responsive inputs' (!812) from 8019-makeResponsiveInputs into dev 
Reviewed-on: verdnatura/salix-front#812
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-10-14 08:50:20 +00:00
Jorge Penadés fdbae5c0b5 Merge branch 'dev' into 8019-makeResponsiveInputs 2024-10-14 08:48:50 +00:00
Carlos Satorres 2edeb1043e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7767-holidayDaysExceeded 2024-10-14 10:24:49 +02:00
Carlos Satorres 85b068eddb refs #6898 #6899 hotfix lists 2024-10-14 10:21:02 +02:00
Alex Moreno 29651b425e Merge pull request 'refs: #6898 hotfix accounts' (!824) from 6898-fixSupplierAccounts into master 
Reviewed-on: verdnatura/salix-front#824
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-10-14 07:46:30 +00:00
Guillermo Bonet 787ce2fc48 feat: refs #7006 itemTypeLog added 2024-10-14 09:33:00 +02:00
Carlos Satorres 6a624b12a5 refs: #6898 hotfix accounts 2024-10-14 09:28:51 +02:00
Javier Segarra b6bce0c2f3 Merge branch 'dev' into 7679_improve_newPostcode_form 2024-10-14 09:27:56 +02:00
Javier Segarra adbb745f0f Merge pull request 'Fix own test' (!816) from fix_test_jsegarra into dev 
Reviewed-on: verdnatura/salix-front#816
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-10-14 07:24:16 +00:00
Javier Segarra 914f6022be Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into fix_test_jsegarra 2024-10-14 09:23:31 +02:00
Alex Moreno 55b9fb1a87 Merge pull request 'fix: MyEntry e2e test' (!823) from Fix-EntryTest into dev 
Reviewed-on: verdnatura/salix-front#823
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-10-14 07:10:20 +00:00
Jon Elias eebac7b36c fix: fixed e2e test 2024-10-14 08:51:26 +02:00
Jorge Penadés db5449444a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7874-addObservationType 2024-10-14 08:37:44 +02:00
Alex Moreno 64c8d264af warmFix(TravelList): add daysOnward in travelFilter 2024-10-14 07:43:29 +02:00
Javier Segarra 3d9d08146c test: refs #6943 add customer test 2024-10-11 15:46:30 +02:00
Jorge Penadés 50042ed45b feat: refs #7874 prevent submit if empty fields 2024-10-10 16:49:41 +02:00
Jorge Penadés 6d674f2a2b Merge branch 'dev' into 7874-addObservationType 2024-10-10 13:41:01 +00:00
Javier Segarra f72761f36c Merge pull request '#7404 - Rollback Style to compress spaces' (!820) from revert_css_styles into dev 
Reviewed-on: verdnatura/salix-front#820
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-10-10 12:29:40 +00:00
Javier Segarra 2ff99d3faa feat: define as global dense value 2024-10-10 13:56:14 +02:00
Javier Segarra 3dfb836f8e revert: rollback compress spacestyle 2024-10-10 13:56:11 +02:00
Jorge Penadés 5af14b1b52 chore: refs #7874 fix test 2024-10-10 12:12:03 +02:00
Jorge Penadés 44c4c378f9 chore: refs #7874 add default ob type 2024-10-10 11:02:03 +02:00
Javier Segarra 09d40b844c Merge pull request 'fix: Use geoFk for ZoneDeliveryPanel' (!819) from hotfix_zoneDeliveryPanel into master 
Reviewed-on: verdnatura/salix-front#819
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-10-10 08:33:58 +00:00
Jon Elias 8b68c0afeb fix: improve geoFk for ZoneDeliveryPanel 2024-10-10 08:30:56 +00:00
Jorge Penadés 830decb6db Merge branch 'dev' into 7874-addObservationType 2024-10-10 08:16:36 +00:00
Jon Elias e58818e891 fix: Use geoFk for ZoneDeliveryPanel 2024-10-10 08:14:24 +00:00
Jorge Penadés 9c6b4f28d7 Merge pull request '#7524 use dynamic load' (!818) from 7524-hotfix-dynamicFetch into master 
Reviewed-on: verdnatura/salix-front#818
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-10-10 08:00:56 +00:00
Jorge Penadés cfe95df9e8 fix: refs #7524 use dynamic load 2024-10-10 09:46:07 +02:00
Jorge Penadés 480f243205 Merge pull request 'feat: refs #7207 show queue' (!748) from 7207-showPbx into dev 
Reviewed-on: verdnatura/salix-front#748
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-10-10 07:20:25 +00:00
Jorge Penadés 00dc2c6edc Merge branch 'dev' into 7207-showPbx 2024-10-10 07:18:00 +00:00
Jon Elias 2dd3e09928 refactor: requested changes 2024-10-10 08:26:16 +02:00
Javier Segarra 801b6585e8 perf: refs #7679 change limit value 2024-10-09 00:44:54 +02:00
Javier Segarra 9edf35fba2 Merge branch 'dev' into 7679_improve_newPostcode_form 2024-10-08 20:27:04 +00:00
Carlos Satorres 855032e4a6 refs #7986 fix front 2024-10-08 15:36:57 +02:00
Javier Segarra 6a79746080 test: fix TicketDescriptor 2024-10-08 13:18:51 +02:00
Javier Segarra e0f60ed118 test: fix VnLocation 2024-10-08 11:07:05 +00:00
Alex Moreno b6778aaf17 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-10-08 12:24:39 +02:00
Alex Moreno 3dad27e463 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-10-08 12:21:57 +02:00
Alex Moreno 6108a26e93 Merge pull request 'fix(VnPaginate): use default value' (!805) from hotFix_VnPaginate_offset into master 
Reviewed-on: verdnatura/salix-front#805
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
 2024-10-08 10:19:32 +00:00
Alex Moreno d8a2cdc11c Merge branch 'master' into hotFix_VnPaginate_offset 2024-10-08 10:16:14 +00:00
Carlos Satorres 68a54ebe22 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-10-08 09:26:35 +02:00
Carlos Satorres 0517b39c60 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front 2024-10-08 09:26:07 +02:00
Carlos Satorres 56fff55f71 fix: unnecessary property 2024-10-08 09:26:00 +02:00
Alex Moreno bde739e7ef Merge branch 'master' into hotFix_VnPaginate_offset 2024-10-08 06:50:16 +00:00
Carlos Satorres 73e5039ec3 refs #7986 create front 2024-10-08 08:35:24 +02:00
Jorge Penadés 1723331615 Merge branch 'dev' of https: refs #7207//gitea.verdnatura.es/verdnatura/salix-front into 7207-showPbx 2024-10-07 16:35:00 +02:00
Jorge Penadés e6535a5dd8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8019-makeResponsiveInputs 2024-10-07 16:10:59 +02:00
Jorge Penadés 4344458bb0 feat: refs #8019 fine-tunning vnTime 2024-10-07 16:02:29 +02:00
Jorge Penadés c815066953 feat: refs #8019 fine-tunning vnDate 2024-10-07 15:55:18 +02:00