 Bernat Exposito
|
e335775cdb
|
Merge pull request '2325 - Search address' (#308) from 2325-address_searchbar into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-by: Bernat Exposito <bernat@verdnatura.es>
|
2020-06-15 06:24:23 +00:00 |
|
Bernat Exposito
|
70d5c641ad
|
Merge pull request '2293 - getVolume() call to saleVolume' (#309) from 2293-getVolume into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-by: Bernat Exposito <bernat@verdnatura.es>
|
2020-06-15 06:16:55 +00:00 |
 Joan Sanchez
|
25b1c6bd8f
|
2239 - Added services
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-12 14:28:29 +02:00 |
|
Joan Sanchez
|
36ec930878
|
Updated test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-12 12:01:53 +02:00 |
|
Joan Sanchez
|
3d388ad226
|
Updated unit test
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-06-12 11:39:33 +02:00 |
|
Joan Sanchez
|
dddfe2773a
|
2293 - getVolume() call to saleVolume
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-06-12 11:26:32 +02:00 |
|
Joan Sanchez
|
48034b234f
|
2325 - Search address
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-12 10:53:33 +02:00 |
Carlos Jimenez Ruiz
|
538ae75b89
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2283_e2e_delete_ticket_with_stowaway
|
2020-06-10 16:24:17 +02:00 |
|
Joan Sanchez
|
5edfc59d97
|
Updated unit test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-10 13:57:32 +02:00 |
|
Joan Sanchez
|
461fec7e64
|
Updated unit test
|
2020-06-10 13:57:08 +02:00 |
|
Carlos Jimenez Ruiz
|
4b1e79a433
|
2314 server side unit test fixed
|
2020-06-10 13:50:03 +02:00 |
|
Joan Sanchez
|
3cfb8b4730
|
2323 - Filter by myTeam fix
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-10 12:13:07 +02:00 |
|
Joan Sanchez
|
4b262dc3cc
|
Disabled contextmenu option
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-09 13:18:29 +02:00 |
|
Joan Sanchez
|
1fed4c7913
|
Contextmenu fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-09 12:16:40 +02:00 |
|
Joan Sanchez
|
7d53f274de
|
Merge pull request '2303-fix_descriptor_show' (#300) from 2303-fix_descriptor_show into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2020-06-08 14:08:56 +00:00 |
 Carlos Jimenez Ruiz
|
d8593ea3e0
|
Merge pull request '2176-contextmenu' (#302) from 2176-contextmenu into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
|
2020-06-08 12:59:59 +00:00 |
|
Joan Sanchez
|
05b5c452a9
|
Removed attribute
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-08 13:17:18 +02:00 |
|
Joan Sanchez
|
ba9a44dec1
|
Updated back unit test
|
2020-06-08 13:06:33 +02:00 |
|
Joan Sanchez
|
ab1e8fb622
|
2176 First working version
gitea/salix/pipeline/head This commit has test failures
Details
|
2020-06-08 12:14:27 +02:00 |
Bernat Exposito Domenech
|
e24c5b00e9
|
fix descriptors
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-08 11:05:17 +02:00 |
|
Joan Sanchez
|
181f2f0148
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2176-contextmenu
gitea/salix/pipeline/head This commit has test failures
Details
|
2020-06-08 08:19:18 +02:00 |
 Javi Gallego
|
762c39eb23
|
:: para watcher
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-06-08 07:52:30 +02:00 |
|
Bernat Exposito Domenech
|
56c9b08101
|
fix show.descriptor
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-08 07:52:23 +02:00 |
|
Javi Gallego
|
faa053a3d2
|
Merge branch 'dev' into 2035-el-parametro-vShowExpiredZones
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-05 10:01:52 +02:00 |
|
Javi Gallego
|
b40be5cca9
|
2035
gitea/salix/pipeline/head Build queued...
Details
|
2020-06-05 10:01:21 +02:00 |
|
Bernat Exposito Domenech
|
a81862baad
|
set deleteded skiped
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-05 08:29:51 +02:00 |
|
Bernat Exposito Domenech
|
f340466daf
|
fix test 2296
|
2020-06-04 14:23:48 +02:00 |
|
Joan Sanchez
|
94dcf7679b
|
Merge pull request '2265-item_request_filters' (#289) from 2265-item_request_filters into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2020-06-03 10:54:41 +00:00 |
|
Joan Sanchez
|
613937dc8d
|
Fixed order
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-03 12:21:03 +02:00 |
|
Joan Sanchez
|
18edd523d2
|
Excluded failing test
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-06-03 11:40:18 +02:00 |
|
Joan Sanchez
|
b7ceeae65a
|
Excluded back unit tests. TLS error
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-06-03 11:27:14 +02:00 |
|
Joan Sanchez
|
751f79373a
|
Merge pull request '2230-log_ticket_request' (#282) from 2230-log_ticket_request into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2020-06-02 09:28:14 +00:00 |
|
Bernat Exposito
|
fac64c45c0
|
Merge pull request 'zone delete' (#285) from 2244-zone_descriptor into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2020-06-02 09:18:24 +00:00 |
|
Bernat Exposito Domenech
|
aac47e52e9
|
update log
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-02 11:15:07 +02:00 |
|
Joan Sanchez
|
a0767a6ea2
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2265-item_request_filters
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-02 10:56:40 +02:00 |
|
Bernat Exposito
|
0fe2212f64
|
Merge pull request '2282-setDeleted_stowaway' (#287) from 2282-setDeleted_stowaway into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-by: Bernat Exposito <bernat@verdnatura.es>
|
2020-06-02 08:24:59 +00:00 |
|
Joan Sanchez
|
21bb4a778c
|
Merge pull request '2278-ticket_summary_invoiceOut' (#286) from 2278-ticket_summary_invoiceOut into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2020-06-02 08:11:44 +00:00 |
|
Joan Sanchez
|
1926f90f4b
|
Merge pull request 'add column in ticket split' (#279) from 2236-ticket_sale_split into dev
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2020-06-02 07:47:50 +00:00 |
|
Joan Sanchez
|
1e4f36b775
|
Updated back unit test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-02 09:34:42 +02:00 |
|
Bernat Exposito Domenech
|
546272cc3f
|
zone delete
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-02 08:59:04 +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 |
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 |
|
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 |
|
Bernat Exposito Domenech
|
60d50afb2e
|
fix traduction
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-26 12:20:06 +02: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 |
|
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
|
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 |
|
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
|
4133021e5c
|
fix translate on plural
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-20 08:52:20 +02:00 |
 Juan Ferrer
|
c998097ba1
|
Merge branch 'dev' into 1882-descriptorRefactor
|
2020-05-19 12:30:00 +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 |
|
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 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 |
|
Bernat Exposito Domenech
|
c205c173f8
|
invoiceOut descriptor popover in ticket summary
|
2020-05-18 10:28:33 +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 |
|
Juan Ferrer
|
7a1bb7e68d
|
Merge branch 'dev' into 1882-descriptorRefactor
|
2020-05-08 14:01:49 +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 |
|
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
|
2249f68d6e
|
SCSS px to em: rem for font-size
|
2020-04-02 15:11:42 +02:00 |
|
Juan Ferrer
|
559cc5eb8c
|
SCSS em to px: Second step
|
2020-04-02 14:52:02 +02:00 |
|
Juan Ferrer
|
734c86c5f5
|
SCSS px to em - First step
|
2020-04-02 14:20:57 +02:00 |
|
Juan Ferrer
|
bf68d15264
|
E2E expeditions fixes, scss px/em fixes
|
2020-04-02 11:39:39 +02:00 |
|
Juan Ferrer
|
dfb9d32c2a
|
Client & ticket E2E fixes
gitea/salix/pipeline/head Something is wrong with the build of this commit
Details
|
2020-03-30 17:30:03 +02:00 |
|
Joan Sanchez
|
59fadf410e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2208-ticket_summary
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-27 11:45:10 +01:00 |
|
Joan Sanchez
|
d640b66ef5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1934-ticket_stowaway
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-27 11:22:00 +01:00 |
|
Bernat Exposito Domenech
|
74b27778ab
|
add phones in ticket summary
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-27 11:10:20 +01:00 |
|
Joan Sanchez
|
598ebe96d1
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2203-ticket_sale
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-27 11:06:35 +01:00 |
|
Joan Sanchez
|
6a66f47cc1
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2178_ticket_index_payout
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-27 10:19:47 +01:00 |
|
Joan Sanchez
|
d4ca58edad
|
Updated back unit test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-27 09:10:30 +01:00 |
|
Joan Sanchez
|
835c415ba7
|
1934 - Moved procedure logic to method
gitea/salix/pipeline/head This commit has test failures
Details
|
2020-03-26 14:45:38 +01:00 |
|
Bernat Exposito Domenech
|
6928092594
|
fix ticket.sale state autocomplete
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-26 12:00:07 +01:00 |
|
Joan Sanchez
|
f231fabef1
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2195-setDeleted_itemShelving
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-25 16:14:13 +01:00 |
|
Carlos Jimenez Ruiz
|
f06c7d3d47
|
front test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-25 15:17:43 +01:00 |
|
Carlos Jimenez Ruiz
|
9b4546edad
|
minor refactor plus path fix after merge
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-03-25 14:18:51 +01:00 |
|
Joan Sanchez
|
9bae89a672
|
Updated unit test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-23 16:03:27 +01:00 |
|
Joan Sanchez
|
27b1376799
|
changes
gitea/salix/pipeline/head This commit has test failures
Details
|
2020-03-23 11:21:25 +01:00 |
|
Joan Sanchez
|
9b933e7d88
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2132-extend_from_section
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-20 12:00:53 +01:00 |
|
Joan Sanchez
|
3d23583e0b
|
Fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-18 14:08:04 +01:00 |
|
Joan Sanchez
|
a9c622377e
|
Refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-18 12:55:22 +01:00 |
|
Joan Sanchez
|
934e057a67
|
Fixed watcher changes
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-18 09:41:23 +01:00 |
|
Joan Sanchez
|
f25c8bb644
|
Ticket refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-18 08:35:59 +01:00 |