08bfb80912
refactor to fix and update testing fixtures
2017-12-05 11:21:48 +01:00
Javi Gallego
8755d4846a
merge
2017-12-04 08:17:29 +01:00
Joan Sanchez
02fb54efa9
merge
2017-11-22 20:55:44 +01:00
Joan Sanchez
774f577edd
Ruta de validación de token en servicio Auth
2017-11-22 20:54:20 +01:00
aae137d35e
changed datasource in employeeList service
2017-11-22 13:35:05 +01:00
ba73869fd3
changes in getRoleCustomer service
2017-11-22 13:24:36 +01:00
3bd913cbd9
changed datasource in salesperson service
2017-11-22 13:19:51 +01:00
Javi Gallego
bfd584487f
limpieza de models auth obsoleto, ahora vn
2017-11-22 12:43:12 +01:00
Javi Gallego
b3e8b4542a
model client con la nueva nomenclatura
2017-11-22 08:59:21 +01:00
e7d19da8f5
added sales person property into create new client
2017-11-21 14:53:09 +01:00
28c4cdfa5f
removed eslint problems
2017-11-21 11:59:43 +01:00
730d52169e
bug fixed in salesperson query
2017-11-21 11:50:37 +01:00
13c15bb5b3
production with searchbar
2017-11-21 11:12:52 +01:00
Joan Sanchez
a138554301
Cambiada ruta de petición al desactivar cliente.
2017-11-20 18:56:53 +01:00
96f1db5cb7
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-11-16 15:06:04 +01:00
ea35c1feda
new searchBar
2017-11-16 15:05:45 +01:00
e03d257930
Errores en spinner
2017-11-16 13:47:18 +01:00
519a55fac7
Merge, errores en spinner solucionados
2017-11-16 13:46:56 +01:00
67829f5694
Correcciones varias
2017-11-16 12:35:07 +01:00
79e09e32e3
client: dni validation
2017-11-16 12:02:45 +01:00
5c1f4321ed
removed favicon
2017-11-16 07:51:42 +01:00
be286f6057
favicon moved
2017-11-16 07:16:10 +01:00
dfb5552181
new Favicon
2017-11-15 14:39:46 +01:00
d4a0cf205d
bug fixed in edit addresses
2017-11-15 12:11:35 +01:00
d19ebe0c8c
bug fixed list producction
2017-11-14 11:20:12 +01:00
77ccc0e8af
temp favicon.ico (to update once we have the right one)
2017-11-14 08:24:01 +01:00
29149b1b58
corrected some eslint errors and small refactor
2017-11-13 22:15:44 +01:00
154c06e7f4
added hasToInvoiceByAddress checkbox to client > billingData
2017-11-13 11:47:41 +01:00
6ea0f05054
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-11-09 14:27:23 +01:00
17143883f8
address data changes
2017-11-09 14:27:01 +01:00
7223922251
typo corrected at dblocal fixtures plus renamed files and selectors added
2017-11-09 13:54:06 +01:00
b77395762c
bug fixed in address
2017-11-09 13:22:54 +01:00
3d33c21cc8
removed eslint errors
2017-11-09 08:59:40 +01:00
d2491bfbf4
refact production list
2017-11-09 08:54:41 +01:00
10c52a75b9
microservices: configuration
2017-11-09 07:45:46 +01:00
14820fbb3e
merge
2017-11-09 07:34:17 +01:00
20a6728ed6
microservices: boot
2017-11-09 07:34:02 +01:00
a9cab91acc
Production Package
2017-11-08 20:06:00 +01:00
9cddb00a19
Client: Request Package
2017-11-08 18:27:31 +01:00
18121e1d9d
docker context
2017-11-08 17:44:10 +01:00
2de3ccff8e
Docker auth
2017-11-08 17:40:15 +01:00
c03e5297a2
Docker loopback
2017-11-08 17:24:23 +01:00
254615331a
Docker: Faster
2017-11-08 17:04:08 +01:00
f71dfa53ef
refact list production
2017-11-08 14:59:46 +01:00
1d109f2371
docker
2017-11-08 14:11:33 +01:00
063b97d3e1
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-11-08 13:42:41 +01:00
061ae64c50
production filtering in temporary table
2017-11-08 13:42:33 +01:00
0a107ba0bc
docker
2017-11-08 09:57:51 +01:00
b1f17349c3
Docker changes
2017-11-07 19:21:11 +01:00
5a1aca198b
localizador rutas maquetacion 90%
2017-11-07 11:22:33 +01:00
e04cda0f35
service Production: bugs
2017-10-31 09:26:11 +01:00
d839ba2aca
local db inserts update
2017-10-27 13:39:50 +02:00
ac8797f24d
Client Service: Employee List active
2017-10-25 13:47:39 +02:00
2eeae6cc36
local DB user emails inserts updated to fix bug plus gitignore
2017-10-25 14:48:23 +08:00
Joan Sanchez
9d6eeba1a3
merge
2017-10-25 00:39:34 +02:00
Joan Sanchez
13981ae023
Quita contraseña de smtp.test.json
2017-10-25 00:38:02 +02:00
e7223ef493
Client: email from Account not required
2017-10-24 14:29:53 +02:00
a58d530523
Client: add notes
2017-10-24 14:10:09 +02:00
64497d70e1
Client Address: Change default address
2017-10-24 13:37:27 +02:00
ea001f44b1
SQL changes for localDB docker
2017-10-24 12:47:58 +02:00
1c5a65928e
change on services, docker localDB y jasmime
2017-10-24 08:56:18 +02:00
b32f0b199f
mailer localDB
2017-10-22 14:03:04 +02:00
Joan Sanchez
7b2506df80
setup-printer translation, added client-welcome report
2017-10-20 14:03:25 +02:00
Joan Sanchez
ac21ceb399
Vista previa de email, desde el parámetro isPreview
2017-10-19 12:47:05 +02:00
83d262ec32
agencyService changes to agencyMode
2017-10-19 09:21:34 +02:00
9159af69f4
correciones varias
2017-10-19 09:12:27 +02:00
070cd764b6
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-10-19 07:16:51 +02:00
59577bcb7f
bug fixed rawSQL
2017-10-18 15:06:38 +02:00
09a24fe8e8
fixtures
2017-10-18 14:48:39 +02:00
3d52031dc2
cambios en validacion de credito de cliente
2017-10-18 12:51:33 +02:00
a0955cf50d
docker dbLocal
2017-10-18 06:41:17 +02:00
a366ef1fc1
facke active drivers rest created
2017-10-17 12:22:19 +02:00
5514ec222a
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-10-17 09:41:08 +02:00
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
22ccf278a4
config file
2017-10-17 08:45:51 +02:00
eab51e1b9d
Respuesta json en peticiones, auth, escrito impresoras
2017-10-17 08:22:59 +02:00
0962fa19e5
Eliminando codigo redundante v5
2017-10-13 16:54:07 +02:00
8fc14348d7
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-10-13 16:23:08 +02:00
5f1066ff03
Eliminando codigo redundante v3
2017-10-13 16:23:00 +02:00
4267b5fe0a
Eliminando código redundante v2
2017-10-13 16:22:45 +02:00
09e7e7f4ce
DockerFile db local
2017-10-13 08:53:54 +02:00
ad24380043
Merge
2017-10-11 16:00:36 +02:00
08da6c9713
Eliminando código redundante v1
2017-10-11 15:36:47 +02:00
f24e16b81d
moved model agency
2017-10-11 15:00:18 +02:00
e52b31ceb3
service validations moved into generic folder
2017-10-11 14:10:51 +02:00
760d63ec6c
removed unused files
2017-10-11 13:03:05 +02:00
4dae59aa09
zone model and rest api
2017-10-11 12:47:02 +02:00
cf36d7d6be
module routes: front dev 80%
2017-10-11 12:09:22 +02:00
911fbb2f8b
filtro de rutas con paginación
2017-10-11 09:18:26 +02:00
5a07973789
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-10-10 15:01:21 +02:00
eeda5b45fd
routes change model and first look
2017-10-10 15:01:10 +02:00
c3d611adb2
Login sin url de redirección
2017-10-10 14:45:13 +02:00
2d7e3f8dfe
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-10-10 11:14:45 +02:00
96235a6752
route service models
2017-10-10 11:14:35 +02:00
48cac24d88
Jenkins y routes
2017-10-10 11:09:47 +02:00
431032177c
new micro-service route: need reinstall all dependencies
2017-10-05 14:26:04 +02:00
dd004fdc89
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-10-04 13:32:44 +02:00
0925451364
spread equivalent tax in all addresses
2017-10-04 13:32:26 +02:00
Joan Sanchez
9ebd705aea
Errores en servicio de autenficación solucionados.
2017-10-04 13:27:38 +02:00
9fbc404aa1
bug fixed in formatCard function
2017-10-04 09:07:14 +02:00
8e5eca5629
validation client credit - refact
2017-10-04 08:33:51 +02:00
2aed5d088c
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-10-04 08:18:49 +02:00
627d27ad51
validate client credit
2017-10-04 08:18:31 +02:00
Joan Sanchez
666928b1a9
Auth login json response
2017-10-03 14:44:11 +02:00
4e309b67f0
bug fixed on LoadMore action in autocomplete
2017-10-03 09:16:02 +02:00
Joan Sanchez
aef9659798
Mailer: Autentificación token por ruta. Fix creditClassification
2017-10-02 11:19:55 +02:00
Javi Gallego
19e7e0d76b
cambio de enabled y default por isEnabled y isDefaultAddress
2017-09-29 14:41:30 +02:00
ecf88f6b66
new address list
2017-09-28 14:34:18 +02:00
70e4b22e8a
get address return province data
2017-09-28 11:29:01 +02:00
1d47bf58f1
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-09-28 09:14:31 +02:00
62cc0c3c9e
sales person formated
2017-09-28 09:13:42 +02:00
895b3435c4
getRoleCustomer return object not array of object
2017-09-28 08:41:45 +02:00
Joan Sanchez
677e8ddd62
Token authenticate, solunion notification
2017-09-27 17:44:51 +02:00
bc20725c6c
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-09-27 09:25:39 +02:00
fbd5fea126
[finish] active salesPerson service
2017-09-27 09:25:33 +02:00
79438f31cb
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
...
* 'dev' of https://git.verdnatura.es/salix :
active salesperson service in progress
2017-09-27 08:55:38 +02:00
6798655869
removed unused file
2017-09-27 08:54:37 +02:00
4eeb5df74f
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-09-27 07:22:44 +02:00
43a55f60c4
active salesperson service in progress
2017-09-27 07:22:40 +02:00
f647e9e2d1
Modelos y código común para servicios loopback
2017-09-26 16:59:24 +02:00
Javi Gallego
bf0bd37773
validacion del Iban
2017-09-25 17:40:02 +02:00
Javi Gallego
9b76d3d004
validaciones custom se bajan al cliente solo si son isExportable
2017-09-25 17:39:51 +02:00
a5df4afc0f
refactor on routes.js
2017-09-22 13:06:38 +02:00
f588e3f046
linter errors corrected
2017-09-21 14:49:14 +02:00
747d5f5e36
datasource.test files for the local test db plus dockerfile refactor
2017-09-21 14:46:42 +02:00
35ce85e3fc
docker DB
2017-09-21 12:17:48 +02:00
76b0b955cf
fixed ESLint errores for the commited files.
2017-09-20 15:06:38 +02:00
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
e20dd82928
repaired ESLint to work everywhere, plus refactor on all package.json's that included ESLint dependencies.
2017-09-20 13:15:12 +02:00
6c3ac042f1
CreateUserProfile: save first email on account table and all emails on client table
2017-09-20 12:15:38 +02:00
2e5989cc7f
removed console.log from filter.js
2017-09-19 14:36:48 +02:00
e8d24a52ef
basic-data.html info tag added, plus refactor on backend create.js and filter.js, plus spec commented until db docker implementation
2017-09-19 14:34:59 +02:00
93568237f0
boolean return method getRoleCustomer
2017-09-18 11:52:03 +02:00
7f6e9fc617
Service gets if a client has got a Role customer -
...
getRoleCustomer
2017-09-18 07:39:06 +02:00
b288692b6c
ticket json
2017-09-12 10:36:07 +02:00
be24b31339
ticket.json
2017-09-12 07:39:45 +02:00
f5fd729634
e2e tests on clients path
2017-09-11 16:12:32 +02:00
0cc707bc2c
server-side tests settings and e2e settings
2017-09-10 20:04:22 +02:00
9c80cd8466
server-side unit tests env setup
2017-09-08 14:37:55 +02:00
a9763e728c
refactor for backend create.js transaction and it's html error notification for account implemented
2017-09-06 09:56:36 +02:00
9607b2d897
transaction for account and client creation at create.js
2017-09-05 23:01:51 +02:00
e2d1103607
tarea Añadir email y user al formulario de creación de clientes
2017-09-05 16:15:11 +02:00
Joan Sanchez
4c9383038f
Notification rest, mail log and error catch
2017-08-31 16:11:37 +02:00
Joan Sanchez
22b5e2e8bf
Mailer mail.send() and mail.sendWithTemplate()
2017-08-30 14:50:46 +02:00
0656fea23b
mailer: cambio email destinatario cuando no es production
2017-08-30 14:10:43 +02:00
c3707cc1eb
Docker Services
2017-08-30 09:58:10 +02:00
Javi Gallego
cad2aaf121
campo isManaged para que no muestre todos los almacenes en los combobox
2017-08-29 12:21:00 +02:00
Javi Gallego
1743db2174
isEqualizated en Address
2017-08-22 14:27:09 +02:00
5c80a8b4d7
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-08-22 09:51:24 +02:00
c65d69c62f
Archivos duplicados borrados
2017-08-22 09:51:13 +02:00
9fa608b11f
bug fixed filter in clients
2017-07-13 13:12:09 +02:00
5e41f573f5
añadido campo Date al modelo de FakeProduction
2017-07-12 14:02:03 +02:00
139579e78f
FakeProductionSql campo date
2017-07-12 08:53:55 +02:00
ace002e02b
time production
2017-07-12 08:21:36 +02:00
62b0a29f7c
messageSend Production
2017-07-12 07:57:30 +02:00
22829aa218
nuevos iconos de módulos
2017-07-11 14:28:53 +02:00
4e087139b4
CAU 2593 Busqueda Avanzada - campo telefono busca en: phone or mobile
2017-07-11 11:18:42 +02:00
c788ea5e29
config en minusculas
2017-07-11 10:34:25 +02:00
35d213874e
merge
2017-07-11 10:32:54 +02:00
f1fda284cb
varios cambios
2017-07-11 09:36:11 +02:00
bbd09b3d36
eliminado console.log
2017-07-06 14:48:05 +02:00
2b7abef98f
corregido filtro principal
2017-07-06 14:46:22 +02:00
5929b8be32
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-07-06 13:04:51 +02:00
46e9029be3
Directorio obsoleto borrado
2017-07-06 13:04:43 +02:00
283d2ab440
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-07-06 12:58:54 +02:00
25ac346b2b
filtro principal y ajustes css
2017-07-06 12:58:50 +02:00
d8727b380c
change-worker
2017-07-06 12:21:19 +02:00
a7af81383b
merge
2017-07-06 11:31:26 +02:00
607c781f15
merge
2017-07-06 11:28:06 +02:00
0339fdaef1
cambio de hora funcionando
2017-07-06 11:05:26 +02:00
525c8bbcf8
merge
2017-07-06 10:39:52 +02:00
15fee03060
Endpoint change-time
2017-07-06 09:55:28 +02:00
4b767aa61f
tooltip template
2017-07-06 09:26:26 +02:00
d2e0051b38
Endpoint RouteFk
2017-07-06 08:45:33 +02:00
c47c88dd10
model Routes
2017-07-04 10:13:17 +02:00
e26838063b
rutas
2017-07-03 14:29:44 +02:00
f993504157
rutas
2017-07-03 14:29:09 +02:00
d5d5c3079a
corrección errores brocal
2017-07-03 14:23:53 +02:00
ba2d803f28
merge
2017-07-03 14:20:06 +02:00
9e6bd8522e
vies
2017-07-03 14:19:47 +02:00
ffe85cca17
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-07-03 09:42:55 +02:00
9b68abef9d
allowBlank client
2017-07-03 09:42:51 +02:00
e3e7c9f863
endpoint ListadoTrabajadores
2017-06-30 09:26:55 +02:00
37c1c654b7
get correct user sender
2017-06-29 14:15:23 +02:00
c5363155c4
send message
2017-06-29 14:08:57 +02:00
d8f4e0489e
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-06-29 13:56:56 +02:00
491ea3b796
dropDown with search and columHeader preview icon
2017-06-29 13:56:52 +02:00
2e7a225249
rawsql with promises
2017-06-29 11:48:57 +02:00
ddcec00c4f
change time
2017-06-29 09:48:00 +02:00
80121de6c3
change state
...
message send
change time
2017-06-28 08:57:33 +02:00
d996a56a1e
new fake production table
...
list filter with fields
2017-06-22 14:51:37 +02:00
4890a69238
page and offset filter FakeProduction
2017-06-22 09:09:31 +02:00
26e1e9a71b
list ticket fake production
2017-06-21 13:29:01 +02:00
a7a4a211e2
fake production in table
2017-06-21 12:11:38 +02:00
a4d9c3008a
agencies
2017-06-21 08:00:34 +02:00
df320908ae
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-06-21 07:28:07 +02:00
ce15b68a92
list for all models
2017-06-21 07:28:03 +02:00
7c28d42be0
merge conflicts
2017-06-20 15:02:23 +02:00
d444980ab1
[En progreso] nuevo componente vnGridHeader para ordenación de tablas
2017-06-20 15:00:27 +02:00
509dab5ce4
list states
2017-06-20 13:14:20 +02:00
50e086fbc0
list for my model
2017-06-20 13:06:13 +02:00
729ddf3358
warehouses inventory
2017-06-20 10:40:04 +02:00
80b9815a57
callback error list warehouses, change-state
2017-06-15 11:59:15 +02:00
b86f71bb25
llamamos al servicio client para obtener el empleado
...
cambiamos el estado
2017-06-15 11:02:50 +02:00
18ff74b17f
get user and employee
2017-06-14 14:27:16 +02:00
6996352029
get warehouses
2017-06-14 12:55:10 +02:00
16302e1f9a
problemas con riesgo
2017-06-14 12:16:53 +02:00
888f5c0cc6
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-06-14 09:58:36 +02:00
e43827ab28
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
...
# Conflicts:
# services/production/common/methods/ticket-state/change-state.js
2017-06-14 09:58:30 +02:00
956264a529
fake son con notas
2017-06-14 09:56:08 +02:00
afff93cce6
Tooltip: admite html, Localizador: añadido icono con información adicional
2017-06-14 09:54:00 +02:00
3da67266bb
promesa para obtener usuario
2017-06-14 08:54:45 +02:00
6adc734f69
change state ticket
2017-06-13 13:57:40 +02:00
87857488c0
modificaciones fake son
2017-06-13 12:00:11 +02:00
cbc364db38
get states production
2017-06-13 11:26:54 +02:00
ecf347e7e2
modificaciones fake
2017-06-13 09:07:14 +02:00
c24c126734
fake son de tickets
...
my model tiene el meted raw sql
2017-06-13 08:44:40 +02:00
Joan Sanchez
e4f9420697
Parser de estilos en plantillas para el servicio mailer.
2017-06-12 13:41:02 +02:00
Joan Sanchez
9aa549cfc5
No mostrar dia de pago en metodo de pago por tarjeta.
2017-06-08 16:53:10 +02:00
dbb1632632
nginx docker
2017-06-08 11:08:45 +02:00
Joan Sanchez
e178bd8676
Traducciones de plantillas y mostrar nuevos datos de facturación en servicio mailer.
2017-06-07 19:29:16 +02:00
Joan Sanchez
73c5f5581f
Cambios en servicio mailer
2017-06-07 15:28:42 +02:00
3ffa020564
nginx docker
2017-06-07 09:09:35 +02:00
7ec66e862c
nginx
2017-06-07 09:07:58 +02:00
00dd05ba6d
Docker
2017-06-07 08:43:25 +02:00
ce256b395e
tarea gula para copiar los ficheros comunes
...
puerto 3004 para production
2017-06-07 08:38:48 +02:00
47f9d29686
servicio production creado
2017-06-06 08:21:38 +02:00
622884d31c
Docker nginx
2017-06-05 09:22:36 +02:00
609c984426
Loopback 3, errores solucionados, codigo reorganizado
2017-06-05 09:01:21 +02:00
b427361156
Loopback 3, Errores solucionados
2017-06-03 13:01:47 +02:00
8cd312e145
Errores solucionados
2017-06-02 15:39:16 +02:00
f9842000d3
Codigo gulp reorganizado, errores redirección solucionados
2017-06-02 15:23:19 +02:00
481a2219ce
Ruta desarrollo http://localhost:5000 , producción 80
2017-06-02 09:29:14 +02:00
80e6b0c666
Merge
2017-06-01 18:48:11 +02:00
61829e1ae4
Validación credito beta
2017-06-01 18:23:41 +02:00
60de6056c1
Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev
2017-06-01 14:39:26 +02:00
b18c2c4966
Administración solo recargo equivalencia
...
Razón social único
Si no hay comercial, modificar los datos
2017-06-01 14:39:22 +02:00
55a66c992c
Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev
2017-06-01 14:05:31 +02:00
310ad81a69
emails separados con coma
2017-06-01 14:05:23 +02:00
f4ed484b90
Notas: Anadir usuario
2017-06-01 13:52:13 +02:00
fb8e62c840
Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev
2017-06-01 13:31:47 +02:00
cd750cb86f
ACL corregido error
2017-06-01 13:31:42 +02:00
2ac41f390a
Carpetas renombradas, plantillas configuración
2017-06-01 09:58:24 +02:00
0cc64bf285
Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev
2017-06-01 09:32:01 +02:00
a3dda662ae
ACLs, json configuracion y script SQL
2017-06-01 09:31:57 +02:00
Joan Sanchez
bb75fd783c
merge
2017-06-01 08:52:25 +02:00
Joan Sanchez
c9968cf550
Eliminado logger y renombradas carpetas
2017-06-01 08:51:29 +02:00
cf9e2f3d14
arreglado fallo al actualizar el consignatario predeterminado
2017-06-01 08:44:37 +02:00
dd9ec548e1
Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev
2017-06-01 08:29:15 +02:00
8815b927ac
merge solved conflicts
2017-06-01 08:29:01 +02:00
410f0490c6
Errores solucionados
2017-06-01 08:28:52 +02:00
94bdcd66e7
Errores solucionados
2017-06-01 08:28:12 +02:00
b9c43ec961
fixed pass
2017-06-01 08:26:48 +02:00
5507c84670
Errores solucionados
2017-06-01 08:25:59 +02:00
7f661afa1a
Errores solucionados
2017-06-01 08:24:57 +02:00
6dcf37fc5a
logger fixed
2017-06-01 08:20:05 +02:00
36a5051634
arreglos en merge 2
2017-06-01 08:01:49 +02:00
342ca3bd30
arreglos de conflictos
2017-06-01 07:59:41 +02:00
25bac942a3
merge
2017-06-01 07:10:28 +02:00
0c82c83ca3
Errores solucionados, configuración mailer, eslint
2017-05-31 18:19:55 +02:00
Joan Sanchez
b2c5fe8a28
dependencia path
2017-05-31 14:59:05 +02:00
Joan Sanchez
a4d8574321
Cambios en servicio mailer
2017-05-31 14:55:41 +02:00
Joan Sanchez
552559adaa
Service mailer, plantillas y traducciones
2017-05-31 13:46:18 +02:00
f2e5b4824e
merge
2017-05-31 13:00:16 +02:00
3acca753bb
merge
2017-05-31 13:00:16 +02:00
89c90b0af2
merge
2017-05-31 12:57:18 +02:00
fae56408bb
merge
2017-05-31 12:57:18 +02:00
96dd6de8a6
Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev
2017-05-31 12:56:42 +02:00
72d5e3e0a3
Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev
2017-05-31 12:56:42 +02:00
b8287efdc2
kanban: asociar envío escrito con cambio de valor
2017-05-31 12:56:37 +02:00
528dcac06f
kanban: asociar envío escrito con cambio de valor
2017-05-31 12:56:37 +02:00
c8424f98f4
paginación en clientes
...
arreglado problema de búsqueda
2017-05-31 10:58:48 +02:00
9e550e746a
paginación en clientes
...
arreglado problema de búsqueda
2017-05-31 10:58:48 +02:00
11c3b2de2d
renombrado de archivos parte 1
2017-05-31 09:46:05 +02:00
9cea151f4d
renombrado de archivos parte 1
2017-05-31 09:46:05 +02:00
74a0eedb47
Añadidos ACLs del servicio client
2017-05-30 14:17:01 +02:00
cadbb2b6c2
Añadidos ACLs del servicio client
2017-05-30 14:17:01 +02:00
2dab567b98
gulp services y service mailer
2017-05-30 08:50:16 +02:00
65cc23b280
gulp services y service mailer
2017-05-30 08:50:16 +02:00
Joan Sanchez
04aadb76a2
Service mailer
2017-05-30 08:06:14 +02:00
Joan Sanchez
609c13efbf
Service mailer
2017-05-30 08:06:14 +02:00
3d43bf57cd
mailer docker
2017-05-29 13:57:18 +02:00
0ad4558c17
nginx
2017-05-29 13:48:20 +02:00
025bd4224e
Errores en validación solucionados
2017-05-26 17:05:33 +02:00
daaf73a143
Errores validacion solucionados
2017-05-26 14:44:56 +02:00
64813b3fd3
Errores en validación solucionados
2017-05-26 14:39:59 +02:00
3d71f454a0
Errores en validación IBAN solucionados
2017-05-26 14:39:36 +02:00
51f112fc02
Validar campos loopback diferentes modelos
2017-05-26 14:06:21 +02:00
571692f4ca
Añadidos estilos a elementos desabilitados, mejora de directiva vnAcl
2017-05-25 14:23:19 +02:00
041be5ec93
Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev
2017-05-25 12:52:49 +02:00
1482b842bd
Errores solucionados
2017-05-25 12:52:38 +02:00
81f9de098d
ACLs , permisos a nivel de rutas, menu y componentes
2017-05-25 11:48:10 +02:00
3c54a222b9
Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev
2017-05-25 07:21:43 +02:00
2ab756a403
primera version de ACL
2017-05-25 07:21:36 +02:00
345f2e55a5
vnAutocomplete: Acepta plantillas
2017-05-24 13:24:32 +02:00
5b9fcf868a
401 redirecciona a login, vnAutocomplete: campos seleccionados
2017-05-23 14:05:26 +02:00
aabc190c08
crlf -> lf
2017-05-22 12:39:36 +02:00
Dani Herrero
4857fce33e
Añadido logoutSessionsOnSensitiveChanges
2017-05-22 12:33:06 +02:00
3f84230619
Autenticación por email o usuario
2017-05-22 11:31:06 +02:00
ac3f7c2da0
Autenticación: errores solucionados
2017-05-22 11:04:37 +02:00
5cfdd51cf4
Integración usuarios, errores solucionados
2017-05-21 18:36:07 +02:00
72415ebeb2
ACLs
2017-05-18 17:54:23 +02:00
c4cb0906ad
Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev
2017-05-18 17:35:51 +02:00
a2ac778c9a
Peticiones XHR con token
2017-05-18 17:35:07 +02:00
a031f31a05
restablecido filtre
2017-05-18 13:59:02 +02:00
7691449e52
restablecido filtre
2017-05-18 13:40:42 +02:00
5e965f485f
eliminado el filter de MyModel
2017-05-18 11:55:46 +02:00
b4d167bbb7
header.js
2017-05-18 11:54:39 +02:00
2aa7c9731d
Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev
2017-05-18 08:18:53 +02:00
2c7a37c4b6
Errores solucionados, modelos loopback ocultados
2017-05-17 21:38:02 +02:00
9d4acfc64f
Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev
2017-05-17 21:23:54 +02:00
4eff9d451b
Autenticación por token
2017-05-17 21:23:47 +02:00
726bb73ca0
Todos heredan de MyModel
2017-05-17 14:58:23 +02:00
5f9160c172
ng-disabled vn-textfield
2017-05-17 14:04:02 +02:00
e4559c3959
Corrección error autocomplete
...
Separado meted activate
Separado meted addresses
2017-05-17 09:45:34 +02:00
ae3f9db948
VnAutocomplete ya no carga los datos cuando los datos se pueden bandera.
...
Creado el método card en client para listar el cliente con sus datos para el combo.
2017-05-17 08:19:03 +02:00
fc37c59574
nginx
2017-05-15 11:12:00 +02:00
d8df17ad07
salix routes static
2017-05-15 10:44:19 +02:00
eacd133d00
Docker nginx
2017-05-15 09:03:05 +02:00
6a4235a9a2
Ajustes conf
2017-05-15 08:47:58 +02:00
77d8a8f090
Jenkins
2017-05-15 08:33:51 +02:00
8a9d8c83b6
docker
2017-05-15 08:07:30 +02:00
8c47938bd0
merge
2017-05-15 07:53:40 +02:00
d5da337d52
Jenkins - docker nginx
2017-05-15 07:53:06 +02:00
60a3b049de
Campos renombrados
2017-05-12 15:21:37 +02:00
88992438e2
Errores solucionados
2017-05-12 13:58:08 +02:00
34e0537b64
Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev
2017-05-12 13:36:56 +02:00
ebb59d1eef
Errores en relaciones solucionados
2017-05-12 13:36:12 +02:00
a9212721f1
docker nginx conf
2017-05-12 13:14:52 +02:00
4df1a7898c
Merge commit 'd93c6e18853e572c097b9f8fee4885b6ab17ebae' into dev
2017-05-12 13:05:54 +02:00
d93c6e1885
Jenkins - Docker
2017-05-12 12:41:35 +02:00
89f397da2c
Arreglado ClientObservation
2017-05-12 11:20:32 +02:00
b7fb0bca98
Relaciones arregladas
2017-05-12 11:14:55 +02:00
8ce3325f06
Renombrado Chanel a ContactChannel
2017-05-11 14:19:43 +02:00
495e3b7c5e
creado el modelo Chanel.
...
Se puede seleccionar en el cliente.
2017-05-11 13:01:33 +02:00
27d086843f
Jenkins - Docker
2017-05-11 12:07:33 +02:00
85184d71eb
Modelo modificado
2017-05-10 17:18:25 +02:00
0efdd3565e
Modelos loopback
2017-05-09 14:04:44 +02:00
0da217e9bc
Errores solucionados
2017-05-05 13:32:07 +02:00
f7ec186a77
Errores solucionados
2017-05-05 12:54:47 +02:00
f8cd8ee776
Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix
2017-04-28 15:04:36 +02:00
ce2d7936af
Integración con MySQL, errores solucionados
2017-04-28 15:04:29 +02:00
0cf11ceff0
i18n loopback client
2017-03-31 12:12:46 +02:00
1eb0fb9c8d
Merge
2017-03-14 13:11:34 +01:00
f1c5a45657
ACLs habilitadas
2017-03-14 13:08:55 +01:00
4bc1cf455b
notes: Crear
2017-03-10 11:18:16 +01:00
7059eadfc7
Correciones varias
2017-03-07 17:11:56 +01:00
2cb110feee
consignatario sin bind
2017-03-06 11:44:02 +01:00
2cc7d96dce
Eslint
2017-03-01 09:55:17 +01:00
0ef8995724
PersistedModel extendido
2017-02-28 18:10:11 +01:00
ded4e07ab7
Errores solucionados
2017-02-28 11:46:18 +01:00
0f360db06e
mgCrud v2
2017-02-21 16:21:55 +01:00
63784c689e
Quitado Comentario Html
2017-02-21 13:19:24 +01:00
33bc79cb70
icons locales
2017-02-21 12:49:41 +01:00
139cc770a5
Merge
2017-02-21 11:41:30 +01:00
c694f00644
mgCrud v1
2017-02-21 11:36:43 +01:00
1f5fe03b81
icon cuadrado
2017-02-16 08:16:59 +01:00
8e437f9837
iconbutton cuadrado
2017-02-09 08:18:50 +01:00
71cad27187
focus
2017-02-08 14:45:27 +01:00
51c58d9a9b
mg-crud añadida, filtro phone
2017-02-08 12:45:55 +01:00
558ad8f393
Errores solucionados
2017-02-07 17:38:30 +01:00
a98580dc10
Errores solucionados
2017-02-07 17:02:17 +01:00
5a6682c773
paging clients
2017-02-07 13:24:04 +01:00
ec08e271f0
Errores solucionados, código preparado para mgCrud
2017-02-07 12:58:25 +01:00
06accec04a
Validaciones RC2
2017-02-02 13:48:25 +01:00
a13526f3e7
Validaciones beta
2017-02-01 18:55:02 +01:00
a2d56480f3
Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix
2017-01-31 14:15:11 +01:00
abf6a6c142
Cargador modulos: modulo ng, validaciones, traducciones
2017-01-31 14:13:06 +01:00
afe2d1ea79
dirección por defecto.
2017-01-30 08:23:18 +01:00
87dda33a20
Modificaciones en el activar del descriptor.
...
Se envía solo la modificación de la dirección.
Cambios en address. Se comprueba el valor por defecto. Falla pero no da error. Se sube para no perderse los cambios.
2017-01-26 15:00:13 +01:00
c0de02a4ca
Endpoint desactivar
2017-01-25 11:46:15 +01:00
278d764575
Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix
2017-01-24 16:06:15 +01:00
85c22f4523
i11n en modulos app y crud
2017-01-24 16:06:07 +01:00
ab7342e6a0
Modificación en client para que meta el nombre en el put.
...
Cambio de relaciones en client para sacar account fuera.
2017-01-24 12:30:17 +01:00
Javi Gallego
a0bc7f68de
account con relation
2017-01-24 10:15:13 +01:00
b9c0745b73
modifcaciones direcciones
2017-01-23 10:56:12 +01:00
83632dc3f1
modificaciones servidor consignatarios
2017-01-23 07:23:16 +01:00
47fec183a7
notas
2017-01-19 13:21:01 +01:00
ce055f4f3e
Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix
2017-01-18 14:48:50 +01:00
aa23160aee
Separación de notas en listar y crear
2017-01-18 14:48:35 +01:00
Javi Gallego
dead10641b
merge
2017-01-18 13:51:45 +01:00
Javi Gallego
8a3dcb4698
webAccess sin error dialog
2017-01-18 13:49:04 +01:00
2694b14c53
validación consignatarios
2017-01-18 10:42:53 +01:00
1e282656ab
Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix
2017-01-17 16:08:43 +01:00
Javi Gallego
a5f378b70a
Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix
2017-01-17 15:04:50 +01:00
Javi Gallego
826b340c20
clientObservation contra modelo correcto
2017-01-17 15:03:32 +01:00
4a065d073d
Merge con vicente
2017-01-17 14:33:06 +01:00
02f8363c69
Merge
2017-01-17 13:12:05 +01:00
3a5e718066
Merge
2017-01-17 13:09:27 +01:00
Javi Gallego
b469b52ba1
merge index.html
2017-01-17 13:06:08 +01:00
Javi Gallego
102c344859
dialog-confirm y acceso-Web
...
dialog-confirm ahora es generico y se ha añadido la entidad account
2017-01-17 13:02:35 +01:00
76df23ec00
Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix
2017-01-17 11:27:02 +01:00
7dd82cac19
Boton redondo
...
Arreglado detalles de diseño en consignatarios
2017-01-17 11:26:59 +01:00
95caaf052a
Dialogo directiva y provider
2017-01-17 11:10:12 +01:00
Javi Gallego
ede68e83b9
notes
2017-01-17 10:59:27 +01:00
539be92e39
merge
2017-01-16 11:05:38 +01:00
04b7bdf2fb
consignee inactive
2017-01-16 11:04:04 +01:00
Javi Gallego
a5582259d3
validations
2017-01-16 09:57:06 +01:00
feb18881ef
consignee
2017-01-13 15:32:48 +01:00
d4f37fa150
merge
2017-01-13 14:44:47 +01:00
a02a97650b
color default consignatarios
2017-01-13 14:41:34 +01:00
Javi Gallego
017c0caf7e
Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix
2017-01-12 11:02:39 +01:00
Javi Gallego
4d9e3d2684
validacion prueba
2017-01-12 11:02:22 +01:00
69ebeb9d0f
Arreglado problema con las provincias
...
El objeto cliente se copia hacia abajo
Se ha generado la función copy y la función equals
Añadidos márgenes a los botones de guardar
2017-01-12 09:52:20 +01:00
32b0b0c744
componentes consignatarios
2017-01-11 14:56:48 +01:00
90cb8a146b
agregados campos a los datos fiscales
2017-01-10 15:06:18 +01:00
020bb38873
arreglo vicente
2017-01-10 14:41:56 +01:00
b41a285e7f
merge
2017-01-10 12:56:57 +01:00
a8f8aa0462
consignatarios
2017-01-10 12:51:21 +01:00
f510ce5e9d
vn-switch
...
cambio campos obligatorios cliente
eliminado campo fecha de alta
2017-01-09 14:58:44 +01:00
1bcf91f58f
Componente vn-app
2017-01-03 11:02:52 +01:00
dccc3bdf26
validar formularios
2017-01-03 09:47:02 +01:00
b025af07ba
basic-data name
2017-01-02 14:02:10 +01:00
378b4935a3
mdl css
2017-01-02 13:05:24 +01:00
6e095d61ec
label overlap textbox
2017-01-02 12:51:40 +01:00
Javi Gallego
58b38a6971
guardar formularios
2017-01-02 07:44:26 +01:00
Javi Gallego
b7bbf4a8b0
guardar formularios
2017-01-02 07:28:36 +01:00
1dd69db8b2
gulp y dev windows
2016-12-28 15:09:02 +01:00
6eca92afcc
create client
...
combobox comerciales
put client
2016-12-15 16:55:11 +01:00
e9d222d2b1
modificaciones para hacer el pull
2016-12-15 08:31:15 +01:00
3b8c0d52b6
Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix
...
# Conflicts:
# @salix/app/src/configroutes.js
# @salix/crud/src/client/addresses/index.js
2016-12-13 15:12:37 +01:00
68b5c7aa8e
inyeccion para minimificar
2016-12-13 15:09:54 +01:00
2500822857
controllerAs
2016-12-13 14:21:30 +01:00
95546c9018
Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix
...
# Conflicts:
# @salix/app/src/components/main-menu/main-menu.html
2016-12-01 15:16:36 +01:00
d4fedb2cbb
Separación de la search bar del top bar
2016-12-01 15:14:37 +01:00
b1cf21eac9
Logout
2016-12-01 12:45:36 +01:00
76ed8478c1
Consignatarios
2016-11-28 18:21:55 +01:00
6ed1a92773
Items left menu
2016-11-25 15:35:26 +01:00
fd18740c00
Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix
2016-11-23 13:10:02 +01:00
f260a45499
Scripts de arranque, entorno desarrollo optimizado
2016-11-23 11:44:33 +01:00
3fb7bc0769
client
2016-11-22 13:20:44 +01:00
b0a9bd2334
clientes_databasic
2016-11-21 12:31:00 +01:00
7e519cc0a1
db.json
2016-11-21 08:47:23 +01:00
c91256b41c
Archivos reestructurados
2016-11-18 14:25:16 +01:00
fae7deb13f
Merge
2016-11-18 14:16:11 +01:00
4b50924243
Script arranque, @salix-services renombrado
2016-11-18 14:12:57 +01:00
Carlos Jimenez
Javi Gallego
Joan Sanchez
Daniel Herrero
Juan Ferrer Toribio
Vicente Falco
Carlos
vicentefalco
unknown
nelo
Dani Herrero
jgallego