6298 Commits

All Branches

Search

Author	SHA1	Message	Date
Juan Ferrer	5fdfda47b2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-10-25 00:53:57 +02:00
Juan Ferrer	c7384bb3ac	API path prefix, repeated code removed from tests	2019-10-25 00:53:53 +02:00
Bernat	eb384425f2	#1777 travel.descriptor	2019-10-24 14:43:11 +02:00
Bernat Exposito	e11faa1132	Merge branch '1773-1774-travel_summary' of verdnatura/salix into dev ... LGTM	2019-10-24 11:29:16 +00:00
Bernat	afd7c5684a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1773-1774-travel_summary	2019-10-24 12:49:23 +02:00
Bernat	7bdb497976	#1773 travel.summary & #1774	2019-10-24 12:49:18 +02:00
Juan Ferrer	ee196df2ff	vnCompent with most common services as properties	2019-10-24 12:44:36 +02:00
Juan Ferrer	4685b4166b	Improved event handling	2019-10-24 10:17:32 +02:00
Joan Sanchez	0eaba04e52	refactor	2019-10-24 07:41:54 +02:00
Juan Ferrer	2a4d3ae43d	Tests passed	2019-10-23 18:39:44 +02:00
Juan Ferrer	53003246c3	Merge with upstream	2019-10-23 17:42:41 +02:00
Juan Ferrer	2436bf9488	Agency events - First stable version	2019-10-23 17:38:35 +02:00
Carlos Jimenez Ruiz	6cbfa895da	fixed a typo	2019-10-23 15:04:05 +02:00
Carlos Jimenez Ruiz	d5b80e7663	#1831 item.diary no hace scroll	2019-10-23 12:26:57 +02:00
Carlos Jimenez Ruiz	c84625b0d5	#1713 route.tickets boton mas bajo derecha	2019-10-23 09:25:28 +02:00
Joan Sanchez	b099fe206b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1466-print_refactor	2019-10-23 07:53:58 +02:00
Joan Sanchez	d1e8f5fb1c	removed endpoints	2019-10-23 07:18:09 +02:00
Joan Sanchez	b6d666d223	removed IOS worker-time-controls endpoints	2019-10-23 07:14:12 +02:00
Joan Sanchez	137f701434	changed order	2019-10-22 14:20:50 +02:00
Joan Sanchez	2ed4cf3e4a	Item request refactor #1818	2019-10-22 13:44:36 +02:00
Joan Sanchez	58a763acf5	added quicklinks to worker descriptor	2019-10-21 14:21:52 +02:00
Joan Sanchez	8e1d594a13	was saving data on page load #1820	2019-10-21 13:43:17 +02:00
Joan Sanchez	1739a71e0d	removed QR barcode margins	2019-10-21 11:33:40 +02:00
Joan Sanchez	ff1924e442	added item-label report and configurable report options	2019-10-21 11:09:18 +02:00
Joan Sanchez	188f4ae3bf	mark item diary line	2019-10-21 11:08:41 +02:00
Bernat	939c507fba	#1810 El método listPackaging filtrar por isPackagingReturnable	2019-10-21 09:16:52 +02:00
Bernat	6adeb689eb	Tarea #1814 refactor fixtures userPhone	2019-10-21 08:52:42 +02:00
Bernat	e9f65cd2a6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-10-21 08:42:30 +02:00
Joan Sanchez	e2a7c09e4a	Uploadfile parameters are now required + fixed date filters	2019-10-21 08:31:14 +02:00
Bernat	6477a1458d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-10-21 07:24:56 +02:00
Joan Sanchez	55f3390f85	added validation for confirmed purcharse requests	2019-10-21 07:08:47 +02:00
Juan Ferrer	72017a64ac	Date timezone offset properly handled from backend DB connector	2019-10-19 01:18:25 +02:00
Juan Ferrer	470b966e85	Style fixes	2019-10-18 22:54:25 +02:00
Juan Ferrer	de9a8443ca	Style fixes	2019-10-18 22:28:08 +02:00
Juan Ferrer	485bc43b13	Style fixes	2019-10-18 22:07:55 +02:00
Juan Ferrer	17a150370c	Style fixes	2019-10-18 21:54:13 +02:00
Juan Ferrer	43fd8fe75e	Merge	2019-10-18 21:37:28 +02:00
Juan Ferrer	457034daad	Tests fixed	2019-10-18 21:36:30 +02:00
Bernat	85bcb356d4	1778 Refactor worker.phone	2019-10-18 13:52:15 +02:00
Bernat	b78447bdd7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-10-18 13:51:24 +02:00
Joan Sanchez	18b0ae034c	#1815 - show summary correct photos on claim index	2019-10-18 09:53:30 +02:00
Bernat	1cedd6cbfd	merge	2019-10-18 08:38:25 +02:00
Bernat	7a89ab5335	#1778 Refactor worker.phone	2019-10-18 08:36:33 +02:00
Carlos Jimenez Ruiz	bdbadaf61a	#1819 fixtures	2019-10-17 14:30:52 +02:00
Joan Sanchez	f78fec42cc	Merge branch '1757-drag_and_drop_department' of verdnatura/salix into dev ... LGTM	2019-10-17 12:13:18 +00:00
Joan Sanchez	f2a05ff915	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1757-drag_and_drop_department	2019-10-17 14:08:29 +02:00
Joan Sanchez	2a9158a593	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-10-17 14:06:52 +02:00
Joan Sanchez	703c882bc1	solved conflicts	2019-10-17 14:06:24 +02:00
Joan Sanchez	43a2c2e939	insert timeControl from procedure	2019-10-17 14:03:22 +02:00
Joan Sanchez	6f691353a3	solved conflicts	2019-10-17 14:03:07 +02:00