Commit Graph

6511 Commits

Author SHA1 Message Date
Juan Ferrer 77d454e519 Jenkinsfile changes
gitea/salix/test There was a failure building this commit Details
2019-12-23 15:02:30 +01:00
Juan Ferrer e2830badb9 Jenkinsfile fixes
gitea/salix/test There was a failure building this commit Details
2019-12-23 14:41:32 +01:00
Juan Ferrer 337a8ab944 Jenkinsfile fixes
gitea/salix/test There was a failure building this commit Details
2019-12-23 14:33:54 +01:00
Juan Ferrer a252119884 Compose & jenkinsfile fixes 2019-12-23 14:32:18 +01:00
Juan Ferrer aff56b7589 Compose fixes
gitea/salix/test This commit looks good Details
2019-12-23 13:07:51 +01:00
Juan Ferrer eb9e622b72 Compose fixes
gitea/salix/test There was a failure building this commit Details
2019-12-23 12:49:02 +01:00
Juan Ferrer b98b947b63 Compose fixes
gitea/salix/test There was a failure building this commit Details
2019-12-23 12:33:55 +01:00
Juan Ferrer 54b8aa7c83 Docker compose fixes
gitea/salix/test There was a failure building this commit Details
2019-12-23 12:23:30 +01:00
Juan Ferrer 1565bc3a92 Docker compose fixes
gitea/salix/test There was a failure building this commit Details
2019-12-23 12:06:05 +01:00
Juan Ferrer 3b4b0be167 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/test There was a failure building this commit Details
2019-12-23 11:10:55 +01:00
Juan Ferrer 55393eef33 Using docker configs 2019-12-23 11:10:45 +01:00
Joan Sanchez 0799e58558 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-12-23 08:15:25 +01:00
Joan Sanchez 3d4fc9c18e #1963 Entry & zone style changes
gitea/salix/master This commit looks good Details
gitea/salix/test This commit looks good Details
2019-12-23 08:05:58 +01:00
Juan Ferrer c8e4615433 Merge branch 'test'
gitea/salix/master This commit looks good Details
2019-12-22 15:12:57 +01:00
Joan Sanchez 994b87ef1d Merge branch '1960-update_structure_db' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-12-20 13:24:47 +00:00
Bernat Exposito Domenech e9d416671d update fixtures and structure db
gitea/salix/1960-update_structure_db This commit looks good Details
2019-12-20 13:51:04 +01:00
Joan Sanchez ec1750476e Fixed tags
gitea/salix/master This commit looks good Details
2019-12-20 12:56:56 +01:00
Joan Sanchez 472352e24c Merge branch '1915-claim_regularize_fk' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-12-20 10:05:38 +00:00
Joan Sanchez 72d591e143 sql changes
gitea/salix/1915-claim_regularize_fk This commit looks good Details
2019-12-20 10:59:17 +01:00
Joan Sanchez b9415c0335 updated sql
gitea/salix/1915-claim_regularize_fk This commit looks good Details
2019-12-20 10:40:12 +01:00
Joan Sanchez 61408bdfd5 updated tests
gitea/salix/1915-claim_regularize_fk This commit looks good Details
2019-12-20 09:30:35 +01:00
Joan Sanchez 2330e9fb39 Merge branch '1897travel.index' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-12-20 07:52:28 +00:00
Joan Sanchez 28f5abe8bc Merge branch '1937-workerDepartment' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-12-20 07:41:52 +00:00
Bernat Exposito Domenech 81bb9cfc88 refactor travel filter
gitea/salix/1897travel.index This commit looks good Details
2019-12-20 08:39:34 +01:00
Bernat Exposito Domenech 9a6c8db140 focus on the dialog
gitea/salix/1937-workerDepartment This commit looks good Details
2019-12-20 08:32:02 +01:00
Bernat Exposito Domenech 3d21539fb0 travel index filter
gitea/salix/1897travel.index This commit looks good Details
2019-12-20 07:55:00 +01:00
Juan Ferrer fce22f2e30 Jenkinsfile fixes
gitea/salix/test This commit looks good Details
2019-12-19 16:23:59 +01:00
Juan Ferrer 00b103b389 Jenkinsfile fixes
gitea/salix/test There was a failure building this commit Details
2019-12-19 16:16:54 +01:00
Juan Ferrer 5db65e188a Jenkinsfile fixes
gitea/salix/test This commit looks good Details
2019-12-19 16:11:56 +01:00
Juan Ferrer 1407b7b76f Nginx config fixes
gitea/salix/test This commit looks good Details
2019-12-19 15:45:19 +01:00
Joan Sanchez 688b68a18a Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-12-19 15:04:45 +01:00
Joan Sanchez 42239815e0 removed fdescribe
gitea/salix/dev There was a failure building this commit Details
2019-12-19 15:01:33 +01:00
Joan Sanchez 61b9646f5b Merge branch 'test' into dev
gitea/salix/dev There was a failure building this commit Details
2019-12-19 14:55:09 +01:00
Joan Sanchez a83ba3049a updated selector 2019-12-19 14:55:05 +01:00
Juan Ferrer 592b672493 Compose now configuration is read from shared storage
gitea/salix/test This commit looks good Details
2019-12-19 14:53:17 +01:00
Juan Ferrer 441f76a1c1 Jenkinsfile fixes
gitea/salix/test This commit looks good Details
2019-12-19 14:38:39 +01:00
Juan Ferrer 1fb32e8ac5 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/test There was a failure building this commit Details
2019-12-19 14:31:12 +01:00
Juan Ferrer 109361a762 Jenkinsfile fixes 2019-12-19 14:31:02 +01:00
Juan Ferrer 325d0aa08e Jenkinsfile fixes
gitea/salix/test There was a failure building this commit Details
2019-12-19 14:29:17 +01:00
Joan Sanchez c4d25bb1ce Merge branch 'master' into test
gitea/salix/test There was a failure building this commit Details
2019-12-19 14:29:16 +01:00
Juan Ferrer 4f3e3b41fa Jenkinsfile fixes
gitea/salix/test There was a failure building this commit Details
2019-12-19 14:28:06 +01:00
Juan Ferrer d5a9a62f73 Deploy with docker swarm
gitea/salix/test There was a failure building this commit Details
2019-12-19 14:27:29 +01:00
Joan Sanchez aa809eea8a trigger build
gitea/salix/master This commit looks good Details
2019-12-19 14:21:18 +01:00
Joan Sanchez 8a54da6fd3 fixed dms links 2019-12-19 14:13:24 +01:00
Joan Sanchez 7fa22da619 Use country code as default language
gitea/salix/master This commit looks good Details
gitea/salix/test This commit looks good Details
2019-12-19 12:42:50 +01:00
Juan Ferrer 9947021736 #1953 Temporal fix
gitea/salix/master This commit looks good Details
gitea/salix/test This commit looks good Details
2019-12-19 12:17:53 +01:00
Joan Sanchez a1c6c0ab39 claim regularize refactor
gitea/salix/1915-claim_regularize_fk This commit looks good Details
2019-12-19 11:37:53 +01:00
Carlos Jimenez Ruiz 82a548edbc Merge branch '1933-fix_backTest' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-12-18 06:52:36 +00:00
Bernat Exposito Domenech 03af680968 fix backtest
gitea/salix/1933-fix_backTest This commit looks good Details
2019-12-18 07:30:24 +01:00
Joan Sanchez f42f46dc42 Merge branch '1913-stowaway_unboarding' of verdnatura/salix into master
gitea/salix/master This commit looks good Details
2019-12-17 12:53:06 +00:00