Bernat Exposito Domenech
|
061dceb2b0
|
test client hook
|
2020-06-11 08:46:03 +02:00 |
|
Bernat Exposito Domenech
|
2c5f44f94a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2321-log_web_access
|
2020-06-11 08:45:16 +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
|
5fbcb5c439
|
2290 - Client consumption
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-06-10 13:35:41 +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 |
|
Bernat Exposito Domenech
|
d2aca11e16
|
log web access, create hook in client
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-06-10 12:09:27 +02:00 |
|
Bernat Exposito Domenech
|
704e27a657
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2321-log_web_access
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-10 12:08:54 +02:00 |
|
Bernat Exposito Domenech
|
ee58aebe16
|
first step, client hook
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-10 09:26:51 +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
|
1abe0addcb
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-09 12:43:40 +02:00 |
|
Joan Sanchez
|
1fed4c7913
|
Contextmenu fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-09 12:16:40 +02:00 |
|
Bernat Exposito Domenech
|
294021391d
|
fix travel descritor
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-06-09 08:32:57 +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
|
cda6e37620
|
Removed console.log
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-08 13:07:34 +02:00 |
|
Joan Sanchez
|
ba9a44dec1
|
Updated back unit test
|
2020-06-08 13:06:33 +02:00 |
|
Bernat Exposito Domenech
|
cc569769b0
|
fix client balance
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-08 12:48:23 +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 |
|
Bernat Exposito Domenech
|
90541a4c13
|
fix client descriptor in log section
|
2020-06-05 12:13:05 +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
|
49d4f881ad
|
Merge pull request '2296-fix_back_test' (#295) from 2296-fix_back_test into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2020-06-05 07:15:10 +00: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
|
81757fb9b5
|
fix test 2302
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-04 14:24:12 +02:00 |
|
Bernat Exposito Domenech
|
f340466daf
|
fix test 2296
|
2020-06-04 14:23:48 +02:00 |
|
Bernat Exposito Domenech
|
3a6efebfd9
|
skipp back test and create task 2304
|
2020-06-04 14:22:56 +02:00 |
|
Joan Sanchez
|
e2391e5595
|
Changes made
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-04 10:12:54 +02:00 |
|
Joan Sanchez
|
30c721b0e2
|
Added ACL
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-04 08:21:08 +02:00 |
|
Joan Sanchez
|
0695ec01bc
|
Updated unit test
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-06-04 07:53:06 +02:00 |
|
Joan Sanchez
|
f39719cc46
|
2281 - Added claim pickup checkbox
gitea/salix/pipeline/head This commit has test failures
Details
|
2020-06-03 14:46:58 +02:00 |
|
Joan Sanchez
|
696de03ad1
|
Changed translation
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-03 13:42:36 +02:00 |
|
Joan Sanchez
|
ca19581a5d
|
Merge pull request 'item diary, fix ticket descriptor' (#290) from 2288-item_diary into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2020-06-03 11:09:19 +00: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 |
|
Bernat Exposito Domenech
|
1cd9c75468
|
fix item diary descriptor
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-03 12:37:01 +02:00 |
|
Bernat Exposito Domenech
|
34b6641e5c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2288-item_diary
|
2020-06-03 12:32:27 +02: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
|
f71a2a3665
|
Removed isOk param
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-03 11:58:53 +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 |
|
Bernat Exposito Domenech
|
0b3608433c
|
item diary, fix ticket descriptor
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-03 10:37:17 +02:00 |
|
Joan Sanchez
|
16d7186829
|
Fixed initial filters
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-02 14:42:58 +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 |
|
Bernat Exposito Domenech
|
3bfee6d0fd
|
fix zone descriptor
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-02 10:17:46 +02: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
|
0251ff9bc9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2278-ticket_summary_invoiceOut
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-02 09:04:09 +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 |
 Juan Ferrer
|
3e5bab41d3
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-01 13:47:33 +02:00 |
|
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 |