631 Commits

Author	SHA1	Message	Date
Joan Sanchez	6a184496d6	treeview refactor 2	2019-10-02 14:12:17 +02:00
Carlos Jimenez Ruiz	bae70e24f8	#1304 Scroll Down en boton others client left menu	2019-10-02 13:11:54 +02:00
Carlos Jimenez Ruiz	132cfef4e9	#1304 Scroll Down en boton others client left menu	2019-10-02 12:56:19 +02:00
Joan Sanchez	9473636b5b	treeview refactor	2019-10-02 09:54:52 +02:00
Juan Ferrer	34e141e159	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-10-01 16:21:20 +02:00
Juan Ferrer	21992d3e69	Minimal style fixes	2019-10-01 16:21:08 +02:00
Juan Ferrer	76604744d1	Global & client style fixes	2019-10-01 16:17:57 +02:00
Joan Sanchez	183d770483	first changes	2019-10-01 15:09:55 +02:00
Carlos Jimenez Ruiz	f65e0cd5bf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-10-01 14:01:18 +02:00
Carlos Jimenez Ruiz	df8a823736	#499 deprecate client/core/src/lib/template.js	2019-10-01 14:01:05 +02:00
Juan Ferrer	4e4919c1e2	Agency fixes & exclusion with left calendar	2019-10-01 13:45:43 +02:00
Juan Ferrer	daeb4bed09	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-10-01 11:15:25 +02:00
Juan Ferrer	0bd852604a	Refactor: vnCheck, vnRadio, vnTreeview, vnNumber	2019-10-01 11:15:15 +02:00
Joan Sanchez	26be791cf0	fixed styles	2019-10-01 10:35:27 +02:00
Juan Ferrer	eba854f0e3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-30 20:46:34 +02:00
Juan Ferrer	679c6af0df	#1297 Angular material removed from project	2019-09-30 20:46:22 +02:00
Joan Sanchez	6d54e7a89d	Claim dms upload file with drag & drop #1731	2019-09-30 14:57:54 +02:00
Javi Gallego	0573fec950	merge	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	a177ad8e26	Fixes	2019-09-30 13:02:11 +02:00
Juan Ferrer	55133ded68	Fixes	2019-09-30 11:31:10 +02:00
Juan Ferrer	2bcdcaa133	#1285 fixed, vnInputTime fixes	2019-09-30 11:30:54 +02:00
Juan Ferrer	83c6d15eb1	Calendar fixes	2019-09-26 15:39:08 +02:00
Juan Ferrer	dbd70da866	Merge	2019-09-26 13:36:22 +02:00
Joan Sanchez	ca4009088d	Descuadre de meses componente calendar #1733	2019-09-26 10:43:06 +02:00
Juan Ferrer	c0f39ba87f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-26 10:09:07 +02:00
Carlos Jimenez Ruiz	156c9ec3ab	#1716 ticket.summary añadir link a la Ruta	2019-09-26 09:05:54 +02:00
Juan Ferrer	91e4e62a1c	Merge branch 'test' into dev	2019-09-26 08:44:00 +02:00
Juan Ferrer	2a0cc1dc8b	Style/i18n fixes	2019-09-25 23:09:10 +02:00
Juan Ferrer	91b5ad5a3e	Merge	2019-09-25 20:11:14 +02:00
Juan Ferrer	98cc3ce00e	Agency events, delivery days viewer	2019-09-25 20:06:42 +02:00
Carlos Jimenez Ruiz	d1acd60d5a	added a precise selector #1680	2019-09-24 13:22:01 +02:00
Carlos Jimenez Ruiz	25165792c8	#1680 left-menu descriptor scrollbar overlap	2019-09-24 09:29:57 +02:00
Joan Sanchez	7f33f4c56e	fixed salixfront deletedTicket icon	2019-09-24 07:25:22 +02:00
Joan Sanchez	e55b8b7b6b	precio por kilo #1690	2019-09-23 14:41:54 +02:00
Carlos Jimenez Ruiz	695ff14b60	removed the tests index used by karma (deprecated)	2019-09-23 14:17:44 +02:00
Carlos Jimenez Ruiz	0f04aed2fe	#1670 Crear icono isDeleted para ticket.descriptor	2019-09-20 17:20:54 +02:00
Carlos Jimenez Ruiz	b0e5b46245	#969 componente vnSearchBar front test	2019-09-20 09:35:12 +02:00
Juan Ferrer	afb06dd4a5	#1167 Fixed	2019-09-19 12:32:34 +02:00
Carlos Jimenez Ruiz	b12d0388c9	#1074 Undo changes button for forms	2019-09-18 09:41:25 +02:00
Carlos Jimenez Ruiz	206dec59a3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-13 16:09:27 +02:00
Carlos Jimenez Ruiz	2251fb65ad	#1615 migrar karma a jest	2019-09-13 16:09:14 +02:00
Joan Sanchez	248dff2747	cherry-pick	2019-09-12 14:18:47 +02:00
Joan Sanchez	f0253fd1ce	Increased max file size up to 250MB	2019-09-12 14:16:09 +02:00
Joan Sanchez	f6bd915ae6	Ticket dms CSS fixes #1692	2019-09-12 11:47:56 +02:00
Joan Sanchez	ac26d224dd	updated fonts & added "Fruit" item category #1688	2019-09-12 07:21:43 +02:00
Joan Sanchez	28ca32175e	updated fonts & added "Fruit" item category #1688	2019-09-12 07:20:48 +02:00
Joan Sanchez	1f5a75b285	fixed karma unit tests	2019-09-09 10:57:10 +02:00
Joan Sanchez	7a1ae9177b	Special characters not allowed on socialName #1635	2019-09-09 09:05:13 +02:00
Joan Sanchez	178dc6f2e8	Minor changes	2019-09-06 08:07:46 +02:00
Joan Sanchez	176750046a	Scroll component #643	2019-09-05 13:06:40 +02:00
Joan Sanchez	693c204e21	Calendar last day selection fixed #1465	2019-09-04 08:42:01 +02:00
Carlos Jimenez Ruiz	c1cca30a26	bug fix icon add ticket.sales enables/disables	2019-09-03 14:42:52 +02:00
Bernat	b656db3a84	#1645 refactor search panel	2019-08-29 08:32:46 +02:00
Carlos Jimenez Ruiz	c498216f0b	#1647 ticket.menu la barra de desplazamiento	2019-08-23 10:17:41 +02:00
Bernat	c58d94ccd8	fix getCurrentUserName front test	2019-08-19 08:28:46 +02:00
Bernat	7eea9d1d2c	Refactor #1630 state.js	2019-08-19 07:56:20 +02:00
Joan Sanchez	a5486ec694	Get allowed content-types from model #1598	2019-08-08 08:37:03 +02:00
Joan Sanchez	2ff374e7ba	postcode autocompletion fixes	2019-08-02 08:28:44 +02:00
Joan Sanchez	2c71a983e3	postcode autocompletion fixes	2019-08-02 08:27:55 +02:00
Joan Sanchez	e3c4536183	timeControl calendar fixed #1623	2019-08-01 10:29:26 +02:00
Joan Sanchez	31b5f689df	timeControl calendar fixed #1623	2019-08-01 09:58:59 +02:00
Joan Sanchez	77d8ac82a5	contabilize worker.calenday holidays, updated styles	2019-07-31 09:51:08 +02:00
Joan Sanchez	eccf381e56	contabilize worker.calenday holidays, updated styles	2019-07-31 09:50:47 +02:00
Joan Sanchez	64a4e5f43d	ticket.basicData Select zone for productionBoss #1604	2019-07-26 11:48:01 +02:00
Joan Sanchez	51734db404	ticket dms local warehouse and company	2019-07-17 15:01:38 +02:00
Joan Sanchez	588250b1c1	dms update files	2019-07-15 11:40:11 +02:00
Joan Sanchez	9d0b88cd57	nginx	2019-07-11 17:22:42 +02:00
Joan Sanchez	597e271789	revert	2019-07-11 17:15:28 +02:00
Joan Sanchez	57a0a4113a	increased nginx file size limit	2019-07-11 17:07:25 +02:00
Joan Sanchez	b29dd291ab	removed console log	2019-07-08 14:17:12 +02:00
Joan Sanchez	6f3b023644	Create postcode form #1585	2019-07-08 14:07:09 +02:00
Joan Sanchez	bddfbc4b34	add new item from ticket.sale #1414, checkedLines fixed	2019-07-02 12:12:15 +02:00
Joan Sanchez	507bc8c2ce	updated fonts & calendar acls	2019-06-27 11:48:33 +02:00
Carlos Jimenez Ruiz	a7c5a9e598	#1566 ticket.sales state autocomplete	2019-06-27 09:44:19 +02:00
Joan Sanchez	8ff61a5d3a	added zone prices, radio-group and calendar refactor #1320	2019-06-26 13:35:38 +02:00
Carlos Jimenez Ruiz	2ce442a022	#1555 ticket.lines transer to a new ticket	2019-06-25 11:17:58 +02:00
Joan Sanchez	7fd6c850d7	lock controls #1533	2019-06-20 13:50:58 +02:00
Joan Sanchez	471da18a6c	optional bank entity code #1416	2019-06-17 08:14:48 +02:00
Joan Sanchez	0d3efd2549	fixed table "No results" message #1535	2019-06-14 08:41:21 +02:00
Joan Sanchez	9c00e7e67c	Autocomplete geolocation from postcode #1519 and #1531	2019-06-13 13:08:11 +02:00
Juan Ferrer	03205e01ae	NPM fix, fdescribe removed	2019-06-13 09:49:36 +02:00
Joan Sanchez	43e87a1cb1	mege from test to dev - no structure	2019-06-07 13:07:23 +02:00
Joan Sanchez	2bbcc402de	added treeview margin #1507	2019-06-06 15:01:47 +02:00
Joan Sanchez	c28734ff61	added dms tasks #1499, #1469, #1468, #1484	2019-06-06 13:59:11 +02:00
Joan Sanchez	68f67f12d7	moveNext() movePrevious() moves now to day 1 to prevent a month jump	2019-05-31 13:28:28 +02:00
Carlos Jimenez Ruiz	2c012b084a	#1476 ticket.Sale check all checkbox	2019-05-28 06:57:56 +02:00
Carlos Jimenez Ruiz	027602e18a	#1476 ticket.Sale check all checkbox	2019-05-27 15:10:57 +02:00
Carlos Jimenez Ruiz	b6fbeb43e8	updated confirm html	2019-05-23 10:01:25 +02:00
Joan Sanchez	52e26eb99d	mark manual lines #1449	2019-05-21 12:56:29 +02:00
Joan Sanchez	183bf137f6	added workerTimeControl #1360	2019-05-17 13:27:51 +02:00
Carlos Jimenez Ruiz	417dc511f5	#1430 client.balance bug fix and e2e fix	2019-05-15 15:26:13 +02:00
Carlos Jimenez Ruiz	2358c94aae	#1402 route.ticket	2019-05-15 13:07:32 +02:00
Joan Sanchez	eae6a6f43c	show spinner on load for table & catalog components #1424	2019-05-10 14:42:46 +02:00
Carlos Jimenez Ruiz	da04d409a3	#1415 implementar color legend en worker.calendar	2019-05-10 13:16:37 +02:00
Carlos Jimenez Ruiz	6f83f03400	#1411 Componente leyenda de colores	2019-05-09 14:17:44 +02:00
Bernat	e43b7be526	1397 client.descriptor change icon to icon-basketadd	2019-05-07 11:55:47 +02:00
Joan Sanchez	6db35d744d	multicheck checking all elements on pagination if checked	2019-04-30 11:20:37 +02:00
Joan Sanchez	6c3cea56aa	fixed multi-check karma unit tests	2019-04-30 09:19:40 +02:00
Joan Sanchez	a572130b6c	propagate check value to multicheck component for intermediate value #1305	2019-04-30 08:00:27 +02:00
Joan Sanchez	69403223d8	fixed treeview #1374	2019-04-29 11:49:43 +02:00
Carlos Jimenez Ruiz	2ca85394f3	#1385 excluded tests	2019-04-26 16:10:51 +02:00
Joan Sanchez	145a5e85eb	dropdown element name without translation	2019-04-26 12:41:30 +02:00
Joan Sanchez	16bf0b3448	regenerate invoice #1342	2019-04-26 08:52:43 +02:00
Juan Ferrer	b6c95f262f	Merge branch 'test' into dev	2019-04-25 13:23:19 +02:00
Juan Ferrer	2ebc5de441	Nginx now logs original proxy src/dst hosts	2019-04-25 13:22:49 +02:00
Joan Sanchez	76269a8a16	added drag & drop directives on worker department #1319	2019-04-23 08:29:23 +02:00
Carlos Jimenez Ruiz	7595905c5e	front unit test from invoiceOut now included in the index file	2019-04-17 11:31:37 +02:00
Bernat	dbe56b2496	#1330 add info in the search panel	2019-04-12 14:33:08 +02:00
Joan Sanchez	ac8a27d2f4	Added ticket invoice #1310	2019-04-12 13:54:31 +02:00
Juan Ferrer	faa0dc2b8d	Popover relocate() fixes	2019-04-11 11:54:34 +02:00
Joan Sanchez	353167734e	send message to salesPerson #1315	2019-04-11 09:38:53 +02:00
Joan Sanchez	1dd8fdd96b	input number select value when is zero	2019-04-11 08:05:46 +02:00
Joan Sanchez	3d71165682	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-04-11 07:29:43 +02:00
Joan Sanchez	1e06a19884	input time refactor #1292	2019-04-11 07:29:41 +02:00
Juan Ferrer	c3b4c18ba7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-04-10 15:47:39 +02:00
Juan Ferrer	c1b103d170	Popover fixes	2019-04-10 15:47:23 +02:00
Joan Sanchez	49ef341eb6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-04-10 12:04:22 +02:00
Joan Sanchez	6f98d81db1	fixed input time	2019-04-10 12:04:11 +02:00
Carlos Jimenez Ruiz	e9102249be	#1328 module home refactor	2019-04-10 11:49:39 +02:00
Bernat	2be3481138	#1309 add icon in routes module	2019-04-10 10:02:28 +02:00
Carlos Jimenez Ruiz	862f0b6c1e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-04-10 07:34:45 +02:00
Carlos Jimenez Ruiz	eaad6c6f6e	#1009 item.descriptor.popover	2019-04-10 07:20:23 +02:00
Joan Sanchez	b3c00e5a29	updated td-editable styles #1313	2019-04-09 13:47:13 +02:00
Joan Sanchez	4f1a1ae004	Merge branch 'master' into dev	2019-04-09 13:19:34 +02:00
Joan Sanchez	a6308c7f1e	input-number refactor #1311	2019-04-09 13:18:55 +02:00
Joan Sanchez	d0dc192fc4	navigate to next claim section for salesAssistant #1119	2019-04-08 09:01:10 +02:00
Gerard	633ab28c41	#1315 item.ticketRequest	2019-04-05 15:20:12 +02:00
Carlos Jimenez Ruiz	837a7b08cc	#1300-1301 client.risk	2019-04-05 13:20:34 +02:00
Gerard	cfdeb387a1	#1241 routes.tickets	2019-04-04 13:06:41 +02:00
Joan Sanchez	c4c5c67b18	Merge branch 'master' into dev	2019-04-04 11:54:25 +02:00
Joan Sanchez	bb039386f2	fixed input focus #1302	2019-04-04 11:53:13 +02:00
Carlos Jimenez Ruiz	09288c2c12	merge	2019-04-03 15:19:05 +02:00
Carlos Jimenez Ruiz	971a2ab891	#1270 ... ticket.index advanced search mostrar dias en el futuro	2019-04-03 15:16:32 +02:00
Joan Sanchez	063360d645	fixed uvc throwing error #1280	2019-04-03 14:21:57 +02:00
Joan Sanchez	dcf16e19fc	fixed fonts	2019-04-03 12:51:49 +02:00
Joan Sanchez	f8035c9777	fixed calendar front unit tests	2019-04-03 12:39:24 +02:00
Joan Sanchez	d407fc7803	fixed calendar month name display	2019-04-03 12:29:23 +02:00
Joan Sanchez	f337799e39	tests & refactor calendar component #811	2019-04-03 11:34:58 +02:00
Carlos Jimenez Ruiz	287e4048e2	#1192 ticket.stepone en movil no muestra dropdown	2019-04-02 14:18:11 +02:00
Carlos Jimenez Ruiz	23bb644812	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-04-02 11:10:16 +02:00
Gerard	46f67a095d	test merge	2019-04-02 11:05:30 +02:00
Carlos Jimenez Ruiz	ef53d60c94	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-04-02 11:05:16 +02:00
Carlos Jimenez Ruiz	570e2b5732	#1243 ticket.log columna worker	2019-04-02 11:04:53 +02:00
Gerard	fcde321edf	input time last changes rollback	2019-04-02 11:02:59 +02:00
Joan Sanchez	a36c50b324	merge	2019-04-02 09:51:05 +02:00
Joan Sanchez	e198a94bc5	updated fonts & changed totalBox max width to 12em	2019-04-01 11:17:50 +02:00
Joan Sanchez	3f1889daa3	fix open client card from ticket descriptor #1291	2019-04-01 09:48:22 +02:00
Joan Sanchez	84d3419656	added buscaman icon	2019-03-29 11:58:49 +01:00
Gerard	8bf4190d12	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-03-29 07:37:23 +01:00
Gerard	5459254653	textField now saves the correct oldValue	2019-03-29 07:37:16 +01:00
Carlos Jimenez Ruiz	a14ba28629	#1263 invoiceOut.summary	2019-03-28 11:55:23 +01:00
Gerard	05eea132cd	textfield oldValue now is called when it should	2019-03-27 12:50:03 +01:00
Gerard	f037fd8997	input time redone to handle the hours as expected	2019-03-26 12:21:29 +01:00
Joan Sanchez	500105675c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-03-26 07:29:57 +01:00
Joan Sanchez	3df5f4cae9	replaced numeric fields with input-number #1138	2019-03-26 07:29:45 +01:00
Carlos Jimenez Ruiz	1e150dbc8f	#1264 cambiar ruta invoice a invoiceOut	2019-03-25 16:25:59 +01:00
Carlos Jimenez Ruiz	d322c941a4	#1226 Ticket.index advanced filter añadir factura	2019-03-25 15:16:56 +01:00
Joan Sanchez	6eaf317b5e	added worker calendar #1147	2019-03-22 08:28:57 +01:00
Carlos Jimenez Ruiz	92347cd9c4	#1233 route.index	2019-03-21 13:46:14 +01:00
Carlos Jimenez Ruiz	7a5124aca2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-03-20 12:27:36 +01:00
Carlos Jimenez Ruiz	d38ca72fd8	orden de resultados por defecto DESC de id y fecha	2019-03-20 11:49:11 +01:00
Joan Sanchez	8521382838	updated fonts	2019-03-20 08:48:24 +01:00
Gerard	4e085d930f	Merge branch 'test' into dev	2019-03-15 07:47:02 +01:00
Gerard	496ac864c3	Merge branch 'master' into test	2019-03-15 07:41:47 +01:00
Gerard	60d43a795d	#1223 Añadir offset de hora a componente vn-input-time	2019-03-15 07:40:45 +01:00
Joan Sanchez	bf14eb8ffe	added module name translation	2019-03-14 07:17:44 +01:00
Carlos Jimenez Ruiz	f4b74abe3b	#1179 invoice.index crear el módulo	2019-03-13 14:10:45 +01:00
Joan Sanchez	92170c34d5	worker department #1133	2019-03-12 15:04:09 +01:00
Gerard	759cca3989	Merge branch 'test' into dev	2019-03-08 08:04:20 +01:00
Gerard	3c77f24462	Merge branch 'master' into test	2019-03-08 07:59:41 +01:00
Gerard	f5a95d3190	console log deleted	2019-03-08 07:58:46 +01:00
Gerard	7e7023c680	validation disabled when displaycontrols is false	2019-03-08 07:58:09 +01:00
Carlos Jimenez Ruiz	75fba75688	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-03-07 11:00:48 +01:00
Carlos Jimenez Ruiz	1bf7aa112a	Bug #1194 configuracion de usuario, buscar por id	2019-03-07 09:55:03 +01:00
Gerard	af960e5f5f	fonts updated to 1.26 version	2019-03-06 16:28:09 +01:00
Gerard	175c6ecd03	Merge branch 'master' into test	2019-03-06 12:35:04 +01:00
Gerard	9db3275b67	input time not showing icons fixed	2019-03-06 12:26:26 +01:00
Gerard	c5a2c125fd	Merge branch 'master' into test	2019-03-06 11:08:56 +01:00
Gerard	665f34b67e	#1216 uvc now deletes the styles when you change the state	2019-03-06 11:05:29 +01:00
Joan Sanchez	596eb8d695	Merge branch 'test' into dev	2019-03-05 08:48:26 +01:00
Joan Sanchez	ef483bcc12	fixed zone calendar weekday offset	2019-03-05 08:24:09 +01:00
Carlos Jimenez Ruiz	f8a4ad0f28	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-03-04 16:49:41 +01:00
Carlos Jimenez Ruiz	d1d11233ad	#1039 ticket.summary	2019-03-04 16:34:41 +01:00
Gerard	b0be963541	Merge branch 'test' into dev	2019-03-05 14:12:20 +01:00
Gerard	f5262954bc	bug with filter giving wrong dates fixed	2019-03-05 14:08:00 +01:00
Joan Sanchez	3c6d27a285	order sales by concept #1166	2019-03-04 12:04:23 +01:00
Gerard	80ebf671e8	fonts rollback to version 1.24	2019-03-05 10:45:07 +01:00
Gerard	269a2576b2	fonts updated	2019-03-04 19:47:10 +01:00
Gerard	7dd08dc6e5	merge test	2019-02-28 10:19:31 +01:00
Gerard	9a7bd834df	date offset fixed	2019-02-27 17:04:32 +01:00
Gerard	87e8be0ede	time filter changed by dateTime	2019-02-27 17:04:00 +01:00
Gerard	fd1e380d7a	wrong comparision fixed	2019-02-26 17:34:25 +01:00
Gerard	60ec49abbd	#1103 vnTextfield doesnt blur anymore	2019-02-26 17:33:51 +01:00
Joan Sanchez	4d53564602	Merge branch 'test' into dev	2019-02-26 14:26:47 +01:00
Gerard	d404fc92c8	dates fixed, deleted tricks to change the hours	2019-02-26 12:51:01 +01:00
Gerard	43f26d1bc9	input number now has a option to hide the controls	2019-02-25 15:56:42 +01:00
Joan Sanchez	2862501475	Merge branch 'test' into dev	2019-02-25 15:08:42 +01:00
Joan Sanchez	6068ede6ee	removed offset from agency module	2019-02-25 14:02:47 +01:00
Carlos Jimenez Ruiz	0be9458672	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-02-25 13:07:39 +01:00
Carlos Jimenez Ruiz	b5f29954ed	#796 Test front left-menu.js	2019-02-25 13:07:32 +01:00
Gerard	68aaade0a9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-02-25 12:37:20 +01:00
Joan Sanchez	23ed5e4ddf	added offset calendar remove selection	2019-02-25 12:22:04 +01:00
Joan Sanchez	7a7b2c67d0	offset changes	2019-02-25 11:55:59 +01:00
Carlos Jimenez Ruiz	4709a55b8f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-02-25 11:38:18 +01:00
Joan Sanchez	a389ca46a2	calendar offset	2019-02-25 11:32:29 +01:00
Gerard	2872dcdd3e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-02-25 10:10:47 +01:00
Gerard	007139f2f6	added disable property	2019-02-25 10:10:44 +01:00
Joan Sanchez	559a9fe96f	Merge branch 'test' into dev	2019-02-25 10:04:53 +01:00
Joan Sanchez	ac1e619b06	fixed zone bugs	2019-02-25 10:03:50 +01:00
Gerard	54a835eefd	added disabled property	2019-02-25 09:50:51 +01:00
Carlos Jimenez Ruiz	f6a5fb106f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-02-25 09:35:08 +01:00
Carlos Jimenez Ruiz	69c5c8f1cd	#485	2019-02-25 09:28:25 +01:00
Juan Ferrer	ba62f545f7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-02-22 16:17:08 +01:00
Juan Ferrer	26419e75c9	Style fixes	2019-02-22 16:15:54 +01:00
Juan Ferrer	961eb6edaf	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test	2019-02-22 14:38:45 +01:00
Juan Ferrer	9fc6a2c4c2	Style fixes	2019-02-22 14:34:11 +01:00
Gerard	6364239d8a	#1152 updated td-editable	2019-02-22 12:27:56 +01:00
Gerard	6c46400d3d	checkbox styles fixed	2019-02-22 08:52:30 +01:00
Gerard	f1afe16c9e	icon not showing correctly fixed	2019-02-21 14:24:27 +01:00
Carlos Jimenez Ruiz	413d2f2855	merge	2019-02-21 11:53:19 +01:00
Carlos Jimenez Ruiz	050c5c1126	#1131 Refactor vn-icon a vn-icon-button en las templates.	2019-02-21 11:40:27 +01:00
Juan Ferrer	e42da544cd	Styles fixed	2019-02-21 10:10:38 +01:00
Juan Ferrer	8f1e41e744	Style fixes	2019-02-20 14:34:16 +01:00
Joan Sanchez	90092a4f48	fixed treeview order	2019-02-20 12:31:08 +01:00
Joan Sanchez	031aeae950	fixed styles	2019-02-20 08:57:51 +01:00
Gerard	419778f67e	now has the proper title directive	2019-02-20 08:26:53 +01:00
Gerard	927957aed8	Merge remote-tracking branch 'upstream/dev' into jgallego	2019-02-19 16:12:01 +01:00
Gerard	e041cef586	vn-empty-rows deleted as its not longer needed	2019-02-19 16:11:57 +01:00
Gerard	a8a17b72bd	Merge remote-tracking branch 'origin/dev' into jgallego	2019-02-19 16:10:16 +01:00
Gerard	9d39840449	performance problems with the component fetched tags fixed	2019-02-19 15:54:01 +01:00
Joan Sanchez	d11a51b3f1	added color filter #1041	2019-02-19 15:13:27 +01:00
Gerard	abfbf791f3	added one time bindings	2019-02-19 12:50:24 +01:00
Juan Ferrer	0580500359	Style fixes	2019-02-19 09:40:36 +01:00
Joan Sanchez	4645e75f17	check fdescribe removed	2019-02-19 07:05:39 +01:00
Joan Sanchez	79e8c1b19a	checkbox front unit test	2019-02-19 07:04:56 +01:00
Joan Sanchez	75053618a2	zoneLocation order	2019-02-18 13:39:48 +01:00
Javi Gallego	da4d961c8b	Merge branch 'dev' into jgallego	2019-02-18 13:35:33 +01:00
Joan Sanchez	0ea161ff19	fixed zoneLocation search	2019-02-18 13:23:24 +01:00
Gerard	3adc035cab	#1121 worker.descriptor	2019-02-18 12:54:33 +01:00
Gerard	cb78a6da65	not being able to translate titles fixed	2019-02-18 11:35:16 +01:00
Joan Sanchez	87fff4e338	fixed intermediate on non triple-state checkbox	2019-02-18 09:14:39 +01:00
Joan Sanchez	5eb4eb2e79	Merge branch 'dev' into test	2019-02-18 08:38:14 +01:00
Joan Sanchez	3b0d003322	treeview refactor & zone #1140	2019-02-18 08:37:26 +01:00
Juan Ferrer	3a56044634	Jenkinsfile fixes	2019-02-17 18:35:29 +01:00
Juan Ferrer	9346c7adc3	Merge remote-tracking branch 'upstream/dev' into dev	2019-02-15 22:08:44 +01:00
Joan Sanchez	42e3fede23	fixed ng-repeat transition	2019-02-15 17:33:03 +01:00
Gerard	cb9e2284eb	styles, imports of titles and traductions added	2019-02-15 17:30:22 +01:00
Juan Ferrer	4b027f015d	Pull request: test 1	2019-02-15 15:23:39 +01:00
Javi Gallego	00c7f28baf	Merge branch 'jgallego' of https://gitea.verdnatura.es/verdnatura/salix into jgallego	2019-02-15 14:36:50 +01:00
Javi Gallego	b81b8e18ed	$color-font-link	2019-02-15 14:29:47 +01:00
Juan Ferrer	588583d63d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-02-15 13:33:07 +01:00
Joan Sanchez	08c252fb9b	updated check component	2019-02-15 13:31:14 +01:00
Juan Ferrer	34ace7f5d4	Strict dependency injection enabled	2019-02-15 12:34:21 +01:00
Gerard	90a4e5a7d1	#1144 fixed bugs with $destroy	2019-02-15 11:03:27 +01:00
Gerard	c3903b8d51	added tripleState setter	2019-02-15 08:49:44 +01:00
Joan Sanchez	fe2c74c8c8	fixed event emiter	2019-02-15 08:40:18 +01:00
Joan Sanchez	e373e603bf	checkbox component noew emits change event	2019-02-15 08:02:29 +01:00
Joan Sanchez	cf9831473b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-02-15 06:49:31 +01:00
Gerard	fd0e46516c	#1060 añadir al componente check la popiedad intermediate	2019-02-14 20:17:22 +01:00
Joan Sanchez	e49512d152	updated fonts	2019-02-14 14:47:05 +01:00
Gerard	f7968ff15b	tests fixed	2019-02-14 11:41:06 +01:00
Juan Ferrer	f3e3c1bbae	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-02-13 14:01:38 +01:00
Juan Ferrer	1f759b6b8c	Style fixes	2019-02-13 14:01:37 +01:00
Gerard	b93e2f5359	#1114 item.regularize	2019-02-13 09:49:41 +01:00
Carlos Jimenez Ruiz	fefd6f45af	removed deprecation	2019-02-13 08:43:09 +01:00
Carlos Jimenez Ruiz	fb4a4cd3de	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-02-13 08:19:44 +01:00
Gerard	8fa7abe191	#1128 User view directive first version	2019-02-12 17:24:37 +01:00
Carlos Jimenez Ruiz	06db624fd6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-02-12 15:07:43 +01:00
Gerard	4287457692	fixed translate in tables	2019-02-12 14:57:40 +01:00
Carlos Jimenez Ruiz	9c0613e8e7	#1127	2019-02-12 14:40:13 +01:00
Carlos Jimenez Ruiz	b0e22febd3	#1127 mover ticket.descriptor al modulo ticket	2019-02-12 09:03:56 +01:00
Javi Gallego	66c2714233	storage-services eliminados cr Juan	2019-02-11 11:05:28 +01:00
Juan Ferrer	796a3e1a76	Style fixes	2019-02-10 23:01:21 +01:00
Juan Ferrer	ed5f76d164	Style fixes	2019-02-10 22:56:11 +01:00
Juan Ferrer	c0dd1624f6	Table style	2019-02-10 22:52:35 +01:00
Juan Ferrer	1ee60ea629	Style fixes	2019-02-08 18:09:14 +01:00
Juan Ferrer	20382b2b14	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-02-08 17:49:53 +01:00
Juan Ferrer	f52d306db4	Color style unified	2019-02-08 17:49:51 +01:00
Gerard	815985e5de	#1024 th-editable	2019-02-08 15:09:47 +01:00
Gerard	77600d4d11	#1024 td-editable component created	2019-02-08 15:08:36 +01:00
Joan Sanchez	b890ade406	docker scale 2 back containers	2019-02-07 08:03:23 +01:00
Javi Gallego	6e421d8442	Tarea #808 order.basic-data cr juan	2019-02-06 14:56:36 +01:00
Juan Ferrer	2bf9244770	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-02-06 11:24:31 +01:00
Juan Ferrer	03406a7d9b	Style fixes	2019-02-06 11:24:29 +01:00
Gerard	f59d022da8	#1078 risk.create	2019-02-05 16:46:02 +01:00
Gerard	48bb876bea	Revert "#1012 claim.action" ... This reverts commit 44893b57e7.	2019-02-05 16:42:28 +01:00
Gerard	44893b57e7	#1012 claim.action	2019-02-05 16:41:36 +01:00
Juan Ferrer	8f72fbad23	Merge	2019-02-05 09:14:22 +01:00
Juan Ferrer	1dbb75a1b8	vnSideMenu, vnBackground, style fixes	2019-02-05 09:13:15 +01:00
Joan Sanchez	af6a9d8022	fixed zone treeview bugs	2019-02-04 12:14:07 +01:00
Juan Ferrer	84c0002cb1	Hot bugs fixed	2019-02-01 17:11:14 +01:00
Gerard	89826182c2	bugs with some elements not showing fixed	2019-02-01 13:52:26 +01:00
Juan Ferrer	1752ffbcaa	css zindex fixes	2019-02-01 13:01:09 +01:00
Juan Ferrer	50f580e883	nginx config fixes	2019-02-01 12:17:23 +01:00
Juan Ferrer	a781346f17	nginx conf fixes	2019-02-01 11:54:36 +01:00
Juan Ferrer	8889f8d5cf	Jenkinsfile fixes, back scaled to 3 servers, nginx conf improved	2019-02-01 11:46:54 +01:00
Juan Ferrer	c89090dba4	nginx config fixed for 404	2019-02-01 11:06:23 +01:00
Juan Ferrer	17d7945065	Nginx config fix for 404	2019-02-01 09:47:52 +01:00
Juan Ferrer	13ec9006a9	Nginx redirect to main page on 404 errors	2019-02-01 09:37:20 +01:00