Commit Graph

237 Commits

Author SHA1 Message Date
Benjamin Meichsner aa341628a6 Fixed bug when ending the group membership on profile page. 2009-09-11 16:13:04 +02:00
Benjamin Meichsner 8a37a0e746 Fixed bug in comments partial on missing users. 2009-09-11 16:10:18 +02:00
Benjamin Meichsner 84a026a677 Fixed bug in new ordergroup stats feature. 2009-09-11 16:03:48 +02:00
Benjamin Meichsner 9f60a323ad Add indexes for better sql query performance. 2009-09-07 15:35:19 +02:00
Benjamin Meichsner 7a23ec1cb1 Updating error messages. 2009-09-07 13:38:30 +02:00
Benjamin Meichsner 21f128ef1d Handle bad entries when creating new order articles in balancing
controller.
2009-09-07 13:31:03 +02:00
Benjamin Meichsner 5a93ca1641 Added tax to stockit index view. 2009-09-07 11:29:56 +02:00
Benjamin Meichsner 2cb0516e8c Fixed some broken links on admin user page. 2009-09-07 11:21:12 +02:00
Benjamin Meichsner a1ca9f368d Fixed bug when adding new article to a stock order (balancing
controller)
2009-09-07 10:57:49 +02:00
Benjamin Meichsner 8912dbaea0 Ignore vim temporary files. 2009-09-05 21:08:35 +02:00
Benjamin Meichsner 8276ff57f8 Fixed bug in messaging system. 2009-09-05 21:08:32 +02:00
sandoz 47d3232e4e Fix problem in breadcrumps, when no "Home"-page exists. 2009-08-19 22:59:53 +02:00
Benjamin Meichsner 42b5e7a73f Cherrypick of sandoz last commit
Conflicts:
	app/views/pages/all.html.haml
	public/stylesheets/main.css
	public/stylesheets/print.css
2009-08-16 10:13:50 +02:00
sandoz 6866c4eada Merge branch 'wiki' of git@github.com:bennibu/foodsoft into wiki 2009-08-16 01:15:47 +02:00
sandoz 57023cd018 Neues Breadcrump-Layout
* Die Breadcrump-Links sind jetzt überdem Seiten-Titel.
* Breadcrumps sind jetzt auf allen Wiki-Ansichten: edit, show, new, versions, all
* Bei edit und version ist der Breadcrump-Teil zur aktuellen Seite auch eine Link.
* Bei all wird nur der Foodcoop-Wiki-Teil angezeigt.
2009-08-16 01:09:11 +02:00
sandoz b46d7ca19c Abbrechen-Link in wiki/edit etwas robuster gemacht.
* wiki/edit zeigt jetzt auf @page und nicht mehr auf :back.
* Man kann durchaus direkt zu einer Edit-Seite surfen, dann kann :back Beliebiges sein.
2009-08-16 01:07:12 +02:00
Benjamin Meichsner 73c1137715 Removed another new wiki page link. 2009-08-15 17:39:14 +02:00
Benjamin Meichsner fd99125136 Temporarly removing of wiki tab. 2009-08-15 17:38:10 +02:00
Benjamin Meichsner 24854984ed Added index for pages. 2009-08-15 17:36:13 +02:00
Benjamin Meichsner e75a42d509 Merge branch 'wiki' 2009-08-15 17:24:08 +02:00
Benjamin Meichsner 6fae1e8b64 Begin with h2 for the wiki content. 2009-08-15 17:14:07 +02:00
sandoz aa5166bb16 Hübschified "Schnelle Formatierungshilfe" 2009-08-15 15:08:02 +02:00
sandoz 8d243c8e60 Show supplier email in suppliers/show.haml
* Closes: #38
2009-08-15 12:29:08 +02:00
Benjamin Meichsner 4ba612aa5b Fixed bug in new rake task. 2009-08-14 13:50:05 +02:00
Benjamin Meichsner 27bec1f860 Remember per_page number when updating multiple articles. Closes #36 2009-08-13 17:23:14 +02:00
Benjamin Meichsner fd97c1fc60 Made multi coop installation available as an option in app_config.yml. 2009-08-13 16:36:01 +02:00
Benjamin Meichsner f4edfacd91 Fixed missing error message. 2009-08-13 16:09:06 +02:00
Benjamin Meichsner d470c660d8 Fixed broken link in ordergroups view. 2009-08-13 00:38:12 +02:00
Benjamin Meichsner 332fc831c8 Send warn messages for unassigned tasks 7 days before due date. 2009-08-12 21:47:07 +02:00
Benjamin Meichsner d5342f5ff9 Added warn message, when deleting a page. 2009-08-12 19:06:15 +02:00
Benjamin Meichsner d7b65a304e Removed new page link in wiki menu. 2009-08-12 19:02:03 +02:00
Benjamin Meichsner 469c2473ca Fixed some bugs on version page. 2009-08-12 19:00:45 +02:00
Benjamin Meichsner 9516f349ce Improved wikipage sidebar. 2009-08-12 18:55:36 +02:00
Benjamin Meichsner 3b766af2a6 Fixed wikicloth bug "missing last row". (Better: implemented a workaround) 2009-08-12 18:47:33 +02:00
Benjamin Meichsner a8c93c08b7 Added parent-child relationship to pages to visualize a breadcrump and subpages. 2009-08-12 18:41:25 +02:00
Benjamin Meichsner 83e741c1af Improved delivery creating/updating prozess. 2009-08-12 13:38:03 +02:00
Benjamin Meichsner 16346e3529 Added note to deliveries. Closes #34 2009-08-12 13:09:10 +02:00
Benjamin Meichsner 5e1fc73c29 Avoid creating of duplicate articles. (Tests on article.name) Closes #10 2009-08-12 12:33:07 +02:00
Benjamin Meichsner aedfcae03b Added stock_article number to stockit view. Closes #33 2009-08-12 11:46:27 +02:00
Benjamin Meichsner 3656dac3cb Fixed display bug with new ajax_box. 2009-08-11 19:49:31 +02:00
Benjamin Meichsner 58ce422ef7 Reduced number of generated weekly tasks. 2009-08-11 18:39:21 +02:00
Benjamin Meichsner 49be55238b Added rake task to notify workgroup members if not enough users assigned an upcoming task. 2009-08-11 18:10:14 +02:00
Benjamin Meichsner d8cdbe4abb Added rake task for auto create of upcoming workgroup tasks (weekly tasks). 2009-08-11 17:22:08 +02:00
Benjamin Meichsner 00619ccf55 Updated wiki format help. 2009-08-11 14:41:58 +02:00
Benjamin Meichsner 5d9385cde4 Changed wiki parser to wikicloth.
* Temporarly removing of TOC.
2009-08-11 14:30:35 +02:00
root 7e2506baa2 Fixed haml bug. 2009-08-06 16:14:36 +02:00
Benjamin Meichsner f45509fc07 Merge branch 'tolerance_not_costly' 2009-08-05 17:02:12 +02:00
Benjamin Meichsner 8c3c8a1f95 Extended config sample for the new tolerance_not_costly feature. 2009-08-05 12:15:37 +02:00
Benjamin Meichsner ad94006978 Hide ordergroup link for non ordergroup members. 2009-08-05 11:49:07 +02:00
sandoz 0adce9d54c First try making tolerance not costly.
A new configuration setting was introduced: tolerance_is_costly
If set to false, article tolerance values do not count for total article price as long as the order is not finished.
This reduces the negative effect on using tolerance for the user.
2009-08-04 23:44:11 +02:00