Commit Graph

25531 Commits

Author SHA1 Message Date
Dani Herrero 070cd764b6 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-10-19 07:16:51 +02:00
vicentefalco d07f65893d docker DB local 2017-10-18 18:26:40 +02:00
Dani Herrero 59577bcb7f bug fixed rawSQL 2017-10-18 15:06:38 +02:00
Carlos 09a24fe8e8 fixtures 2017-10-18 14:48:39 +02:00
Carlos b5d90dfbc6 micro refactor and deletion of unused file. 2017-10-18 14:33:34 +02:00
Dani Herrero 3d52031dc2 cambios en validacion de credito de cliente 2017-10-18 12:51:33 +02:00
vicentefalco a0955cf50d docker dbLocal 2017-10-18 06:41:17 +02:00
Carlos 85ec628ae6 refactor to load controller on the beforeEach in all spec files for client side unit tests 2017-10-17 14:24:40 +02:00
Carlos 4cfc6f23d9 small test added to the watcher 2017-10-17 12:33:37 +02:00
Carlos 5073527c93 Merge branch 'dev' of https://git.verdnatura.es/salix into dev
* 'dev' of https://git.verdnatura.es/salix:
  facke active drivers rest created
  parse vars in filer routes
  Respuesta json en peticiones, auth, escrito impresoras
2017-10-17 12:29:59 +02:00
Carlos 56182fb4b1 finished client side unit test for watcher 2017-10-17 12:27:32 +02:00
Dani Herrero a366ef1fc1 facke active drivers rest created 2017-10-17 12:22:19 +02:00
Dani Herrero 5514ec222a Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-10-17 09:41:08 +02:00
Dani Herrero 09f54b40d0 parse vars in filer routes 2017-10-17 09:40:56 +02:00
Joan Sanchez d66fed5a3d Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-10-17 09:01:51 +02:00
Dani Herrero 22ccf278a4 config file 2017-10-17 08:45:51 +02:00
unknown eab51e1b9d Respuesta json en peticiones, auth, escrito impresoras 2017-10-17 08:22:59 +02:00
Carlos 5e1be3bc53 client side unit test for vnWatcher until submit[controller.save] plus small refactor for other files plus deletion of unused file 2017-10-16 15:20:40 +02:00
Carlos 496fd22b60 Client side unit test for watcher until $onDestroy 2017-10-13 18:26:38 +02:00
Carlos d7668c278d Client side unit tests for spinner 2017-10-13 17:35:47 +02:00
Juan Ferrer Toribio 82e4fdab68 Habilitado servicio route 2017-10-13 16:57:48 +02:00
Juan Ferrer Toribio bcec5326f2 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-10-13 16:54:12 +02:00
Juan Ferrer Toribio 0962fa19e5 Eliminando codigo redundante v5 2017-10-13 16:54:07 +02:00
Carlos c1ea17a377 client side unit test for multi-check 2017-10-13 16:43:11 +02:00
Carlos 91b9c0bcf9 client side unit test for multi check until switchChecks() 2017-10-13 16:26:47 +02:00
Juan Ferrer Toribio 8fc14348d7 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-10-13 16:23:08 +02:00
Juan Ferrer Toribio 5f1066ff03 Eliminando codigo redundante v3 2017-10-13 16:23:00 +02:00
Juan Ferrer Toribio 4267b5fe0a Eliminando código redundante v2 2017-10-13 16:22:45 +02:00
Carlos 7cf57d05f1 Client side unit test for grid-header 2017-10-13 10:45:06 +02:00
Carlos 311d80d902 Client side unit test for drop-down 2017-10-13 10:23:28 +02:00
Vicente Falco 09e7e7f4ce DockerFile db local 2017-10-13 08:53:54 +02:00
Juan Ferrer Toribio ad24380043 Merge 2017-10-11 16:00:36 +02:00
Juan Ferrer Toribio 08da6c9713 Eliminando código redundante v1 2017-10-11 15:36:47 +02:00
dherrero f24e16b81d moved model agency 2017-10-11 15:00:18 +02:00
dherrero 80bbd9e5d4 bug fixed in datePicker 2017-10-11 14:21:32 +02:00
dherrero e52b31ceb3 service validations moved into generic folder 2017-10-11 14:10:51 +02:00
dherrero 4563ee1b58 removed console.log 2017-10-11 13:25:03 +02:00
dherrero f95f77fbe7 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-10-11 13:03:11 +02:00
dherrero 760d63ec6c removed unused files 2017-10-11 13:03:05 +02:00
Carlos a62285ff9e Merge branch 'dev' of https://git.verdnatura.es/salix into dev
* 'dev' of https://git.verdnatura.es/salix:
  zone model and rest api
  module routes: front dev 80%
  filtro de rutas con paginación
  routes change model and first look
  Login sin url de redirección
2017-10-11 12:57:26 +02:00
Carlos 3e44e927e8 client side unit test for dropdown until setScrollPosition 2017-10-11 12:57:13 +02:00
dherrero 4dae59aa09 zone model and rest api 2017-10-11 12:47:02 +02:00
dherrero cf36d7d6be module routes: front dev 80% 2017-10-11 12:09:22 +02:00
dherrero 911fbb2f8b filtro de rutas con paginación 2017-10-11 09:18:26 +02:00
dherrero 5a07973789 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-10-10 15:01:21 +02:00
dherrero eeda5b45fd routes change model and first look 2017-10-10 15:01:10 +02:00
joan c3d611adb2 Login sin url de redirección 2017-10-10 14:45:13 +02:00
dherrero 1bc3a0bdd7 autocomplete bug fixed in loadMore button 2017-10-10 12:56:03 +02:00
dherrero bf903d8b1e textfield: icons position changed 2017-10-10 12:37:52 +02:00
dherrero 2d7e3f8dfe Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-10-10 11:14:45 +02:00