verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity
17,912 Commits 259 Branches 0 Tags 122 MiB
Commit Graph

263 Commits

Author SHA1 Message Date
Javi Gallego 2714857227 Merge branch 'dev' into 2443
gitea/salix/pipeline/head This commit looks good Details
2020-09-30 14:07:38 +02:00
Javi Gallego 891a113326 package 2020-09-30 14:07:34 +02:00
Carlos Jimenez Ruiz 40abd68734 fix byWarehouse and ticket.filter tests
gitea/salix/pipeline/head This commit looks good Details
2020-09-29 13:11:11 +02:00
Joan Sanchez 53e729eddd 2366 - Merge event colors
gitea/salix/pipeline/head This commit looks good Details
2020-09-24 10:14:53 +02:00
Bernat Exposito Domenech ce1c4e6f60 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2378-imap 2020-09-22 14:00:52 +02:00
Joan Sanchez 89667a18c9 Handle ticket without old state
gitea/salix/pipeline/head This commit looks good Details
2020-09-22 07:50:30 +02:00
Juan Ferrer b9c526c29c LDAP user & role syncronization
gitea/salix/pipeline/head This commit looks good Details
2020-09-21 13:24:43 +02:00
Juan Ferrer 4b5d2cd0dd 2177 account module
gitea/salix/pipeline/head There was a failure building this commit Details 
LDAP test

RC1

SQL version changed

Tests fixes

Back & front tests fixed

All tests passed

Front and back tests plus some fixes
 2020-09-11 14:36:16 +02:00
Bernat Exposito Domenech d90fb3444c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2378-imap 2020-09-08 08:30:00 +02:00
Javi Gallego daee9081d1 test excepto invoiceOut
gitea/salix/pipeline/head This commit looks good Details
2020-08-31 12:29:51 +02:00
Javi Gallego 8b26c41b7f campo packageFk
gitea/salix/pipeline/head This commit looks good Details
2020-08-28 17:06:27 +02:00
Joan Sanchez 55b3e962a4 Merge branch 'dev' into 1361-calendar_date_filter
gitea/salix/pipeline/head There was a failure building this commit Details
2020-08-18 12:03:31 +00:00
Joan Sanchez cacf562954 Audit fix
gitea/salix/pipeline/head There was a failure building this commit Details
2020-08-18 14:01:43 +02:00
Carlos Jimenez Ruiz 8141815fe1 upgraded babel preset env due to a deprecation
gitea/salix/pipeline/head This commit looks good Details
2020-08-14 18:20:54 +02:00
Bernat Exposito Domenech 860f9f4e87 new method for imap 2020-08-11 11:12:40 +02:00
Joan Sanchez 159b5f3bb8 #2351 Item image queue scheduler
gitea/salix/pipeline/head This commit looks good Details
2020-07-13 11:58:31 +02:00
Carlos Jimenez Ruiz 837ec554d3 field unit test + jest and babel-jest versions upgraded + readme update
gitea/salix/pipeline/head This commit looks good Details
2020-06-22 15:59:29 +02:00
Javi Gallego 552828a1ba hasta precio
gitea/salix/pipeline/head This commit looks good Details
2020-06-16 10:47:01 +02: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
Javi Gallego b40be5cca9 2035
gitea/salix/pipeline/head Build queued... Details
2020-06-05 10:01:21 +02:00
Joan Sanchez 30c721b0e2 Added ACL
gitea/salix/pipeline/head This commit looks good Details
2020-06-04 08:21:08 +02:00
Javi Gallego d8871c0bce cr
gitea/salix/pipeline/head This commit looks good Details
2020-05-26 10:37:52 +02:00
Juan Ferrer e7cf060e12 Merge fixes
gitea/salix/pipeline/head This commit looks good Details
2020-05-19 10:51:50 +02:00
Carlos Jimenez Ruiz 8cfa6df99c fixed list sales e2e path
gitea/salix/pipeline/head This commit looks good Details
2020-05-18 16:53:48 +02:00
Javi Gallego dbb2257430 test de zone_getLanded y zone_getFromGeo
gitea/salix/pipeline/head This commit looks good Details
2020-04-20 13:49:33 +02:00
Juan Ferrer a1a460d049 gulp-jamine@4.0.0, waitForSnackbar()
gitea/salix/pipeline/head This commit looks good Details
2020-04-08 11:24:40 +02:00
Juan Ferrer 84bf240e71 All tests passed, but some intermittence in e2e
gitea/salix/pipeline/head This commit has test failures Details
2020-03-23 23:57:11 +01:00
Juan Ferrer b4a5a88943 E2E fixed
gitea/salix/pipeline/head This commit looks good Details
2020-03-17 14:01:25 +01:00
Carlos Jimenez Ruiz 671c5d7f3f downgraded package as per version bug
gitea/salix/loopback-componenet-storage This commit looks good Details
2020-01-28 11:26:12 +01:00
Carlos Jimenez Ruiz 505a491f59 #1976 Implementar Puppeteer 2020-01-09 13:07:16 +01:00
Carlos Jimenez Ruiz cd2dacba8a merge
gitea/salix/puppeteer This commit has test failures Details
2019-12-12 08:37:35 +01:00
Javi Gallego 3c36526f12 E2E fix for windows plus refactors 2019-11-28 12:54:34 +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
Javi Gallego 1a56f0af96 zoneRefactor 2019-10-29 12:29:38 +01:00
Joan Sanchez 443aa56fed refactor
gitea/salix/1466-print_refactor This commit looks good Details
2019-10-29 07:46:44 +01:00
Juan Ferrer 9f2d137906 New: vnToggle, vnField, vnCheck & vnRadio refactor
gitea/salix/dev This commit looks good Details
2019-10-04 12:33:16 +02:00
Javi Gallego 0573fec950 merge
gitea/salix/dev This commit has test failures Details
2019-09-30 14:37:51 +02:00
Javi Gallego 1c2759eb0f # 496 sustituir interpolate por plantillas angular 2019-09-30 14:32:42 +02:00
Juan Ferrer f5d9d2133e CI jest tests enabled
gitea/salix/dev This commit looks good Details
2019-09-30 13:10:29 +02:00
Carlos Jimenez Ruiz bcceb94e40 deprecated Karma 2019-09-23 13:55:19 +02:00
Carlos Jimenez Ruiz c498216f0b #1647 ticket.menu la barra de desplazamiento
gitea/salix/dev This commit looks good Details
2019-08-23 10:17:41 +02:00
Joan Sanchez 1abc051f1d updated package-lock
gitea/salix/dev There was a failure building this commit Details
2019-07-03 12:59:51 +02:00
Joan Sanchez 585723d714 removed failing package-lock 2019-07-03 12:46:32 +02:00
Carlos Jimenez Ruiz fe7278af66 #1387 e2e Ticket Edit sale path 2019-06-26 14:19:08 +02:00
Javi Gallego 289f588923 #1550 ticket.descriptor polizon cambia estado
gitea/salix/dev This commit has test failures Details
2019-06-21 07:41:03 +02:00
Carlos Jimenez Ruiz 63febf8bd0 #1537 refactor fixtures + e2e fixes 2019-06-19 09:03:45 +02:00
Juan Ferrer 03205e01ae NPM fix, fdescribe removed
gitea/salix/dev This commit looks good Details
2019-06-13 09:49:36 +02:00
Juan Ferrer 89a563eaf9 Merge 2019-06-13 09:21:36 +02:00
Juan Ferrer 3ff95fa45e Remotig debug enabled, log of HTTP 400 disabled
gitea/salix/master This commit looks good Details
2019-06-11 15:46:42 +02:00
Carlos Jimenez Ruiz e0cc80277c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-06-07 14:13:49 +02:00
Carlos Jimenez Ruiz 3833bc9293 #1400 report.sepaCore IBAN portugal 2019-06-07 14:13:40 +02:00
Joan Sanchez 4545d1f649 merge from test to dev - no structure 2019-06-07 13:06:54 +02:00
Joan Sanchez c28734ff61 added dms tasks #1499, #1469, #1468, #1484
gitea/salix/dev There was a failure building this commit Details
2019-06-06 13:59:11 +02:00
Carlos Jimenez Ruiz 7fce2e233c #1455 e2e worker.timeControl
gitea/salix/dev This commit has test failures Details
2019-06-04 07:57:01 +02:00
Javi Gallego 187064066b package npm audit fix
gitea/salix/dev This commit looks good Details
2019-06-04 07:11:41 +02:00
Javi Gallego 3776e0588c merge paso 1 2019-05-23 13:05:02 +02:00
Carlos Jimenez Ruiz 28057ecf3f #1445 e2e ticket.services
gitea/salix/dev This commit looks good Details
2019-05-20 11:16:56 +02:00
Javi Gallego 0b0aa5d22d npmFix
gitea/salix/dev This commit has test failures Details
2019-05-17 23:18:57 +02:00
Carlos Jimenez Ruiz 511e33b835 #1350 route.index worker descriptor + filters 2019-04-25 14:24:02 +02:00
Javi Gallego 47e55580ad #1258 ticket.index sumatorio
gitea/salix/dev This commit looks good Details
2019-04-25 07:57:26 +02:00
Juan Ferrer 13ca2f7e52 DB versioning
gitea/salix/dev This commit looks good Details
2019-04-03 10:29:05 +02:00
Javi Gallego 0b977d3b0b #1293 ticket.components solo muestra base
gitea/salix/dev This commit looks good Details
2019-04-02 08:00:16 +02:00
Carlos Jimenez Ruiz 1d6aeae7de package lock 2019-03-28 12:29:30 +01:00
Carlos Jimenez Ruiz 2263da2e05 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-03-28 11:55:31 +01:00
Carlos Jimenez Ruiz a14ba28629 #1263 invoiceOut.summary 2019-03-28 11:55:23 +01:00
Joan Sanchez 56f352686c added sms endpoint #1149
gitea/salix/dev This commit looks good Details
2019-03-27 08:48:13 +01:00
Joan Sanchez 2ca5def095 build english locale on dist directory #1268
gitea/salix/dev This commit looks good Details
2019-03-26 12:05:53 +01:00
Carlos Jimenez Ruiz c4bcd52d3c #1210 e2e item.index ocultar columnas
gitea/salix/dev This commit looks good Details
2019-03-06 09:50:12 +01:00
Joan Sanchez 11603f8d90 Add services to deliver-note #1201. Renamed receipt
gitea/salix/dev This commit has test failures Details
2019-03-05 14:59:18 +01:00
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