Commit Graph

401 Commits

Author SHA1 Message Date
Daniel Herrero ec0eb7f1d1 test fixed 2017-11-07 11:43:18 +01:00
Daniel Herrero 7f3df756c8 continuacion con la maquetacion del localizador de rutas 2017-11-07 09:59:49 +01:00
Daniel Herrero 4f840c71e3 new icon-menu 2017-11-02 13:27:35 +01:00
Daniel Herrero 1d1f377a18 error con checkboxes y su anchura 2017-11-02 08:46:09 +01:00
Daniel Herrero 83d63547ff sprint3 pantallas de rutas 2017-11-02 08:18:37 +01:00
Daniel Herrero 76b5903770 refactor dataPicker 2017-10-31 10:40:12 +01:00
Daniel Herrero ee7c4e214f bug fixed in dataPicker 2017-10-31 09:44:24 +01:00
Carlos 2be39c0deb setting up spec files for the next directive to test 2017-10-24 08:34:50 +02:00
Carlos 0a8a682376 finished client side unit test for directive id 2017-10-24 08:08:58 +02:00
Carlos f6c1f5f137 lient side unit test for id directive 2017-10-24 07:57:25 +02:00
Carlos c88023182a client side unit test for vnFocus directive tests 2017-10-23 16:25:47 +02:00
Carlos 4e1d2db3cb unit test for dialog directive plus small refactors 2017-10-23 10:47:56 +02:00
Carlos abb59189ff aclService mock removed as dependencies were corrected on previous commit: 3badf2a 2017-10-20 11:18:44 +02:00
Carlos 8bb2536f90 multi-check unit test repairs 2017-10-20 10:42:55 +02:00
Carlos 3badf2a48a refactor to move aclService from salix to Core 2017-10-20 08:39:30 +02:00
Carlos a530c67336 client side unit test for acl directive plus small refactor 2017-10-19 19:11:49 +02:00
Carlos e8473d56fb correction of expect at acl directive unit test 2017-10-19 15:41:58 +02:00
Carlos 94bfe50818 client side unit test for acl directive, comment added about directive behavior. 2017-10-19 15:40:00 +02:00
Daniel Herrero 82b75d3b70 bugFixed multiCheck onBlur action 2017-10-19 14:13:28 +02:00
Daniel Herrero d72904a69e Bug fixed in multiCheck 2017-10-19 12:31:55 +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
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 56182fb4b1 finished client side unit test for watcher 2017-10-17 12:27:32 +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
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
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
dherrero 80bbd9e5d4 bug fixed in datePicker 2017-10-11 14:21:32 +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 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 96235a6752 route service models 2017-10-10 11:14:35 +02:00
Carlos c341009489 CLient side unit test for dialog onKeypress() 2017-10-09 14:30:23 +02:00
Carlos aec32f5e4a client side unit test for dialog onBackgroundMouseDown() 2017-10-06 16:30:51 +02:00
Carlos 022450000e micro-refactor on spec file 2017-10-06 15:36:25 +02:00
Carlos e6acc57fae client side unit test for dialog onButtonClick() 2017-10-06 15:33:21 +02:00
Carlos 1301fefe68 Merge branch 'dev' of https://git.verdnatura.es/salix into dev
* 'dev' of https://git.verdnatura.es/salix:
  new micro-service route: need reinstall all dependencies
  estructure for new module route
  bug fixed autocomplete and width dropdown
2017-10-05 14:29:11 +02:00
Carlos de9d9e53e2 client side unit test for dialog 2017-10-05 14:28:57 +02:00
dherrero 0c84722755 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-10-05 11:04:30 +02:00
dherrero 562ffed388 bug fixed autocomplete and width dropdown 2017-10-05 11:04:22 +02:00
Carlos 231bd9f813 Merge branch 'dev' of https://git.verdnatura.es/salix into dev
* 'dev' of https://git.verdnatura.es/salix:
  watcher: removed unnecessary injection
  removed unnecessary function in equals.js
  watcher renamed properties
  refactor watcher
2017-10-05 09:58:28 +02:00
Carlos 28909da94e client side unit test for column-header 2017-10-05 09:58:15 +02:00
dherrero 5b100e502c watcher: removed unnecessary injection 2017-10-05 09:53:40 +02:00
dherrero c4d6fd91db removed unnecessary function in equals.js 2017-10-05 09:51:27 +02:00
dherrero e2312d954d watcher renamed properties 2017-10-05 09:31:28 +02:00
dherrero 8df67ad95e Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-10-05 09:21:24 +02:00
dherrero 601cf6db25 refactor watcher 2017-10-05 09:20:40 +02:00
Carlos 485ef528b7 correct eslint errors in the commited files 2017-10-05 08:59:16 +02:00
Carlos 1b47d85828 client side unit test for textfield 2017-10-04 16:02:53 +02:00
Carlos 2402469f39 Merge branch 'dev' of https://git.verdnatura.es/salix into dev
* 'dev' of https://git.verdnatura.es/salix:
  bug fixed modified data object
2017-10-04 13:28:02 +02:00
Carlos 92e1754571 client unit test for paging plus rly small refactors 2017-10-04 13:27:39 +02:00
Dani Herrero 245112438e bug fixed modified data object 2017-10-04 10:54:29 +02:00
Carlos 9f7170f773 Merge branch 'dev' of https://git.verdnatura.es/salix into dev
* 'dev' of https://git.verdnatura.es/salix:
  validation client credit - refact
  validate client credit
  AutoLoad items with "scroll" (1st version)
2017-10-04 08:47:28 +02:00
Carlos 946d7f8824 Autocomplete spec updated, icon-menu spec completed and small refactors in dialog, drop-down and icon-menu 2017-10-04 08:47:16 +02:00
Dani Herrero 2aed5d088c Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-10-04 08:18:49 +02:00
Carlos c39b29128c client side unit test for datePicker 2017-10-03 14:41:35 +02:00
Dani Herrero 2db36a56bb Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-10-03 12:10:43 +02:00
Dani Herrero bc8d319714 AutoLoad items with "scroll" (1st version) 2017-10-03 12:10:30 +02:00
Carlos 73964ac387 removed unsed files and commented code for deprecated date-picker.js 2017-10-03 11:54:09 +02:00
Carlos d121517569 Merge branch 'dev' of https://git.verdnatura.es/salix into dev
* 'dev' of https://git.verdnatura.es/salix:
  dropdown: new style in -no more results-
2017-10-03 11:33:54 +02:00
Carlos 57b03790a3 Autocomplete client side unit tests finished 2017-10-03 11:32:25 +02:00
Dani Herrero 5ef97c209d Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-10-03 09:25:41 +02:00
Dani Herrero 1f5f0a0fda dropdown: new style in -no more results- 2017-10-03 09:25:25 +02:00
Carlos 7d1bc60112 Merge branch 'dev' of https://git.verdnatura.es/salix into dev
* 'dev' of https://git.verdnatura.es/salix:
  bug fixed on LoadMore action in autocomplete
2017-10-03 09:19:02 +02:00
Carlos 106d7d8364 autocomplete client side unit test for findItems() with multiple 2017-10-03 09:18:12 +02:00
Dani Herrero 4e309b67f0 bug fixed on LoadMore action in autocomplete 2017-10-03 09:16:02 +02:00
Dani Herrero 9afb992225 autocomplete changes on initialData 2017-10-03 07:10:37 +02:00
Dani Herrero 1662c9d241 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-09-28 14:34:40 +02:00
Dani Herrero ecf88f6b66 new address list 2017-09-28 14:34:18 +02:00
Carlos 0742a4e098 Merge branch 'dev' of https://git.verdnatura.es/salix into dev
* 'dev' of https://git.verdnatura.es/salix:
  get address return province data
  sales person formated
  getRoleCustomer return object not array of object
  Token authenticate, solunion notification
2017-09-28 12:38:05 +02:00
Carlos 86fdb010ae Autocomplete client side unit test for findItems 2017-09-28 12:37:45 +02:00
Dani Herrero 70e4b22e8a get address return province data 2017-09-28 11:29:01 +02:00
Carlos 720cf89204 Merge branch 'dev' of https://git.verdnatura.es/salix into dev
* 'dev' of https://git.verdnatura.es/salix:
  moved textfield styles
  textfield: clear icon dinamic display
2017-09-27 14:10:42 +02:00
Carlos 66c80fd5bd small refactor in autocomplete.js and some more client side unit test for field() > multiField() and displayValue() 2017-09-27 14:10:03 +02:00
Dani Herrero 35454c5c53 moved textfield styles 2017-09-27 12:44:33 +02:00
Dani Herrero 9d41a70416 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-09-27 12:27:38 +02:00
Dani Herrero 6aed24a02c textfield: clear icon dinamic display 2017-09-27 12:27:18 +02:00
Carlos 5dc0608f86 error corrected 2017-09-27 11:58:35 +02:00
Carlos ef7ee12373 client side unit test for autocomplete field() query functionality 2017-09-27 11:51:25 +02:00
Carlos 9ae7898c19 client side unit test for autocomplete field() > setValue() 2017-09-27 09:42:59 +02:00
Carlos 959f09d272 more tests 2017-09-27 08:09:10 +02:00
Carlos 0a17a59f2d client unit tests for autocomplete field() 2017-09-26 18:21:11 +02:00
Carlos 3a666ef764 client unit test for autocomplete displayValue(), some functionality remains wild i.e. item.checked = false; 2017-09-26 14:10:55 +02:00
Carlos b41f5a3996 unit tests for autocompelete showDropDown plus small correction in other two files. 2017-09-26 10:26:21 +02:00
Javi Gallego 9b76d3d004 validaciones custom se bajan al cliente solo si son isExportable 2017-09-25 17:39:51 +02:00
Dani Herrero 235cc2d8f6 refactoring autocomplete: input readonly and autofucos on search input 2017-09-21 13:10:30 +02:00
Dani Herrero 490ff51fa6 bug fixed in address edit with watcher 2017-09-21 12:24:14 +02:00
Carlos ec4adc7552 Merge branch 'dev' of https://git.verdnatura.es/salix into dev
* 'dev' of https://git.verdnatura.es/salix:
  billing data with acls
2017-09-21 10:27:10 +02:00
Carlos f716721836 info tag for emails updated and html and es.json files addapted. 2017-09-21 10:26:46 +02:00
Dani Herrero 922ae5c848 billing data with acls 2017-09-21 10:23:51 +02:00
Dani Herrero a222a7a8d1 tooltip translate refactor 2017-09-21 09:33:02 +02:00
Dani Herrero 32d816ba60 translate in info tag 2017-09-21 09:06:51 +02:00
Carlos 1e494ec08b refactor plus front-end unit repairs 2017-09-21 08:48:25 +02:00
Dani Herrero f6399596ce autocomplete-v2 renamed 2017-09-20 14:25:43 +02:00
Dani Herrero 4b1e88cc1c removed autocomplete folder 2017-09-20 14:23:53 +02:00
Dani Herrero d8ba5ecdcb Merge branch 'autocomplete-v2' into dev 2017-09-20 14:10:16 +02:00
Carlos 9ed9e13b54 jasmine ESLint plugging added to dev dependencies and refactor on all specs according to eslint rules. 2017-09-20 14:01:33 +02:00
Dani Herrero 07f8309d36 quitado autocomplete anterior 2017-09-20 13:56:47 +02:00
Dani Herrero 1dad2147ca autocomplete con seleccion multiple 2017-09-20 13:52:53 +02:00
Dani Herrero d81d36217a transclude funcionando 2017-09-20 11:50:53 +02:00
Carlos e76f1d74f9 corrected small typo at datePicker.js 2017-09-19 15:03:39 +02:00
Dani Herrero e525f1da30 Merge branch 'dev' into autocomplete-v2 2017-09-19 07:17:56 +02:00
Carlos 2721b87e57 client path e2e tests refactor 2017-09-15 12:24:37 +02:00
Dani Herrero 6651f70e07 autocomplete recatoring 80% 2017-09-14 13:40:55 +02:00
Carlos bd20f76274 test for autocomplete client side 2017-09-14 09:22:49 +02:00
Dani Herrero f9b3657440 refactoring 30% 2017-09-13 14:59:58 +02:00
Dani Herrero 99155e09fb vn-title bug fixed 2017-09-13 13:34:57 +02:00
Dani Herrero e177b3698d deleted unnecessary files 2017-09-13 11:43:00 +02:00
Dani Herrero a200fb8143 textfield with info 2017-09-13 10:59:34 +02:00
Dani Herrero 2fd58af254 refactoring textfield finished 2017-09-13 09:45:42 +02:00
Dani Herrero cccc0ade2b refactoring textfield, validations pending 2017-09-12 15:02:14 +02:00
Dani Herrero c90be5bd04 bug fixed: login 2017-09-12 12:45:29 +02:00
Carlos 22f2d3e7f3 texfield refactor 2017-09-12 11:44:56 +02:00
Javi Gallego 207addf2c3 textfield canvia las cadenas vacias a null 2017-09-07 19:35:17 +02:00
Carlos 352e68ed58 refactor in all client specs to next describes accordingly 2017-09-04 15:06:43 +02:00
Carlos 6c13fce8a9 front client specs ES6 refactor 2017-09-04 14:39:58 +02:00
Carlos aeaa417a4e refactor at app.js to remove troublesome console.log() 2017-08-30 15:39:48 +02:00
Carlos 1eb0c594be unit test for web-access and bug fixes at watcher.js 2017-08-29 12:33:48 +02:00
Dani Herrero 41182abb6e cambio en watcher sustitucion de la función copy de Angular, para que ignore en las copias los campos vacios 2017-07-13 14:55:07 +02:00
Dani Herrero 9fa608b11f bug fixed filter in clients 2017-07-13 13:12:09 +02:00
Dani Herrero 7dfed60e7d bug fixed in new datepicker and material design label effect 2017-07-13 11:03:22 +02:00
Dani Herrero a06ac62b91 datepicker with timezone 2017-07-13 08:58:48 +02:00
Dani Herrero 3cf33fe48b datepicker regex data with timezone 2017-07-13 08:55:39 +02:00
Dani Herrero cd2560c8c6 bug fixed datepicker 2017-07-12 14:57:40 +02:00
Dani Herrero f2c0dd3ab7 pruebas con date-picker y material 2017-07-12 14:32:15 +02:00
Dani Herrero da3fddd9d2 estilos date-picker 2017-07-12 13:32:42 +02:00
Dani Herrero 17186c4035 nuevo date-picker 2017-07-12 13:32:25 +02:00
Dani Herrero 81726e0a09 columnHeader change icon, style 2017-07-11 08:59:12 +02:00
Dani Herrero 142cc920de bug de multi seleccion corregido, cambio estilos 2017-07-06 14:21:55 +02:00
Juan Ferrer Toribio 6f581e033a Merge 2017-07-06 12:43:37 +02:00
Dani Herrero 3c1847134b Front acoplado al endpoint RouteFk 2017-07-06 09:02:27 +02:00
Dani Herrero 51ac5f5262 correccion ortográfica 2017-07-05 14:59:40 +02:00
Dani Herrero 81749e906d refactorizacion popover 2017-07-05 14:41:10 +02:00
Dani Herrero 53af148def corregido error popover 2017-07-05 14:01:03 +02:00
Dani Herrero e4e01c4970 añadida id ruta en tabla, internacionalizacion y mejora de popover 2017-07-05 13:02:49 +02:00
Dani Herrero ffe21e6947 corrección para popover anidados 2017-07-05 09:47:24 +02:00
Dani Herrero f670c0f4fd Localizador: restablecer filtros, datePicker con formato 'es' 2017-07-03 14:50:48 +02:00
Dani Herrero 06537bcf8d filtro de trabajadores y llamada a validaciones opcional 2017-07-03 08:38:45 +02:00
Dani Herrero 461fc3c9a6 internacionalización por subir 2017-06-30 09:09:48 +02:00
Dani Herrero 3bb1eef43d bug fixed in dropDown 2017-06-29 14:28:22 +02:00
Dani Herrero 491ea3b796 dropDown with search and columHeader preview icon 2017-06-29 13:56:52 +02:00
Dani Herrero df614b4943 bugs fixed 2017-06-29 08:13:30 +02:00
Dani Herrero bfdd8ecd8e Localizador: acciones separadas a nuevo componente vnProductionActions 2017-06-28 14:48:07 +02:00
Dani Herrero 6815ab2b3c Localizador: paginación y ordenación desde front, selector actua sobre todos los elementos (no solo sobre los que se muestran) 2017-06-28 13:12:01 +02:00
Dani Herrero c2b351a777 Cambio de hora y refactorizacion del vnMultiCheck 2017-06-28 08:55:01 +02:00
Dani Herrero b9704a2b91 corregido fallo en vnMultiCheck 2017-06-26 14:52:43 +02:00
Dani Herrero 4480431a08 estilos en vnMultiCheck 2017-06-26 14:41:08 +02:00
Dani Herrero 8b6e7fdc40 nuevo componente vnMultiCheck 2017-06-26 13:53:52 +02:00
Dani Herrero fabe0cde7c front: send message action 2017-06-26 10:52:22 +02:00
Dani Herrero 09e805fd3a Ordenación en campos correcto, autocomplete con clear 2017-06-22 15:04:02 +02:00
Dani Herrero 2bdbda6192 Localizador, cambio estlios, añadido paginador, order by 2017-06-22 12:03:01 +02:00
Dani Herrero 05b6c81a1b dropDown con filtro 2017-06-21 13:16:37 +02:00
Dani Herrero 3796741371 primera versión del componente vnGridHeader para ordenación de tablas 2017-06-21 09:46:31 +02:00
Dani Herrero d444980ab1 [En progreso] nuevo componente vnGridHeader para ordenación de tablas 2017-06-20 15:00:27 +02:00
Dani Herrero ca19369093 Production: modal para mensajes, filtros búsqueda en front 100% 2017-06-20 09:27:49 +02:00
Dani Herrero bcdc31d8d9 arreglo en autocomplete para admitir valores por defecto 2017-06-15 15:00:43 +02:00
Dani Herrero 1ca5e20494 añadido callBack cambio estados 2017-06-15 12:00:51 +02:00
Dani Herrero 5f2aa345ba iconMenu arreglo de posicion del DropDown interno 2017-06-15 11:22:47 +02:00
Dani Herrero f346e5e83c arreglos en drop-down 2017-06-15 08:26:03 +02:00
Dani Herrero 9072b100f9 tooltip admite plantilla html, icon-menu forzado de posicion en dropDown 2017-06-15 07:45:01 +02:00
Dani Herrero afff93cce6 Tooltip: admite html, Localizador: añadido icono con información adicional 2017-06-14 09:54:00 +02:00
Dani Herrero 7713d0bd6f cambio estilos dropdown 2017-06-13 14:57:09 +02:00
Dani Herrero e09f60a53a Nuevos componentes: drop-down, icon-menu. Refactorización de icon e icon-button (pasados a componentes sin template manager) 2017-06-13 13:08:06 +02:00
Dani Herrero f274335997 interfaz gráfica y correcciones varias 2017-06-08 14:57:23 +02:00
Dani Herrero 491241398a localizador y tooltip arreglo estilos 2017-06-08 10:05:11 +02:00
Dani Herrero 3806e9e591 nueva directiva vn-tooltip 2017-06-08 09:29:03 +02:00
Dani Herrero 51a700b6ce date-picker v1 2017-06-07 13:27:57 +02:00
Juan Ferrer Toribio 5d789b0e71 Locales 2017-06-07 08:39:40 +02:00
Dani Herrero 9fcdb28d14 cambio en routes e interfaz localizador al 5% 2017-06-06 13:06:47 +02:00
Juan Ferrer Toribio 609c984426 Loopback 3, errores solucionados, codigo reorganizado 2017-06-05 09:01:21 +02:00
Juan Ferrer Toribio b427361156 Loopback 3, Errores solucionados 2017-06-03 13:01:47 +02:00
Dani Herrero 39bb122ee1 renombrado de archivos parte 2 2017-05-31 10:28:39 +02:00
Dani Herrero 11c3b2de2d renombrado de archivos parte 1 2017-05-31 09:46:05 +02:00
Dani Herrero 87c38a0d89 creada factoria q retorna los modulos disponibles para el usuario, ACL 2017-05-30 09:54:35 +02:00
Juan Ferrer Toribio 025bd4224e Errores en validación solucionados 2017-05-26 17:05:33 +02:00
Juan Ferrer Toribio 0f4ac0edbb Console.log eliminado 2017-05-26 14:42:01 +02:00
Juan Ferrer Toribio 3d71f454a0 Errores en validación IBAN solucionados 2017-05-26 14:39:36 +02:00
Juan Ferrer Toribio d3ef7dde86 Error en validación length solucionado 2017-05-26 13:26:12 +02:00
Juan Ferrer Toribio a73b2eba0d Errores solucionados 2017-05-26 13:14:47 +02:00
Dani Herrero 571692f4ca Añadidos estilos a elementos desabilitados, mejora de directiva vnAcl 2017-05-25 14:23:19 +02:00
Juan Ferrer Toribio 041be5ec93 Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev 2017-05-25 12:52:49 +02:00
Juan Ferrer Toribio 1482b842bd Errores solucionados 2017-05-25 12:52:38 +02:00
Dani Herrero 81f9de098d ACLs , permisos a nivel de rutas, menu y componentes 2017-05-25 11:48:10 +02:00
Juan Ferrer Toribio 345f2e55a5 vnAutocomplete: Acepta plantillas 2017-05-24 13:24:32 +02:00
Juan Ferrer Toribio 5b9fcf868a 401 redirecciona a login, vnAutocomplete: campos seleccionados 2017-05-23 14:05:26 +02:00
Juan Ferrer Toribio 0b490f4105 Merge 2017-05-22 12:06:33 +02:00
repository 04d5f9cf5d eliminado vn-repeat 2017-05-22 08:23:51 +02:00
repository 778ff9a5ec intento de commit dani 2017-05-22 07:29:13 +02:00
Juan Ferrer Toribio 5cfdd51cf4 Integración usuarios, errores solucionados 2017-05-21 18:36:07 +02:00
Juan Ferrer Toribio c4cb0906ad Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev 2017-05-18 17:35:51 +02:00
Juan Ferrer Toribio a2ac778c9a Peticiones XHR con token 2017-05-18 17:35:07 +02:00
nelo 2aa7c9731d Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev 2017-05-18 08:18:53 +02:00
Juan Ferrer Toribio 9d4acfc64f Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev 2017-05-17 21:23:54 +02:00