10855 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Jimenez Ruiz	e3942c0bb9	refactor(thermograph): empty fields handler added and correct usage of thermograph.code	2021-10-19 10:58:58 +02:00
Alex Moreno	1cb0cda3a8	fix(sale): delete :: in image	2021-10-19 10:26:00 +02:00
Joan Sanchez	909fb368ce	Merge pull request '3108-item_isBargain_isOnOffer_deprecation' (#750) from 3108-item_isBargain_isOnOffer_deprecation into dev ... Reviewed-on: #750 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-10-19 08:09:26 +00:00
Carlos Jimenez Ruiz	b41a0bd849	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3108-item_isBargain_isOnOffer_deprecation	2021-10-19 09:57:45 +02:00
Carlos Jimenez Ruiz	4998f718cb	Merge pull request '2423 - Hide left menu' (#691) from 2423-hide_leftMenu into dev ... Reviewed-on: #691 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-10-19 07:56:18 +00:00
Vicent Llopis	788bd76014	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3235-entry_summary	2021-10-19 07:34:53 +02:00
Carlos Jimenez Ruiz	9d51c2a6a9	Merge branch 'dev' into 2423-hide_leftMenu	2021-10-18 18:28:35 +00:00
Carlos Jimenez Ruiz	18c9b161e2	Merge pull request 'feat(last-entries): add dateTo & delete style.scss' (#749) from 3172-item_last-entries into dev ... Reviewed-on: #749 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-10-18 18:27:30 +00:00
Carlos Jimenez Ruiz	fa067f94d9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3172-item_last-entries	2021-10-18 16:55:28 +02:00
Carlos Jimenez Ruiz	d29f338b5a	Merge pull request 'Feat(diary): Add column claim' (#747) from 3173-item_diary into dev ... Reviewed-on: #747 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-10-18 14:52:55 +00:00
Carlos Jimenez Ruiz	23a01a8e59	refactor(e2e): added waitForTimeout	2021-10-18 16:10:29 +02:00
Carlos Jimenez Ruiz	e6899d50c3	refactor(e2e): removed animations and transitios for the e2e tests	2021-10-18 16:09:07 +02:00
Joan Sanchez	7628c140f6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2423-hide_leftMenu	2021-10-18 15:12:21 +02:00
Joan Sanchez	f87c8989e4	Event rollback	2021-10-18 14:23:37 +02:00
Joan Sanchez	81bcc9202d	Removed console.log()	2021-10-18 14:17:53 +02:00
Vicent Llopis	40ab2ce5bc	feat(entry_summary): add reference	2021-10-18 14:00:59 +02:00
Alex Moreno	44f174103c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3173-item_diary	2021-10-18 12:12:17 +02:00
Carlos Jimenez Ruiz	015fbc37a8	Merge pull request 'Upload photo with vertical orientation & added remote file upload handler' (#746) from 3111-uploadPhoto_vertical into dev ... Reviewed-on: #746 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-10-18 10:06:08 +00:00
Carlos Jimenez Ruiz	cec04a307d	refactor:(item): deprecation of isBargain and isOnOffer columns at model and fixtures	2021-10-18 12:05:38 +02:00
Carlos Jimenez Ruiz	faa8269228	refactor(e2e): added waitForTimeout on descriptor more menus	2021-10-18 11:49:26 +02:00
Joan Sanchez	7689ce3596	Merge branch '3111-uploadPhoto_vertical' of https://gitea.verdnatura.es/verdnatura/salix into 3111-uploadPhoto_vertical	2021-10-18 11:15:21 +02:00
Carlos Jimenez Ruiz	b737bb69d6	Merge branch 'dev' into 3111-uploadPhoto_vertical	2021-10-18 09:14:44 +00:00
Joan Sanchez	0313c8d590	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3111-uploadPhoto_vertical	2021-10-18 11:10:05 +02:00
Carlos Jimenez Ruiz	dd81590ee5	Merge pull request 'Send invoice and delivery-note with CSV file' (#745) from 3094-invoice_csv into dev ... Reviewed-on: #745 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-10-18 09:09:44 +00:00
Joan Sanchez	ec011cbc4e	Updated JSDOC param	2021-10-18 10:51:20 +02:00
Vicent Llopis	e61e74ed36	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3172-item_last-entries	2021-10-18 10:27:59 +02:00
Alex Moreno	bf100f339e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3173-item_diary	2021-10-18 10:22:53 +02:00
Joan Sanchez	ff2a1e7617	Removed comments	2021-10-18 10:14:04 +02:00
Joan Sanchez	ee1a7952ad	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3094-invoice_csv	2021-10-18 09:44:27 +02:00
Joan Sanchez	93187ea049	Merge pull request '3092-module_transactions' (#740) from 3092-module_transactions into dev ... Reviewed-on: #740 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-10-18 07:42:19 +00:00
Joan Sanchez	b970214a85	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions	2021-10-18 09:31:50 +02:00
Joan Sanchez	558c79315f	changes	2021-10-18 09:31:25 +02:00
Joan Sanchez	19b1190480	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2423-hide_leftMenu	2021-10-18 08:38:03 +02:00
Joan Sanchez	776f16641e	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-10-18 08:28:13 +02:00
Joan Sanchez	da5be333d9	fix(osticket): don't show resolved tickets by other deparments	2021-10-18 08:22:14 +02:00
Carlos Jimenez Ruiz	1ba2a924e6	refactor(print): chrimoum is now a single process on each instance with no child processes	2021-10-15 16:15:00 +02:00
Joan Sanchez	e26eed5d30	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-10-15 16:07:56 +02:00
Carlos Jimenez Ruiz	ace1c9c84b	fix(transaction): priceDifference now commits its created transaction	2021-10-15 16:02:50 +02:00
Carlos Jimenez Ruiz	c4c1aa929a	refactor(endpoints): corrected indentation and removed unused code	2021-10-15 16:00:50 +02:00
Carlos Jimenez Ruiz	de7af0fee2	fix(transaction): priceDifference now commits its created transaction	2021-10-15 15:59:59 +02:00
Carlos Jimenez Ruiz	270b2802c8	refactor(transactions): added transaction to sendChechingPresence and corrected a typo	2021-10-15 15:31:13 +02:00
Carlos Jimenez Ruiz	05df98939b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions	2021-10-15 14:47:34 +02:00
Carlos Jimenez Ruiz	580ba36357	refactor(jasmine): usage of done on async functions is deprecated	2021-10-15 14:45:41 +02:00
Carlos Jimenez Ruiz	f1611f8fe0	fix(e2e): many e2e using descriptor more menu need a wait before using the options	2021-10-15 14:42:27 +02:00
Carlos Jimenez Ruiz	2a20a9194a	fix(puppeteer): chrimium now limited to single process with no child processes to avoid ram overload	2021-10-15 14:40:48 +02:00
Carlos Jimenez Ruiz	5e8c216cd2	fix(dependencies): jasmine and it's reporters upgraded	2021-10-15 14:39:45 +02:00
Joan Sanchez	e9539c7675	Restored SQL version	2021-10-15 14:09:07 +02:00
Joan Sanchez	d5cf57fbb1	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-10-15 14:07:48 +02:00
Joan Sanchez	8fabd378e7	Removed version folder	2021-10-15 14:00:15 +02:00
Joan Sanchez	629a8d25b7	Updated pagination styles	2021-10-15 13:49:41 +02:00