7752 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Jimenez Ruiz	0e4927d2ba	Merge pull request '2388_export-structure' (#350) from 2388_export-structure into dev ... Reviewed-on: #350 Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>	2020-08-12 23:07:51 +00:00
Bernat Exposito Domenech	689245c27d	fix test	2020-08-12 14:23:13 +02:00
Bernat Exposito Domenech	a523030c54	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2388_export-structure	2020-08-12 14:22:55 +02:00
Bernat Exposito Domenech	f180b73656	delete deprecated sql	2020-08-12 13:18:55 +02:00
Bernat Exposito Domenech	1e56619c33	export structure and fix test	2020-08-12 13:07:58 +02:00
Joan Sanchez	de1a70aee7	Merge pull request '2384 - Searchbar filters fixed' (#349) from 2384-client_consumption into dev ... Reviewed-on: #349 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2020-08-12 10:06:55 +00:00
Joan Sanchez	1486cbb4e7	Updated unit test	2020-08-12 12:00:46 +02:00
Joan Sanchez	de9d1268b7	Updated unit test	2020-08-12 11:38:39 +02:00
Joan Sanchez	b0df4973e9	2384 - Searchbar filters fixed	2020-08-12 08:26:00 +02:00
Joan Sanchez	debd2a8693	Added puppeteer no-sandbox	2020-08-12 07:52:43 +02:00
Joan Sanchez	1717a7e840	dockerfile	2020-08-12 07:28:58 +02:00
Joan Sanchez	53dc9d898c	Updated dockerfile	2020-08-12 07:26:07 +02:00
Joan Sanchez	b836e1e80f	Install chrome headless dependencies	2020-08-11 15:20:48 +02:00
Joan Sanchez	cff9a64e54	puppeteer 2.0	2020-08-11 15:07:41 +02:00
Joan Sanchez	497a59c6bf	Install libglib2.0-0 package	2020-08-11 14:25:34 +02:00
Joan Sanchez	91fb2e954c	Added puppeteer to package.json	2020-08-11 13:51:18 +02:00
Carlos Jimenez Ruiz	eb262927ad	Merge pull request '#2383 - Changed model' (#347) from 2383-workerCalendar_to_calendar into dev ... Reviewed-on: #347 Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>	2020-08-10 13:20:45 +00:00
Joan Sanchez	e2c742c893	#2383 - Changed model	2020-08-10 14:29:25 +02:00
Carlos Jimenez Ruiz	872fbea808	Merge pull request '#2331 Refresh data on onFilter() when source is "state"' (#346) from 2331-delete_index_fix into dev ... Reviewed-on: #346 Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>	2020-08-10 08:45:39 +00:00
Joan Sanchez	35c9cf7146	#2331 Refresh data on onFilter() when source is "state"	2020-08-10 08:47:00 +02:00
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
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