Commit Graph

6298 Commits

Author SHA1 Message Date
Joan Sanchez f8c90832fd Deprecated LCR
gitea/salix/dev This commit looks good Details
2019-11-14 09:59:11 +01:00
Joan Sanchez 1bf114f4cd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/test This commit looks good Details
2019-11-14 08:53:34 +01:00
Joan Sanchez d170f73662 Assign datasource props
gitea/salix/dev There was a failure building this commit Details
2019-11-14 08:53:10 +01:00
Joan Sanchez f02a68cbd8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/test This commit looks good Details
2019-11-14 08:17:58 +01:00
Joan Sanchez e0ed9072c9 unified LCR and CORE #1868
gitea/salix/dev This commit looks good Details
2019-11-14 08:16:52 +01:00
Joan Sanchez 236dcbf207 changed isRaid to isVirtual, atenderFk to attenderFk
gitea/salix/dev This commit looks good Details
2019-11-13 13:22:39 +01:00
Carlos Jimenez Ruiz d12f815c80 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-11-13 12:31:13 +01:00
Joan Sanchez c166067888 updated tests & email compatibility with phone
gitea/salix/dev This commit looks good Details
2019-11-13 12:18:30 +01:00
Bernat dfd29ced70 1711 delete references 2019-11-13 11:04:52 +01:00
Carlos Jimenez Ruiz d5dd45534a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-11-13 10:43:34 +01:00
Bernat a3159f7dbd dumped data updated
gitea/salix/dev This commit looks good Details
2019-11-13 10:41:14 +01:00
Juan Ferrer d8d6937093 Style fixes
gitea/salix/1838-searchbar_refactor This commit looks good Details
2019-11-13 09:35:25 +01:00
Carlos Jimenez Ruiz b4669270c4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-11-13 08:54:27 +01:00
Joan Sanchez 729b7e9412 Merge branch '1466-print_refactor' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
LGTM
2019-11-13 07:41:46 +00:00
Joan Sanchez 308c4dfb88 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1466-print_refactor
gitea/salix/1466-print_refactor This commit looks good Details
2019-11-13 08:09:54 +01:00
Joan Sanchez 603bb034a1 Excluded specs with calls to setDeleted #1874
gitea/salix/dev This commit looks good Details
2019-11-13 07:56:09 +01:00
Carlos Jimenez Ruiz 65b84d752c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-11-13 07:51:06 +01:00
Joan Sanchez 7f2af116bc updated translation
gitea/salix/dev This commit looks good Details
2019-11-13 07:04:47 +01:00
Joan Sanchez 797ce31bbe Merge branch 'dev' of verdnatura/salix into test
gitea/salix/test This commit looks good Details
2019-11-12 20:47:52 +00:00
Carlos Jimenez Ruiz 0730aa1d0e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-11-12 15:18:41 +01:00
Joan Sanchez c3962c3d78 updated test
gitea/salix/dev This commit looks good Details
2019-11-12 15:07:37 +01:00
Joan Sanchez b320d64462 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit has test failures Details
2019-11-12 14:54:13 +01:00
Joan Sanchez 1b70721b0e #1864 added restrictions, send rocketchat message 2019-11-12 14:53:58 +01:00
Joan Sanchez 05c4c9e96a ticket.weekly removed create section already on ticket descriptor #1841 2019-11-12 14:48:03 +01:00
Juan Ferrer 1c035ca045 All tests fixed
gitea/salix/1838-searchbar_refactor This commit looks good Details
2019-11-12 14:18:46 +01:00
Carlos Jimenez Ruiz 266de44f2f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-11-12 13:19:34 +01:00
Bernat 7cbbc4c18e #1870 exportar produccion a la local
gitea/salix/dev This commit looks good Details
2019-11-12 11:13:20 +01:00
Juan Ferrer a4f6c64e59 Merge 2019-11-12 09:24:08 +01:00
Juan Ferrer f6050a6c65 Merge 2019-11-12 09:24:01 +01:00
Carlos Jimenez Ruiz 34a3ae9e85 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-11-12 08:57:02 +01:00
Bernat e8862b5b56 fix sql userPhone
gitea/salix/dev This commit looks good Details
2019-11-12 08:52:09 +01:00
Carlos Jimenez Ruiz d284e36ee6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-11-12 08:52:07 +01:00
Bernat 74a2c58954 Bug #1862 fix e2e and front test
gitea/salix/dev This commit looks good Details
2019-11-12 08:51:50 +01:00
Juan Ferrer 95d943e515 E2E fixes 2019-11-11 16:32:03 +01:00
Juan Ferrer efa6ddc0f1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1838-searchbar_refactor 2019-11-11 16:25:00 +01:00
Joan Sanchez 6cedfceddd Show ticket state #1836
gitea/salix/dev This commit looks good Details
2019-11-11 13:51:30 +01:00
Joan Sanchez 42524c7f1d increased width to expand class #1845
gitea/salix/dev This commit looks good Details
2019-11-11 13:22:25 +01:00
Joan Sanchez 5b2e407870 dialog styles
gitea/salix/1466-print_refactor This commit looks good Details
2019-11-11 12:26:22 +01:00
Joan Sanchez 963ac3ad77 dumpedfixtures rollback
gitea/salix/1466-print_refactor This commit looks good Details
2019-11-11 11:56:13 +01:00
Joan Sanchez 6f7962935d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1466-print_refactor 2019-11-11 11:24:26 +01:00
Joan Sanchez 115156f89d updated unit tests
gitea/salix/1466-print_refactor This commit has test failures Details
2019-11-11 11:23:39 +01:00
Joan Sanchez 0838540789 template mso compatibility
gitea/salix/1466-print_refactor There was a failure building this commit Details
2019-11-11 11:04:49 +01:00
Juan Ferrer cf6961f5c5 E2E fixes
gitea/salix/1838-searchbar_refactor This commit has test failures Details
2019-11-10 14:13:55 +01:00
Juan Ferrer 976782738e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1838-searchbar_refactor 2019-11-10 13:27:31 +01:00
Juan Ferrer bee50a6b03 Front tests passed 2019-11-10 13:10:52 +01:00
Juan Ferrer 515234187a First working version
gitea/salix/1838-searchbar_refactor There was a failure building this commit Details
2019-11-10 11:08:44 +01:00
Joan Sanchez 1a15ed7d50 removed attachment link
gitea/salix/1466-print_refactor There was a failure building this commit Details
2019-11-08 07:21:14 +01:00
Carlos Jimenez Ruiz f2de7ddab4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-11-07 12:17:33 +01:00
Joan Sanchez 5705c37f92 show attachments on email templates attachment component
gitea/salix/1466-print_refactor There was a failure building this commit Details
2019-11-07 11:19:05 +01:00
Bernat c47f0f7972 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-11-07 11:13:15 +01:00