Commit Graph

8008 Commits

Author SHA1 Message Date
Carlos Jimenez Ruiz 42b21047f7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2266_refactor_gulpfile_docker
gitea/salix/pipeline/head This commit looks good Details
2020-06-11 11:42:10 +02:00
Joan Sanchez 8688c2899b Merge pull request '2321-log_web_access' (#306) from 2321-log_web_access into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-06-11 09:41:35 +00:00
Carlos Jimenez Ruiz aa9ec30e34 updated package.json and readme
gitea/salix/pipeline/head This commit looks good Details
2020-06-11 11:16:28 +02:00
Carlos Jimenez Ruiz 3f92b6fcaa removed private function description as it is no longer exported
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-11 11:02:47 +02:00
Carlos Jimenez Ruiz d4f1a90f87 ip botained for ci and localhost
gitea/salix/pipeline/head This commit looks good Details
2020-06-11 10:37:55 +02:00
Bernat Exposito Domenech f9025bef98 delete test
gitea/salix/pipeline/head This commit looks good Details
2020-06-11 10:37:40 +02:00
Carlos Jimenez Ruiz a6b6853ec4 Merge pull request '2283_e2e_delete_ticket_with_stowaway' (#305) from 2283_e2e_delete_ticket_with_stowaway into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-06-11 08:14:51 +00:00
Carlos Jimenez Ruiz 477b1c8e1e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2266_refactor_gulpfile_docker 2020-06-11 10:13:54 +02:00
Carlos Jimenez Ruiz fadf36da69 added a css selector to selectors
gitea/salix/pipeline/head This commit looks good Details
2020-06-11 09:20:44 +02:00
Bernat Exposito Domenech 5d426c490c fix traductions 2020-06-11 09:04:17 +02:00
Carlos Jimenez Ruiz 1d591c7ddd removed unused selector
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-11 09:00:50 +02:00
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 54845da836 e2e isDeleted
gitea/salix/pipeline/head This commit looks good Details
2020-06-10 16:51:04 +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 8f6b426624 Merge pull request '2323 - Filter by myTeam fix' (#304) from 2323-ticket_filter_myTeam into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
2020-06-10 12:16:50 +00: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 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