10044 Commits

All Branches

Search

Author	SHA1	Message	Date
Bernat Exposito	5c7168d696	Merge pull request 'removed id from descriptor' (#344) from 2368-entry_buy into dev ... Reviewed-on: #344 Reviewed-by: Bernat Exposito <bernat@verdnatura.es>	2020-08-03 06:20:55 +00:00
Bernat Exposito	1ad9f544eb	Merge branch 'dev' into 2368-entry_buy	2020-08-03 06:12:47 +00:00
Bernat Exposito	1f75e25aaf	Merge pull request 'wider space for tags' (#345) from 2374-diplay_full_item_tags into dev ... Reviewed-on: #345 Reviewed-by: Bernat Exposito <bernat@verdnatura.es>	2020-08-03 06:11:47 +00:00
Carlos Jimenez Ruiz	6007506633	wider space for tags	2020-07-31 11:43:56 +02:00
Carlos Jimenez Ruiz	44f649786c	Merge branch '2368-entry_buy' of https://gitea.verdnatura.es/verdnatura/salix into 2368-entry_buy	2020-07-31 10:53:14 +02:00
Carlos Jimenez Ruiz	810b072e14	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2368-entry_buy	2020-07-31 10:51:34 +02:00
Bernat Exposito	e733e2ed73	Merge branch 'dev' into 2368-entry_buy	2020-07-30 15:22:41 +00:00
Bernat Exposito	c0c4787373	Merge pull request '2361 ticket sale multi check fix-ish +popover size' (#343) from 2361-ticket_sale into dev ... Reviewed-on: #343 Reviewed-by: Bernat Exposito <bernat@verdnatura.es>	2020-07-30 15:21:54 +00:00
Carlos Jimenez Ruiz	e5f063c4c3	updated selector for entry descriptor testing	2020-07-30 17:08:35 +02:00
Carlos Jimenez Ruiz	ede73bfe92	removed id from descriptor	2020-07-30 16:40:40 +02:00
Carlos Jimenez Ruiz	e974f638dd	2361 ticket sale multi check fix-ish +popover size	2020-07-30 16:05:48 +02:00
Bernat Exposito	2e44c2d9db	Merge pull request 'ticket index and zone descriptor refactor' (#342) from 2377-ticket_index into dev ... Reviewed-on: #342 Reviewed-by: Bernat Exposito <bernat@verdnatura.es>	2020-07-30 11:01:53 +00:00
Carlos Jimenez Ruiz	9402f368f6	ticket index and zone descriptor refactor	2020-07-30 12:51:19 +02:00
Bernat Exposito	6504d0f5bc	Merge pull request '2233_global-refactor' (#341) from 2233_global-refactor into dev ... Reviewed-on: #341 Reviewed-by: Bernat Exposito <bernat@verdnatura.es>	2020-07-29 09:28:34 +00:00
Carlos Jimenez Ruiz	85b3b52e39	took a while to confirm this one	2020-07-29 10:54:45 +02:00
Carlos Jimenez Ruiz	e2481366a2	removed on response if just accept	2020-07-29 10:47:48 +02:00
Carlos Jimenez Ruiz	e126350079	scroll removed as it comes from layaout	2020-07-28 19:22:21 +02:00
Carlos Jimenez Ruiz	b926f8f8ad	core component to vnComponent working	2020-07-24 17:46:06 +02:00
Carlos Jimenez Ruiz	9d8c64fb92	parts of core component to vnComponent working	2020-07-24 17:04:34 +02:00
Carlos Jimenez Ruiz	fbd020e600	front salix component to vnComponent working	2020-07-24 14:55:01 +02:00
Carlos Jimenez Ruiz	c62801e741	modules component to vnComponent working	2020-07-24 14:22:30 +02:00
Carlos Jimenez Ruiz	6913f2db72	$httpBackend.when and .expect no longer misused	2020-07-23 17:10:07 +02:00
Carlos Jimenez Ruiz	4ca004f833	angular.mock.injet shorten to inject	2020-07-23 16:46:16 +02:00
Carlos Jimenez Ruiz	7d5dc776c1	replaced most of the translate.instant for $t	2020-07-23 16:07:08 +02:00
Bernat Exposito Domenech	b972353bb4	create method getComponentSum	2020-07-21 11:11:09 +02:00
Carlos Jimenez Ruiz	59e43ea17f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1788-remove_autoload_vnTable	2020-07-20 11:51:23 +02:00
Carlos Jimenez Ruiz	f9da489a96	excluded unfinished tests WIP	2020-07-20 11:50:21 +02:00
Carlos Jimenez Ruiz	f2730dd51c	some parts of latestsBuys WIP	2020-07-20 11:31:47 +02:00
Joan Sanchez	648c87e763	Removed .DS_Store files	2020-07-16 14:31:44 +02:00
Joan Sanchez	84c74744b4	Merge pull request '1880-refactor_loggable' (#337) from 1880-refactor_loggable into dev ... Reviewed-on: #337 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-07-16 12:12:05 +00:00
Joan Sanchez	0348b79f0d	Merge branch 'dev' into 1880-refactor_loggable	2020-07-16 12:03:22 +00:00
Joan Sanchez	0c17423370	Merge pull request '2350-order_index' (#334) from 2350-order_index into dev ... Reviewed-on: #334 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-07-16 12:01:55 +00:00
Bernat Exposito Domenech	93006814a1	Merge branch '1880-refactor_loggable' of https://gitea.verdnatura.es/verdnatura/salix into 1880-refactor_loggable	2020-07-16 13:46:52 +02:00
Bernat Exposito Domenech	8c926a1a7f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1880-refactor_loggable	2020-07-16 13:20:41 +02:00
Joan Sanchez	cfceaa531e	Merge branch 'dev' into 2350-order_index	2020-07-16 11:18:22 +00:00
Joan Sanchez	6e93d58ab4	Merge pull request 'export production' (#339) from 2369-export_db into dev ... Reviewed-on: #339 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-07-16 11:16:49 +00:00
Joan Sanchez	171deeb82c	Merge branch 'dev' into 2350-order_index	2020-07-16 11:12:34 +00:00
Joan Sanchez	fa43c2ea2f	Merge branch 'dev' into 2369-export_db	2020-07-16 10:45:15 +00:00
Joan Sanchez	16be14534b	Merge pull request 'Worker calendar - Add absence' (#336) from 1876-worker_calendar into dev ... Reviewed-on: #336 Reviewed-by: Bernat Exposito <bernat@verdnatura.es> Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>	2020-07-16 10:44:13 +00:00
Bernat Exposito Domenech	064b950773	export production	2020-07-16 12:10:18 +02:00
Joan Sanchez	a07d960a2e	Fixed test	2020-07-16 12:09:50 +02:00
Joan Sanchez	cbb2ad7f44	Removed duplicated test	2020-07-16 11:59:16 +02:00
Joan Sanchez	87fa66fe8c	Updated methods description	2020-07-16 11:45:44 +02:00
Joan Sanchez	bbf3b72001	Added front & back tests	2020-07-16 10:04:16 +02:00
Joan Sanchez	4397060f36	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1876-worker_calendar	2020-07-16 09:21:11 +02:00
Bernat Exposito	0497954b0a	Merge branch 'dev' into 1880-refactor_loggable	2020-07-16 07:06:20 +00:00
Bernat Exposito Domenech	f7100f11ee	first step add right menu in ticket components	2020-07-16 07:43:07 +02:00
Joan Sanchez	871b97d3c6	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-07-15 12:37:22 +02:00
Joan Sanchez	da3d20bb16	Restored limit	2020-07-15 12:11:44 +02:00
Joan Sanchez	72dfa4262a	Removed limit	2020-07-15 12:00:38 +02:00