 Juan Ferrer
|
3fcb76246d
|
Merge branch 'master' into test
|
2020-06-01 13:38:59 +02:00 |
 Joan Sanchez
|
3d8bc3b7b4
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-06-01 13:32:35 +02:00 |
|
Joan Sanchez
|
c188da88e8
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-01 13:31:08 +02:00 |
|
Joan Sanchez
|
052c51cee5
|
2282 - Change stowaway state to FIXING
gitea/salix/pipeline/head Something is wrong with the build of this commit
Details
|
2020-06-01 12:47:04 +02:00 |
Bernat Exposito Domenech
|
c4be76977d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2278-ticket_summary_invoiceOut
|
2020-06-01 08:24:27 +02:00 |
Joan Sanchez
|
3f1109aee3
|
Test changes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-05-29 12:10:04 +02:00 |
|
Joan Sanchez
|
90ae1562dd
|
Added filters
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-29 11:10:58 +02:00 |
Carlos Jimenez Ruiz
|
9deb518064
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2057_e2e_address_create_custom_agent
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-28 09:55:05 +02:00 |
|
Carlos Jimenez Ruiz
|
9bf509cd5d
|
customs agent e2e path + small fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-28 09:54:31 +02:00 |
|
Joan Sanchez
|
a3e7771295
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2205-loggable_relations_fix
|
2020-05-28 08:08:00 +02:00 |
|
Joan Sanchez
|
0fe78a2b8f
|
2176 - Added contextmenu
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-28 08:07:26 +02:00 |
|
Carlos Jimenez Ruiz
|
a858e51aee
|
removed unused code
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-27 14:54:54 +02:00 |
|
Carlos Jimenez Ruiz
|
296967ab4b
|
fixed a front unit test with jest.fn() as spy
|
2020-05-27 14:54:29 +02:00 |
|
Carlos Jimenez Ruiz
|
dfa74221dd
|
added crud model to preload autocompletes on demand + e2e path done
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-05-27 14:34:34 +02:00 |
|
Carlos Jimenez Ruiz
|
2345a922c8
|
now we can create thermographs for travelThermograph
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-27 13:11:41 +02:00 |
|
Bernat Exposito Domenech
|
f28f88a100
|
ticket summary invoiceOut popover
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-27 12:29:01 +02:00 |
 Carlos Jimenez Ruiz
|
98157fc45a
|
Merge pull request '2141-print_reply_to' (#272) from 2141-print_reply_to into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
|
2020-05-27 07:10:27 +00:00 |
|
Bernat Exposito Domenech
|
8be929c1da
|
log tiquet request
|
2020-05-27 08:07:14 +02:00 |
|
Joan Sanchez
|
6d94894b73
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2234-getVisibleAvailable
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-27 07:24:33 +02:00 |
|
Joan Sanchez
|
d24f04912e
|
2205 - Prevent relations to being logged in
gitea/salix/pipeline/head This commit has test failures
Details
|
2020-05-26 14:37:34 +02:00 |
|
Bernat Exposito Domenech
|
60d50afb2e
|
fix traduction
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-26 12:20:06 +02:00 |
|
Joan Sanchez
|
14251e5a0c
|
Merge pull request '2262-catalog_remove_tag' (#276) from 2262-catalog_remove_tag into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2020-05-26 09:39:47 +00:00 |
 Javi Gallego
|
5188f80da5
|
Merge branch 'dev' into 2234-getVisibleAvailable
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-26 10:47:48 +02:00 |
|
Bernat Exposito Domenech
|
e7fc70a4b4
|
add column in ticket split
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-26 10:43:53 +02:00 |
|
Javi Gallego
|
d8871c0bce
|
cr
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-26 10:37:52 +02:00 |
 Bernat Exposito
|
17ef761ba4
|
Merge pull request '2226-item_last_entries' (#271) from 2226-item_last_entries into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2020-05-26 07:59:17 +00:00 |
|
Joan Sanchez
|
44160d2f3c
|
Changed order
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-26 08:11:36 +02:00 |
|
Joan Sanchez
|
4d2d57d646
|
2265 Changes to filter
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-26 08:08:09 +02:00 |
|
Carlos Jimenez Ruiz
|
d02655d4d3
|
Merge pull request '2273 - Fixed transfer sales' (#273) from 2273-transfer_sales_fix into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
|
2020-05-25 12:58:08 +00:00 |
|
Joan Sanchez
|
73a6148a77
|
2273 - Fixed transfer sales
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-25 14:45:26 +02:00 |
|
Joan Sanchez
|
d60f8721f1
|
1490 - Don't update with empty value
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-25 13:49:24 +02:00 |
|
Joan Sanchez
|
2af39d4b67
|
Updated unit tests
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-25 07:43:24 +02:00 |
|
Joan Sanchez
|
4878c0dc46
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2141-print_reply_to
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-05-25 07:25:21 +02:00 |
|
Joan Sanchez
|
e9e7ae08f2
|
Locale refactor
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-05-22 15:20:55 +02:00 |
|
Javi Gallego
|
0f718ad065
|
Merge branch 'dev' into 2242-test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-22 07:56:00 +02:00 |
|
Bernat Exposito Domenech
|
8c2f57e380
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2226-item_last_entries
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-21 15:26:04 +02:00 |
|
Bernat Exposito Domenech
|
52241e6f2c
|
update itemLastENtries
|
2020-05-21 15:26:00 +02:00 |
|
Joan Sanchez
|
ce43c1f2d9
|
Merge pull request '2264-travel_summary' (#265) from 2264-travel_summary into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2020-05-21 12:27:14 +00:00 |
|
Joan Sanchez
|
9a43dff1fd
|
Removed console.log()
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-21 14:22:22 +02:00 |
|
Joan Sanchez
|
9a0c9d3da2
|
2262 Remove filter by id from searchbar
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-21 14:18:24 +02:00 |
|
Joan Sanchez
|
aa95a9f984
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-21 12:33:01 +02:00 |
|
Joan Sanchez
|
d082f5d6c2
|
2225 Prevent location override
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-21 11:14:34 +02:00 |
|
Carlos Jimenez Ruiz
|
245827e8d5
|
corrected a typo
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-21 09:28:50 +02:00 |
|
Joan Sanchez
|
f6efa7160e
|
2141 ReplyTo param
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-05-20 16:23:53 +02:00 |
|
Bernat Exposito Domenech
|
8ca12d9fdd
|
fix bugs in travel summary
|
2020-05-20 13:19:02 +02:00 |
|
Carlos Jimenez Ruiz
|
55c4ccdb29
|
Merge pull request 'searchbar translates' (#261) from 2247-refactor_searchBar into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
|
2020-05-20 08:40:02 +00:00 |
|
Bernat Exposito Domenech
|
a0f5f073a5
|
fix order traduction
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-20 10:26:29 +02:00 |
|
Bernat Exposito Domenech
|
4133021e5c
|
fix translate on plural
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-20 08:52:20 +02:00 |
|
Javi Gallego
|
670c5936ce
|
test2
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-19 13:11:22 +02:00 |
|
Javi Gallego
|
529bd5673c
|
test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-19 13:06:59 +02:00 |
|
Juan Ferrer
|
ad1c677280
|
Test focus removed & fixes
gitea/salix/pipeline/head Something is wrong with the build of this commit
Details
|
2020-05-19 12:50:43 +02:00 |
|
Juan Ferrer
|
c998097ba1
|
Merge branch 'dev' into 1882-descriptorRefactor
|
2020-05-19 12:30:00 +02:00 |
|
Javi Gallego
|
3774d1dd1f
|
Merge branch 'dev' into 2242-test
|
2020-05-19 12:22:47 +02:00 |
|
Javi Gallego
|
692af6078c
|
Merge pull request 'Tarea-#2242-zone-upcomingDeliveries' (#260) from Tarea-#2242-zone-upcomingDeliveries into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
|
2020-05-19 10:21:33 +00:00 |
|
Javi Gallego
|
ff03133277
|
test
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-05-19 12:21:02 +02:00 |
|
Juan Ferrer
|
e7cf060e12
|
Merge fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-19 10:51:50 +02:00 |
|
Bernat Exposito Domenech
|
d289c17530
|
searchbar translates
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-19 10:27:22 +02:00 |
|
Juan Ferrer
|
d7f2e686b1
|
Merge branch 'dev' into 1882-descriptorRefactor
|
2020-05-19 09:28:50 +02:00 |
|
Javi Gallego
|
a7e6e3d4b7
|
cr juan
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-19 08:46:42 +02:00 |
|
Bernat Exposito
|
5f8a2a24f5
|
Merge pull request '2246-claim_sorted_states' (#258) from 2246-claim_sorted_states into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-by: Bernat Exposito <bernat@verdnatura.es>
|
2020-05-19 06:42:07 +00:00 |
|
Joan Sanchez
|
6c49fc9b1c
|
Merge pull request 'client descriptor add risk' (#257) from 2250-client_descriptor into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2020-05-19 06:26:17 +00:00 |
|
Joan Sanchez
|
af0d0f1fbe
|
Merge pull request '2238-ticket_summary_invoiceOut' (#255) from 2238-ticket_summary_invoiceOut into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2020-05-19 06:18:23 +00:00 |
|
Bernat Exposito Domenech
|
f9bc1406e2
|
delete css
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-19 08:14:44 +02:00 |
|
Bernat Exposito Domenech
|
2681060878
|
update mehod ticket summary
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-18 14:59:58 +02:00 |
|
Bernat Exposito Domenech
|
369d8d59d8
|
fix error
|
2020-05-18 14:58:06 +02:00 |
|
Joan Sanchez
|
309b4dafe9
|
Requested changes
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-18 14:03:15 +02:00 |
|
Joan Sanchez
|
4aea769797
|
2246 Added claim state priority field
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-18 13:46:45 +02:00 |
|
Bernat Exposito Domenech
|
b953fa8773
|
client descriptor add risk
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-18 11:50:55 +02:00 |
|
Joan Sanchez
|
53b55468fb
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1833-claim_action_refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-18 11:45:43 +02:00 |
|
Joan Sanchez
|
a3203fa81f
|
2216 Show active client icon on client index
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-18 10:39:40 +02:00 |
|
Bernat Exposito Domenech
|
c205c173f8
|
invoiceOut descriptor popover in ticket summary
|
2020-05-18 10:28:33 +02:00 |
|
Joan Sanchez
|
42bec3a944
|
1833 Claim action refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-15 14:47:19 +02:00 |
|
Javi Gallego
|
3815edfbea
|
falta CR
gitea/salix/pipeline/head This commit has test failures
Details
|
2020-05-15 12:17:34 +02:00 |
|
Joan Sanchez
|
9b085d13e1
|
Updated back unit test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-14 17:32:52 +02:00 |
|
Joan Sanchez
|
2bb17f4a00
|
Requested changes
gitea/salix/pipeline/head This commit has test failures
Details
|
2020-05-14 17:15:54 +02:00 |
|
Joan Sanchez
|
e51341102b
|
Updated e2e
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-14 14:30:43 +02:00 |
|
Joan Sanchez
|
62d27e45e2
|
Updated unit tests
gitea/salix/pipeline/head This commit has test failures
Details
|
2020-05-14 14:01:34 +02:00 |
|
Juan Ferrer
|
b94c97d322
|
Hotfix: Clone option added to vnItemDescriptor
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-13 17:51:27 +02:00 |
|
Joan Sanchez
|
94a219760c
|
2223 Added pickup checkbox
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-05-13 15:04:57 +02:00 |
|
Juan Ferrer
|
07cbac7fcd
|
Merge fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-08 19:56:39 +02:00 |
|
Juan Ferrer
|
7a1bb7e68d
|
Merge branch 'dev' into 1882-descriptorRefactor
|
2020-05-08 14:01:49 +02:00 |
|
Juan Ferrer
|
b14d2f9455
|
Small fixes in vnOrderCatalog and vnZoneEvents
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-08 13:23:06 +02:00 |
|
Javi Gallego
|
8453d25852
|
#2224item.diary provar directiva $anchorScroll
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-06 18:42:50 +02:00 |
|
Juan Ferrer
|
6c14743017
|
Last fixes & tests passed
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-06 14:38:09 +02:00 |
|
Juan Ferrer
|
6a8e1bf6b5
|
#1882 Boileplate code removed, declarative quicklinks
gitea/salix/pipeline/head This commit looks good
Details
|
2020-04-30 12:48:52 +02:00 |
|
Juan Ferrer
|
b536c8291a
|
#1882 Popover::show() boilerplate code removed
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-04-28 14:26:02 +02:00 |
|
Juan Ferrer
|
5826099601
|
#1882 First step, front tests passed
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-04-25 11:50:04 +02:00 |
|
Javi Gallego
|
6dacf20bd9
|
ticket.index modificar orden de las secciones
gitea/salix/pipeline/head This commit looks good
Details
|
2020-04-23 17:59:46 +02:00 |
|
Javi Gallego
|
dbb2257430
|
test de zone_getLanded y zone_getFromGeo
gitea/salix/pipeline/head This commit looks good
Details
|
2020-04-20 13:49:33 +02:00 |
|
Juan Ferrer
|
e3b7f81c69
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2026-itemDescriptorPopoverRelocate
|
2020-04-09 16:24:19 +02:00 |
|
Javi Gallego
|
ab9e640b44
|
Merge branch 'dev' into #2174-ticket.weekly-añadir-campo-agencyModeFk
gitea/salix/pipeline/head This commit looks good
Details
|
2020-04-08 13:15:17 +02:00 |
|
Javi Gallego
|
397872ee19
|
mejoradas las descripciones de los test
|
2020-04-08 13:15:07 +02:00 |
|
Javi Gallego
|
09e425c33c
|
2174 ticket.weekly con campo agencyModeFk con E2E
gitea/salix/pipeline/head This commit looks good
Details
|
2020-04-08 12:33:36 +02:00 |
|
Juan Ferrer
|
4336a303c0
|
Merge branch 'dev' into 2026-itemDescriptorPopoverRelocate
|
2020-04-07 13:03:57 +02:00 |
|
Javi Gallego
|
dad77cfa08
|
Merge branch 'dev' into #2219-Añadir-menu-wikipedia
gitea/salix/pipeline/head This commit looks good
Details
|
2020-04-06 12:41:07 +02:00 |
|
Javi Gallego
|
d835dd60ed
|
2219 Añadir menu wikipedia
|
2020-04-06 12:40:21 +02:00 |
|
Javi Gallego
|
ea1cc68d29
|
test passed
gitea/salix/pipeline/head This commit looks good
Details
|
2020-04-03 17:52:47 +02:00 |
|
Javi Gallego
|
b6aedd2e6d
|
Merge branch '2215-windowsE2EFixes' into worker---Añadir-sección-con-enlace-a-Wikipedia
|
2020-04-03 12:26:27 +02:00 |
|
Javi Gallego
|
0b966cbb76
|
Merge branch 'dev' into worker---Añadir-sección-con-enlace-a-Wikipedia
|
2020-04-03 08:28:49 +02:00 |
|
Juan Ferrer
|
2249f68d6e
|
SCSS px to em: rem for font-size
|
2020-04-02 15:11:42 +02:00 |