928 Commits

Author	SHA1	Message	Date
Alex Moreno	6b1a6fe44b	feat: mock dates front and back	2023-01-16 15:18:00 +01:00
Joan Sanchez	c489c4c6a9	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-01-13 08:55:01 +01:00
Vicent Llopis	2451d00998	Merge branch 'dev' into 4925-item.tags	2023-01-12 07:59:43 +00:00
Joan Sanchez	882cf6b9c1	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2023-01-12 08:36:24 +01:00
Vicent Llopis	eb3ed95b22	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2952-ticket.sale-checked	2023-01-10 08:32:44 +01:00
Vicent Llopis	3edc0403ba	fix	2023-01-05 10:35:42 +01:00
Vicent Llopis	9ae7b92bbf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4925-item.tags	2023-01-05 09:00:37 +01:00
Vicent Llopis	fa58ac2462	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2952-ticket.sale-checked	2023-01-03 09:13:47 +01:00
Joan Sanchez	674fe49058	fix(icons): prevent icon translation when using google translator ... Refs: 5044	2023-01-03 08:41:58 +01:00
Vicent Llopis	3792a80ad5	refs #4925 feat: añadido back para editar tags	2022-12-29 14:24:32 +01:00
Alex Moreno	990bcc0f6e	feat(app): only use ui-view for routing	2022-12-28 11:18:53 +01:00
Vicent Llopis	682b6d8961	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2952-ticket.sale-checked	2022-12-23 09:59:21 +01:00
Joan Sanchez	606bacbad7	Merge branch 'dev' into 4531-monitor_duplicates	2022-12-22 10:37:48 +00:00
Vicent Llopis	8880a83b89	feat: añadido saleTracking	2022-12-21 15:03:41 +01:00
Alex Moreno	27288d011d	fix(searchBar): applyParams	2022-12-21 15:01:05 +01:00
Joan Sanchez	c063c0e72f	fix(pagination): duplicated rows on paginate ... Refs: #4531	2022-12-20 09:48:41 +01:00
Alexandre Riera	98c9e0ac50	refs #4962 autoload added and second header	2022-12-16 13:42:23 +01:00
Joan Sanchez	a86636bee4	Use proper module codes	2022-12-14 13:49:49 +01:00
Alex Moreno	d9e4ff6772	fix: use $location	2022-11-28 11:48:25 +01:00
Alex Moreno	804db15ece	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-28 07:53:51 +01:00
Vicent Llopis	9a47b2fea4	Merge branch 'dev' into 4682-searchbar_filter	2022-11-23 10:00:27 +00:00
Alex Moreno	314e98b838	fix: nested router	2022-11-22 14:57:52 +01:00
Alex Moreno	660648e01f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-22 14:35:25 +01:00
Vicent Llopis	89141419c1	fix: merge filter	2022-11-22 10:36:40 +01:00
Alexandre Riera	2651081838	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4700-split-tour	2022-11-22 10:15:31 +01:00
Vicent Llopis	cac8879ec7	fix: solo vuelve a buscar el mismo filtro en caso de que se encuentre en un index	2022-11-22 09:22:06 +01:00
Vicent Llopis	d4712e27c3	fix: no repite la llamada filter cada vez q cambias de seccion	2022-11-17 11:31:36 +01:00
Alexandre Riera	7dd87b1ea8	refs #4700 icons future	2022-11-14 09:56:23 +01:00
Alex Moreno	4c216c4556	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-10 14:40:55 +01:00
Alexandre Riera	897a7d079d	Merge branch 'dev' into 2596-arrastrar-ficheros	2022-11-10 07:40:10 +00:00
Alex Moreno	fcf46ade7d	feat: reset-password section	2022-11-07 15:15:00 +01:00
Alexandre Riera	07b2ac99ce	refs #2596 css corregido	2022-11-03 15:45:36 +01:00
Alexandre Riera	f3085bef66	refs #2596 css actualizado	2022-11-03 15:28:52 +01:00
Alex Moreno	36894c31de	Merge branch 'dev' into 4077-login_recover-password	2022-11-03 08:39:04 +00:00
Alexandre Riera	e1eeb81696	refs #2596 tabulación y css	2022-11-03 08:18:24 +01:00
Alex Moreno	9891f7060d	fix(smart-table): monitor only ticketFilter use url and add ?q in routes	2022-11-02 09:40:09 +01:00
Alexandre Riera	aaaa73644d	refs #2596 drag and drop implementado	2022-11-02 08:18:58 +01:00
Alex Moreno	f8f44aaae7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4159-tableQ_filter	2022-11-02 07:37:28 +01:00
Alex Moreno	755a1667dc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-02 07:35:04 +01:00
Alex Moreno	3fd10dfc64	Merge branch 'dev' into 4075-ticket_boxing	2022-10-25 09:58:17 +00:00
Alex Moreno	107a0a6555	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4159-tableQ_filter	2022-10-25 11:35:12 +02:00
Alex Moreno	bcfbeb7032	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-10-21 12:41:39 +02:00
Alex Moreno	0bc018ec02	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing	2022-10-17 14:06:31 +02:00
Pau	cf50c4690a	Merge branch 'dev' into 4153-supplier.fiscal-data	2022-10-17 08:41:39 +00:00
Alex Moreno	248572feb4	use variable	2022-10-14 07:40:11 +02:00
Alex Moreno	cfc626494f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4159-tableQ_filter	2022-10-14 07:39:23 +02:00
Joan Sanchez	f2eaa9d0e5	Merge branch 'dev' into 4077-login_recover-password	2022-10-06 06:28:00 +00:00
Joan Sanchez	3dbd304217	Updated unit tests	2022-10-04 09:21:24 +02:00
Pau	9c7ec6fdc9	Implemented Insertable in the textfield class	2022-10-03 13:48:35 +02:00
Pau	5ca39c9dd3	Modified TextField to have a insertable option	2022-10-03 08:48:04 +02:00
Joan Sanchez	21bb95fc88	CSV refactor	2022-10-03 08:28:47 +02:00
Alex Moreno	e931414bb7	unnecessary code	2022-09-30 08:59:49 +02:00
Joan Sanchez	1ac35c0b68	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4481-print_library2	2022-09-29 14:52:31 +02:00
Alex Moreno	94c143bc4c	test(searchbar_smart-table): fix for integration	2022-09-29 14:28:50 +02:00
Pau	796988bb18	Removed e.stopPropagation	2022-09-29 14:14:05 +02:00
Alex Moreno	84003ab09c	fix(searchbar): smart-table.tableQ integration	2022-09-29 12:36:16 +02:00
Pau	7ac7189a8a	added maxlength binding, finished logic on insert	2022-09-29 08:08:49 +02:00
Alex Moreno	203b223cc6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing	2022-09-28 12:24:40 +02:00
Pau	dff378632b	Changed the logic	2022-09-28 12:23:25 +02:00
Alex Moreno	840140c40f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-09-28 12:20:35 +02:00
Alex Moreno	4df99a82e1	feat(tableOrder): save order in url	2022-09-28 11:22:29 +02:00
Alex Moreno	444bc36f31	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4159-tableQ_filter	2022-09-28 08:26:54 +02:00
Alex Moreno	8082e3071a	try	2022-09-27 15:17:54 +02:00
Pau	c2813e3633	Removed console logs and other debugging elements	2022-09-27 13:05:46 +02:00
Pau	d30065f90a	Add vn-input-account tag and logic	2022-09-27 12:12:25 +02:00
Alex Moreno	2c691eb796	feat(vnApp): getUrl and create salix.url. test(boxing): getVideoList	2022-09-26 14:49:11 +02:00
Alex Moreno	f698a22fcf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing	2022-09-26 09:25:43 +02:00
Alex Moreno	d2cbaa565e	add translation	2022-09-26 08:48:46 +02:00
Alex Moreno	c79f884526	feat(recover-password): open changePass in front and tests done	2022-09-22 09:22:24 +02:00
Joan Sanchez	8105c12a18	Campaign metrics	2022-09-22 08:48:29 +02:00
Alex Moreno	00f5689825	feat(account): recover-password	2022-09-21 15:15:19 +02:00
Alex Moreno	918863ee8e	feat(account): recover-password	2022-09-20 15:21:01 +02:00
Joan Sanchez	09bdee8b34	View & send PDF from loopback endpoint	2022-09-19 12:59:32 +02:00
Alex Moreno	cf7016c28a	feat(login): recover-password section	2022-09-14 15:18:11 +02:00
Alex Moreno	e72c0ae919	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4291-vnInputTime	2022-09-14 13:09:00 +02:00
Alex Moreno	bbc5790945	fix(smartTable): refresh button await query	2022-09-07 10:30:50 +02:00
Joan Sanchez	768e4d5e77	Resolved conflicts	2022-08-10 12:13:31 +02:00
Alex Moreno	d040ecb743	feat(ticket): getVideo from shinobi	2022-08-01 07:59:04 +02:00
Alex Moreno	d3852bac5d	fix(vnInputTime): quit new date(null)	2022-07-26 11:45:12 +02:00
Carlos Jimenez Ruiz	d0e06a46d0	removed deprecated stowaway comp and usages	2022-07-01 09:15:07 +02:00
Alex Moreno	1a88ccaae5	move funcionality setVersion to vnApp	2022-06-16 08:25:38 +02:00
Alex Moreno	fd8375a45a	move code to vnApp and interceptor	2022-06-14 10:16:41 +02:00
Alex Moreno	0d4ab527c3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2240-salix-version-refresh	2022-06-13 13:37:17 +02:00
Alex Moreno	559f313814	feat(front): interceptor getVersion from back	2022-06-13 13:36:05 +02:00
Alex Moreno	5e586bf1d0	test(client_defaulter): getBalanceDueTotal tested	2022-06-13 07:44:21 +02:00
Alex Moreno	f74c7a6999	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4024-client_defaulter	2022-06-09 15:13:04 +02:00
Alex Moreno	36ea903333	change NumberFormat	2022-06-09 15:10:53 +02:00
Joan Sanchez	83d4627f2d	Removed font color	2022-06-09 11:31:18 +02:00
Joan Sanchez	c92f444776	Ammends	2022-06-07 14:59:18 +02:00
Joan Sanchez	c369453bfc	Added model fields	2022-05-31 13:36:27 +02:00
Joan Sanchez	caa9a63c4c	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2022-05-24 08:45:37 +02:00
Alex Moreno	4a9c5742c0	fix(entry_latest-buys): fix multi_check	2022-05-17 13:50:06 +02:00
Alex Moreno	1707ff7f0f	duplicate test	2022-05-16 10:24:02 +02:00
Alex Moreno	35209d77cc	fix(multi-check)	2022-05-13 12:14:37 +02:00
Alex Moreno	946f1c1cb5	refactor test	2022-05-10 12:02:50 +02:00
Alex Moreno	fde73b35e7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3887-multi-check	2022-05-10 08:57:28 +02:00
Alex Moreno	f364c19c70	fix(monitor_client): fix scroll	2022-05-03 14:08:46 +02:00
Alex Moreno	ec49f37303	fix(icon): defaulter	2022-04-25 08:10:14 +02:00
Alex Moreno	62f7b80ed4	quit $	2022-04-20 08:55:43 +02:00
Alex Moreno	ea2e38af4e	support front filter and front test for component	2022-04-20 08:24:12 +02:00
Alex Moreno	69530d3019	fix filter	2022-04-19 14:12:31 +02:00
Alex Moreno	04f993e227	fix	2022-04-13 13:55:18 +02:00
Alex Moreno	3d7beba822	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3887-multi-check	2022-04-13 13:07:07 +02:00
Alex Moreno	f2ee987dec	fix multi-check	2022-04-13 08:15:47 +02:00
Alex Moreno	8e87ab62a8	feat(entry_latest-buys): add multi-check-dummy	2022-04-12 14:40:25 +02:00
Vicent Llopis	a8f4192b4c	feat: update salix fonts	2022-04-04 14:15:55 +02:00
Alex Moreno	7bd74d6b3b	feat(smart-table): add defaultSearch option	2022-03-17 09:14:01 +01:00
Alex Moreno	b4e5631cc7	feat(item_fixed-price): implement smart-table	2022-03-16 14:58:07 +01:00
Joan Sanchez	59ad70c4ac	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-02-16 08:16:17 +01:00
Joan Sanchez	5a2677c7de	Removed icons font color	2022-02-15 13:21:13 +01:00
Alex Moreno	460923464a	fix(icon): icon-plant	2022-02-03 11:52:55 +01:00
Alex Moreno	0eb5d8fe1c	feat(icons): import new icons	2022-02-01 11:48:47 +01:00
Joan Sanchez	263bc302e0	Background color for unchecked input	2022-01-20 14:07:25 +01:00
Joan Sanchez	b88f2c71c1	Ammends	2022-01-20 12:29:28 +01:00
Joan Sanchez	3fceff2975	Updated unit tests	2022-01-20 12:29:22 +01:00
Joan Sanchez	cf2ad0d61e	feat(smartTag): added sort priority between multiple sorting ... Refs: 3528	2022-01-20 12:29:12 +01:00
Joan Sanchez	4aa6b2b6c0	fix(salixfont): removed font color	2022-01-14 08:26:34 +01:00
Joan Sanchez	a4d16a60e0	Removed salix icons color	2022-01-13 08:36:46 +01:00
Carlos Jimenez Ruiz	b27cfef267	.text-secundary is now $color-font-light	2022-01-12 16:53:45 +01:00
Alex Moreno	b552c1972e	refactor(icons): update	2022-01-07 11:25:39 +01:00
Carlos Jimenez Ruiz	7b2b274cd5	.icon-deletedTicket icon name	2022-01-04 08:54:19 +01:00
Joan Sanchez	9790f0cdb1	Updated unit tests	2021-12-21 10:37:29 +01:00
Joan Sanchez	76ec1fceae	fear(smart-table): now shows the default order with the column arrows ... Refs: 3457	2021-12-21 09:19:28 +01:00
Joan Sanchez	2fb1c72887	fix(styles): style changes for better readability	2021-12-15 09:03:44 +01:00
Joan Sanchez	f63426304f	Removed font color	2021-12-02 09:20:45 +01:00
Joan Sanchez	5c342ae463	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-11-30 09:11:40 +01:00
Joan Sanchez	495510efed	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2021-11-30 09:08:19 +01:00
Joan Sanchez	e4d7d957eb	Rectified icons	2021-11-26 14:48:55 +01:00
Joan Sanchez	452d4557d1	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-11-26 14:11:33 +01:00
Joan Sanchez	9d6b870940	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2021-11-26 14:08:50 +01:00
Joan Sanchez	b0cb7e1424	Updated fonts	2021-11-26 13:53:39 +01:00
Joan Sanchez	c986fe9557	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2021-11-26 09:59:21 +01:00
Joan Sanchez	eb101ffc76	refactor(fonts): updated fonts and changed invoiceOut icon	2021-11-26 09:59:05 +01:00
Joan Sanchez	6b6a1b4329	refactor(fonts): updated fonts and changed invoiceOut icon	2021-11-25 14:14:01 +01:00
Carlos Jimenez Ruiz	372d5ade17	refactor(smartTable): removeProp updated and tests	2021-11-23 13:58:12 +01:00
Carlos Jimenez Ruiz	320cc6c02c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3350-Smart_table_unit_tests	2021-11-23 13:52:15 +01:00
Carlos Jimenez Ruiz	16df8fd2f3	Merge branch 'dev' into 3388-ticket_sale	2021-11-23 09:03:06 +00:00
Joan Sanchez	07dcdab1ef	fix(sale): disabled clear icons	2021-11-23 09:57:19 +01:00
Joan Sanchez	a940d14256	fix(filterValue): fixed sql injection vulnerability ... Refs: 3369	2021-11-22 14:40:03 +01:00
Joan Sanchez	6fdd752d63	Searchbar focus css fix	2021-11-19 10:18:54 +01:00
Carlos Jimenez Ruiz	92142c4f93	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3350-Smart_table_unit_tests	2021-11-18 17:00:33 +01:00
Joan Sanchez	9c5939b661	Updated styles	2021-11-18 16:02:47 +01:00
Carlos Jimenez Ruiz	cdc0d4dbe5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3350-Smart_table_unit_tests	2021-11-18 15:26:34 +01:00
Joan Sanchez	09c7240266	Updated dark image	2021-11-18 14:07:05 +01:00
Joan Sanchez	c98730e6b9	Updated styles	2021-11-18 14:00:45 +01:00
Joan Sanchez	ba60523012	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-11-18 12:31:43 +01:00
Joan Sanchez	3ffbdc3fde	Updated fonts	2021-11-18 11:48:13 +01:00
Carlos Jimenez Ruiz	e53af13b3c	unit tests for smart table and ticket index	2021-11-18 11:04:51 +01:00
Joan Sanchez	f49d66d9af	fix(theme): chip color issues	2021-11-18 10:36:12 +01:00
Joan Sanchez	e9342af3f5	refactor(theme): enabled dark theme	2021-11-18 10:12:21 +01:00