Commit Graph

7734 Commits

Author SHA1 Message Date
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 ab776fc652 Fixed remove filter
gitea/salix/pipeline/head This commit looks good Details
2020-06-09 12:43:14 +02:00
Joan Sanchez 1fed4c7913 Contextmenu fixes
gitea/salix/pipeline/head This commit looks good Details
2020-06-09 12:16:40 +02:00
Javi Gallego 77e1b20868 Merge pull request 'fix travel descritor' (#303) from 2320-travel.descriptor into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2020-06-09 06:49:58 +00: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 0a2366194a Merge pull request '2315-client_web_access' (#301) from 2315-client_web_access into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-06-08 14:09:18 +00: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 6883303bb1 Added scss file
gitea/salix/pipeline/head This commit looks good Details
2020-06-08 13:15:48 +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
Bernat Exposito Domenech 2a53d4bca5 create hook in account
gitea/salix/pipeline/head This commit looks good Details
2020-06-08 12:18: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
Bernat Exposito Domenech 79b143478e log web access 2020-06-08 10:19:24 +02:00
Javi Gallego 0619c1b541 Merge pull request '2035-el-parametro-vShowExpiredZones' (#296) from 2035-el-parametro-vShowExpiredZones into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-06-08 06:34:52 +00: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 428cdc5707 Merge branch 'dev' into 2035-el-parametro-vShowExpiredZones 2020-06-07 10:54:39 +02:00
Bernat Exposito Domenech 6db9f71867 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2303-fix_descriptor_show
gitea/salix/pipeline/head This commit looks good Details
2020-06-05 14:16:29 +02:00
Carlos Jimenez Ruiz 35bf0b57be Merge pull request '2220-field_hide_clear' (#297) from 2220-field_hide_clear into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
2020-06-05 12:03:37 +00:00
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