foodsoft

Commit Graph

Author	SHA1	Message	Date
Patrick Gansterer	f286dd6053	Add pickup date This additional date helps users to find the correct order if the time between end and pickup varies a lot.	2016-04-29 15:28:05 +02:00
wvengen	b53cb36714	give proper block to link_to_ordering (closes #201 )	2013-12-11 22:58:50 +01:00
wvengen	e25570d870	Merge remote-tracking branch 'tg-x/master' Conflicts: app/views/shared/_open_orders.html.haml	2013-12-11 22:39:37 +01:00
wvengen	1f08ee4759	Merge remote-tracking branch 'foodcoops/master' into feature-link_to_group_order Conflicts: app/views/shared/_open_orders.html.haml	2013-11-25 10:11:56 +01:00
wvengen	810656a53b	small link_to_ordering refactoring	2013-11-25 10:04:44 +01:00
wvengen	652a392b37	simplify i18n and fix some small ui issues	2013-11-23 17:49:43 +01:00
tg(x)	de9453fa24	dashboard: link to view order page	2013-11-13 16:42:32 +01:00
wvengen	c37ed74942	Merge branch 'master' into allow-no-nickname Conflicts: app/views/foodcoop/users/_users.html.haml	2013-10-29 19:15:52 +01:00
wvengen	4e61e764df	fix haml indentation errors	2013-10-17 16:35:50 +02:00
wvengen	e4f0a1e3ed	start of making nickname optional	2013-09-20 22:40:13 +02:00
wvengen	28c66642f5	finish shared i18n	2013-02-08 19:16:06 +01:00
benni	552c553b77	Fixed admin, orders, wiki views. Converted all erb to haml.	2012-10-15 21:19:17 +02:00
benni	f20ae890dd	Added twitter bootstrap layout. Adapt home page.	2012-10-06 17:14:57 +02:00
benni	ff4ab44bcc	Add option to restrict ordering when not enough apples.	2012-09-29 17:52:25 +02:00
benni	eb4705857b	Ordering refactored: Made everything RESTful.	2011-06-19 15:30:33 +02:00
benni	adbe93f39e	Fixed open_orders partial.	2011-06-13 15:26:06 +02:00
sandoz	48b6515c08	Genderchanged string 'Lieferant' * Since s.b. started this already. I changed every string 'Lieferant' to 'Lieferantin' to give note on female existance in this world :-)	2009-03-22 15:04:29 +01:00
Benjamin Meichsner	1912a3fd80	First part of stock-integratino. Orders with supplier_id == 0 become stockorders.	2009-02-05 16:40:02 +01:00
Benjamin Meichsner	288566f000	Moved 'shared' partial into shared-folder. Easer to maintain.	2009-01-30 19:02:35 +01:00

19 Commits