Commit Graph

144 Commits

Author SHA1 Message Date
Carlos Jimenez Ruiz 4026004ecf #987 client.billing-data ALPHA 2019-02-28 14:30:29 +01:00
Gerard a8a17b72bd Merge remote-tracking branch 'origin/dev' into jgallego 2019-02-19 16:10:16 +01:00
Joan Sanchez 4645e75f17 check fdescribe removed
gitea/salix/dev This commit looks good Details
2019-02-19 07:05:39 +01:00
Javi Gallego da4d961c8b Merge branch 'dev' into jgallego
gitea/salix/jgallego This commit has test failures Details
2019-02-18 13:35:33 +01:00
Javi Gallego 58706b8694 backPreparado
gitea/salix/jgallego There was a failure building this commit Details
2019-02-18 07:57:15 +01:00
Gerard a806a26042 Merge branch 'jgallego' into dev 2019-02-15 13:42:42 +01:00
Javi Gallego 32cc39ad00 order.json regularizados campos addressFk, agencyModeFk 2019-02-15 13:26:49 +01:00
Juan Ferrer 34ace7f5d4 Strict dependency injection enabled 2019-02-15 12:34:21 +01:00
Carlos Jimenez Ruiz 65c9172b43 #1126 e2e order.line + fixtures problem solved 2019-02-11 14:51:42 +01:00
Javi Gallego 6e421d8442 Tarea #808 order.basic-data cr juan 2019-02-06 14:56:36 +01:00
Juan Ferrer 03406a7d9b Style fixes 2019-02-06 11:24:29 +01:00
Carlos Jimenez Ruiz cb99ac2811 #1052 e2e extension para refrescar formularios/vistas 2019-01-27 21:09:54 +01:00
Carlos Jimenez Ruiz 7333cb4114 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-27 20:49:21 +01:00
Juan Ferrer 69bb8173c0 Jenkins fixes for CI 2019-01-26 20:26:14 +01:00
Carlos Jimenez Ruiz 20bea9679c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-26 13:04:20 +01:00
Juan Ferrer af5ab770ec More cleaning, deps in routes.json, module autodetection 2019-01-26 02:30:46 +01:00
Juan Ferrer 8fc8292e72 Obsolete code & files removed 2019-01-25 23:02:29 +01:00
Javi Gallego 2a447c2107 package sin bcrypt 2019-01-25 16:27:26 +01:00
Joan Sanchez 8f07ac1751 print fixes & claim pickup order 2019-01-25 15:08:11 +01:00
Carlos Jimenez Ruiz b111480023 removed bcrypt due to backend error upon login 2019-01-24 16:05:07 +01:00
Carlos Jimenez Ruiz 366527d87e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-24 11:07:23 +01:00
Carlos Jimenez Ruiz 45caad4c0f gulp-nodemon dev dependency added 2019-01-24 11:07:15 +01:00
Juan Ferrer adfd69b393 #981 e2e passed 2019-01-24 10:57:43 +01:00
Juan Ferrer 1ccffd63a9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-24 09:25:57 +01:00
Carlos Jimenez Ruiz 648bd46862 small e2e refactors 2019-01-23 15:33:25 +01:00
Juan Ferrer e080802445 #981 Login unified without passing tests 2019-01-23 13:11:44 +01:00
Joan Sanchez 5bf430400d show results count #992 2019-01-23 11:08:27 +01:00
Carlos Jimenez Ruiz 2011e56a6a #982 Preparar tests para que puedan ser lanzados desde el servidor 2019-01-21 17:01:01 +01:00
Javi Gallego b60deafff1 actualiza fuentes a 1.19 2019-01-15 13:22:31 +01:00
Juan Ferrer 40b485da41 #255 Download invoices 2019-01-14 17:26:59 +01:00
Carlos Jimenez 7bb1033162 #863 e2e client.paymethod update 2019-01-09 16:45:56 +01:00
Juan Ferrer ab3e588b1e Gulp updated, packages updated, db docker bugs fixed 2019-01-09 10:02:56 +01:00
Juan Ferrer 4bf80493fc Deploy fixes 2019-01-07 09:54:00 +01:00
Juan Ferrer 9cdfe0c5d9 #814 First stable version 2018-12-27 12:54:16 +01:00
Juan Ferrer 97e0b33d0d #814 Service modules moved to project root, models reclassified 2018-12-21 20:22:13 +01:00
Juan Ferrer 3c0db4f63d #876 Fixed, packages webpack, babel & karma upgraded, tests fixed 2018-12-20 14:37:29 +01:00
Javi Gallego 6022bcbe34 bug credit front 2018-12-17 14:16:27 +01:00
Javi Gallego ae3d8f93a1 Tarea #782 client validacion back recargo 2018-11-20 11:02:57 +01:00
Carlos Jimenez 83b211e709 #779 ticket.ticketRequester 2018-11-13 11:26:36 +01:00
Carlos Jimenez 5edd341127 #768 salix.home 2018-11-07 12:41:22 +01:00
Juan c3401a3d9a Merge 2018-11-02 13:54:08 +01:00
Juan 375f276ef6 Debugger autoattach, autorestart services on file change 2018-11-02 10:48:15 +01:00
Javi Gallego 5a253af036 nuevas fuentes fontello 2018-11-01 13:09:20 +01:00
Juan 260f548019 #599 Advanced ticket search, eslint rules fixed, e2e ticket_04 refactor 2018-10-30 13:58:02 +01:00
Carlos Jimenez e953d04d80 #750 configurar reglas de eslint para todos los equipos del proyecto 2018-10-25 14:36:50 +02:00
Carlos Jimenez 3bcca3b39d #750 subida version de eslint, y configs de angular, google, loopback,xo 2018-10-25 09:03:12 +02:00
Carlos Jimenez 06681fa5f4 minimal changes 2018-10-24 16:06:18 +02:00
Carlos Jimenez 784f00c860 #737 Modificar E2E billing data + version de nightmare 2018-10-24 10:57:14 +02:00
Juan 93ed02e901 Merge 2018-10-22 08:24:16 +02:00
Javi Gallego fcb3e88acb route sin risk Create 2018-10-21 12:36:51 +02:00
Juan 4607bce91e E2E fixes, model bug fixes, Nightmare getProperty extensions 2018-10-19 19:54:46 +02:00
Juan c4b3296959 Unit tests fixed 2018-10-18 20:48:21 +02:00
Javi Gallego 33b9efc5b7 Tarea #696 2018-10-16 13:32:58 +02:00
Joan Sanchez 98d035a961 upgraded packages 2018-10-03 09:16:00 +02:00
Joan Sanchez 4388a6dbff added Agency module 2018-09-25 08:53:57 +02:00
Javi Gallego 68e075c496 #654 Permisos en claim.basicData 2018-09-19 07:41:07 +02:00
Juan bf0e1eeaf3 CrudModel: improved, docs, bugs fixed 2018-09-05 13:01:21 +02:00
Javi Gallego c4e0fc74a3 Bug #452 quitamos servicio production 2018-08-30 11:02:50 +02:00
Carlos Jimenez 8d9a907383 subidas versiones de nodemon, jasmine, eslint de jasmine y electron 2018-08-14 08:24:07 +02:00
Joan Sanchez ff0f0436af Fixed locales: client & back-end validations, back-end UserError. #464 2018-08-02 09:49:00 +02:00
Carlos Jimenez d2314b8a1b renamed karma spec files acordantly and removed unused ones on client client 2018-07-31 12:38:31 +02:00
Joan Sanchez 896c033594 added order catalogue #408 2018-07-24 09:35:23 +02:00
Juan e93cbda6d0 Zero deploy downtime, deploy speed improved 2018-06-11 20:19:18 +02:00
Juan 30aea3d086 Tests fixed, watcher refactor, global error handling, angular 1.7 2018-05-25 17:25:35 +02:00
Joan Sanchez 8f9f7c1fe6 Ticket basic data and date-picker refactor 2018-05-16 08:13:39 +02:00
Javi Gallego 8f37b69bc2 data step one Tarea #215 2018-04-04 13:56:16 +02:00
Javi Gallego e93daa9299 modelo sale con hasMany 2018-03-20 14:01:46 +01:00
Javi Gallego 2ef22e7e83 indice con mas tamaño 2018-03-13 16:25:24 +01:00
Daniel Herrero 81b374d744 Merge conflicts 2018-02-15 10:51:31 +01:00
Daniel Herrero 4aa2d2a255 remove obsolete package 2018-02-14 14:03:46 +01:00
Javi Gallego 225508dd07 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-14 11:34:47 +01:00
Javi Gallego aadf763e76 refactor html 2018-02-14 11:33:21 +01:00
Juan Ferrer Toribio 72830652b4 Documented Gulpfile, improved 'docker-wait' to handle errors 2018-02-13 22:40:02 +01:00
Juan Ferrer Toribio 6af6ca9c34 Merge 2018-02-09 09:12:22 +01:00
Juan Ferrer Toribio a84c6f6de7 Merge branch 'unstable' of https://git.verdnatura.es/salix into unstable 2018-02-09 08:40:28 +01:00
Juan Ferrer Toribio 7b7ee2662f Gulpfile: known bugs solved, performance improbements 2018-02-09 08:40:23 +01:00
Daniel Herrero 1ccf108ddc packageLock 2018-02-08 14:45:39 +01:00
Daniel Herrero 2fe4245ea5 packages version 2018-02-08 14:41:05 +01:00
Juan Ferrer Toribio fd14e29884 Webpack 3 2018-02-08 13:47:54 +01:00
Daniel Herrero 6387f6cedb noteCreate fixed 2018-02-08 13:28:01 +01:00
Juan Ferrer Toribio 0fc1dc0faa Address id fixtures, gulpfile clean, eslint no-empty 2018-02-07 10:29:23 +01:00
Daniel Herrero 19ddead326 package-lock updated 2018-02-06 07:24:10 +01:00
Joan Sanchez 692a226b69 El servicio de Nginx ahora se inicia desde Gulp. Añadido alias de instalacion "gulp i". 2018-02-05 19:22:38 +01:00
Carlos Jimenez 1a1f861205 front unit tests for address-edit, fiscal-data and removed spec file for search-panel as theres nothing to test anymore 2018-02-05 10:58:49 +01:00
Juan Ferrer Toribio 89c745244a YAML configuration, client module register simplified 2018-02-04 19:39:56 +01:00
Juan Ferrer Toribio 597299b1c5 Autogenerated Nginx config and docker compose 2018-02-03 20:14:44 +01:00
Carlos Jimenez 099fbc1c9f gulpfile updated to restart enginx upon services task 2018-02-02 12:38:34 +01:00
Javi Gallego ac8db83582 README fixes, bugfixes for windows 2018-02-02 09:51:38 +01:00
Carlos Jimenez f434de30c3 removed env variable from services tests 2018-02-01 15:00:42 +01:00
Daniel Herrero 81c234f26f gulp error fixed 2018-02-01 14:28:28 +01:00
Juan Ferrer Toribio 7d7d179bdd Fontend tests fixed 2018-01-30 14:48:21 +01:00
Juan Ferrer Toribio a3188b204f Views migrated to vn schema, Node v8, Error handling, async-await, bugs solved 2018-01-29 12:37:54 +01:00
Vicente Falco 1c5a65928e change on services, docker localDB y jasmime 2017-10-24 08:56:18 +02:00
Joan Sanchez ac21ceb399 Vista previa de email, desde el parámetro isPreview 2017-10-19 12:47:05 +02:00