Commit Graph

7069 Commits

Author SHA1 Message Date
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
Javi Gallego bd630aa562 ticketCalculateClon
gitea/salix/dev This commit looks good Details
2019-11-07 11:12:05 +01:00
Bernat 84ccfe0422 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-11-07 07:51:21 +01:00
Javi Gallego eaa2ef4570 zone warehouse error
gitea/salix/dev This commit looks good Details
2019-11-07 07:49:37 +01:00
Carlos Jimenez Ruiz 9442a198b7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-11-06 15:13:14 +01:00
Bernat 4220c995a9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-11-06 14:02:26 +01:00
Javi Gallego 729f6cb767 changes to zone
gitea/salix/test This commit looks good Details
gitea/salix/dev This commit looks good Details
2019-11-06 13:44:58 +01:00
Joan Sanchez 114e8c87d6 export sample table
gitea/salix/1466-print_refactor This commit has test failures Details
2019-11-06 10:56:18 +01:00
Joan Sanchez 3cd92211a1 test fixed & export sample table
gitea/salix/1466-print_refactor There was a failure building this commit Details
2019-11-06 10:55:04 +01:00
Joan Sanchez 3d701f534a updated tests
gitea/salix/1466-print_refactor This commit looks good Details
2019-11-06 09:32:54 +01:00
Joan Sanchez 23f6c8843d #1860 refactorizar llamadas al servicio print
gitea/salix/1466-print_refactor There was a failure building this commit Details
2019-11-06 08:20:45 +01:00
Carlos Jimenez Ruiz 76f3dc48e5 #1852 worker.time-control 2019-11-05 11:57:05 +01:00
Joan Sanchez cac8cb6a6a dev pull request
gitea/salix/1466-print_refactor There was a failure building this commit Details
2019-11-05 09:16:16 +01:00
Carlos Jimenez Ruiz b9be0188d8 manual merge 2019-11-05 09:05:00 +01:00
Carlos Jimenez Ruiz 03ab88bcd9 #1852 worker.time-control 2019-11-05 08:59:48 +01:00
Bernat 1be61b16d5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-11-05 08:56:59 +01:00
Joan Sanchez 5d83849e2b unknown provider
gitea/salix/test This commit looks good Details
gitea/salix/dev This commit looks good Details
2019-11-05 07:19:16 +01:00
Joan Sanchez 14cb32d1c8 updated reports
gitea/salix/1466-print_refactor There was a failure building this commit Details
2019-11-04 13:55:20 +01:00
Joan Sanchez d063bb4568 refactor changes
gitea/salix/1466-print_refactor This commit looks good Details
2019-11-04 08:54:21 +01:00
Joan Sanchez fc2abdc0ab change log columns size
gitea/salix/dev This commit looks good Details
2019-11-04 08:05:00 +01:00
Juan Ferrer 026c608f42 Faster module loading & vnAgencyCalendar bug fixes
gitea/salix/dev This commit looks good Details
gitea/salix/test This commit looks good Details
2019-11-01 13:02:47 +01:00
Juan Ferrer 4fcaa2e507 Jest fixes
gitea/salix/dev This commit looks good Details
2019-10-31 15:38:20 +01:00
Juan Ferrer f759c1e11a vnDialog bug fixes & front tests, workerTimeControl date fixes
gitea/salix/dev There was a failure building this commit Details
2019-10-31 15:24:28 +01:00
Joan Sanchez 8bce163099 changes
gitea/salix/1466-print_refactor This commit looks good Details
2019-10-31 14:14:18 +01:00
Juan Ferrer 38b4483edf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-10-31 13:43:15 +01:00
Joan Sanchez dd17bb0386 Descuadre de meses componente calendar #1733
gitea/salix/master This commit looks good Details
2019-10-31 13:18:29 +01:00
Javi Gallego 03a4da307d Tarea #1848 test back arreglados/comentados
gitea/salix/dev This commit looks good Details
2019-10-31 12:54:16 +01:00
Joan Sanchez a2ea532fc1 refactor
gitea/salix/1466-print_refactor This commit looks good Details
2019-10-31 12:43:04 +01:00
Juan Ferrer cef8090097 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-10-31 08:18:08 +01:00
Javi Gallego 763f8f53f8 fixtures y algunos test de zone
gitea/salix/dev This commit has test failures Details
2019-10-30 18:33:08 +01:00
Juan Ferrer 5a15e65fd6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-10-30 16:57:26 +01:00
Juan Ferrer c41fb1d0f4 #1847 vnDialog refactor 2019-10-30 16:57:14 +01:00
Bernat 9353d54b16 add alias on weekly filter 2019-10-29 14:55:05 +01:00
Javi Gallego 7dfdfc45c7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit has test failures Details
2019-10-29 12:58:39 +01:00
Javi Gallego 700c092b90 merge 2019-10-29 12:58:26 +01:00