Commit Graph

7556 Commits

Author SHA1 Message Date
Bernat Exposito f6953747d2 Merge pull request '2305 - Added noReply param' (#298) from 2305-replyTo_param into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Bernat Exposito <bernat@verdnatura.es>
2020-06-05 11:58:16 +00:00
Joan Sanchez 3a24732d78 Merge pull request '2296 - Prevent log with no new changes' (#293) from 2297-loggable_empty_logs into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
2020-06-05 11:32:54 +00:00
Joan Sanchez 048f01305d 2220 - Added clearDisabled param
gitea/salix/pipeline/head This commit looks good Details
2020-06-05 13:14:14 +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
Carlos Jimenez Ruiz 5ea575fec0 calling the correct task in jenkinsfile
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-05 09:02:36 +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
Joan Sanchez e25b87213b 2305 - Added noReply param
gitea/salix/pipeline/head This commit looks good Details
2020-06-05 08:23:52 +02:00
Carlos Jimenez Ruiz 3ea3f707bc gulpfile refactor and removed unused code
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-04 21:09:06 +02:00
Joan Sanchez 9056801869 Fix
gitea/salix/pipeline/head This commit looks good Details
2020-06-04 14:46:55 +02:00
Joan Sanchez 13859375bd 2296 - Prevent log with no new changes
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-04 14:44:38 +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 bfeef77040 Merge pull request '2281 - Added claim pickup checkbox' (#292) from 2281-claim_pickup_checkbox into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
2020-06-04 08:37:20 +00: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 0637302a0b Removed focus
gitea/salix/pipeline/head This commit looks good Details
2020-06-04 09:49:13 +02:00
Joan Sanchez 6e1c89bce6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2281-claim_pickup_checkbox 2020-06-04 09:48:07 +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 e4d77017b4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-06-03 18:15:03 +02:00
Joan Sanchez ba3a52d7bb Fixed request args
gitea/salix/pipeline/head This commit looks good Details
2020-06-03 18:06:30 +02:00
Joan Sanchez 9615fb063d Fixed translation
gitea/salix/pipeline/head This commit looks good Details
2020-06-03 16:43:51 +02:00
Joan Sanchez e606f95b65 Fixed translations
gitea/salix/pipeline/head This commit looks good Details
2020-06-03 16:14:18 +02:00
Joan Sanchez 562ebceebe Fixed closure sql
gitea/salix/pipeline/head This commit looks good Details
2020-06-03 14:56:34 +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 63a2aa3e19 Merge pull request '2287 - Notify to sales person' (#291) from 2287_print_closure into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2020-06-03 10:25:17 +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 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 539afcd19b 2287 - Notify to sales person
gitea/salix/pipeline/head This commit looks good Details
2020-06-03 11:32:30 +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 66239f65d1 Merge pull request 'fix dbtest and export production' (#288) from 2289-export_production into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-06-03 06:43:33 +00:00
Joan Sanchez 59e0336474 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-06-02 19:11:37 +02:00
Joan Sanchez 017ca49711 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2020-06-02 19:09:57 +02:00
Joan Sanchez 8352459686 Removed waiting request
gitea/salix/pipeline/head This commit looks good Details
2020-06-02 18:59:14 +02:00
Joan Sanchez 6e371da2ad Removed waiting request
gitea/salix/pipeline/head This commit looks good Details
2020-06-02 18:28:13 +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
Bernat Exposito Domenech b3eba1c75a fix dbtest and export production
gitea/salix/pipeline/head This commit looks good Details
2020-06-02 13:53:54 +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