Foodsoft
/
foodsoft
1
1
Fork 0
Code Issues 36 Pull Requests 5 Projects 1 Releases Wiki Activity
288 Commits 22 Branches 1 Tag 31 MiB
Commit Graph

288 Commits

Author SHA1 Message Date
Benjamin Meichsner 1b9ae83496 Few design improvements for order pages. 2010-02-11 23:22:50 +01:00
Benjamin Meichsner b5df80b7dd Fixed bug in wiki "all pages" view. 2010-02-10 00:13:51 +01:00
Benjamin Meichsner e93dd9e046 Zeige Wert der Äpfel. 2010-02-09 23:56:16 +01:00
Benjamin Meichsner 94d1a897e7 Fixed bug in stock orders (orderfooter commit). 2010-02-09 22:34:04 +01:00
Benjamin Meichsner 55d2976e98 Moved order stats and cleanup stuff into rake task. 
Closes #14
 2010-02-09 21:45:57 +01:00
Benjamin Meichsner a6646d06a6 Fixed bug during css caching. 2010-02-09 21:40:02 +01:00
Benjamin Meichsner 48ee593d8d Merge branch 'orderfooter' 2010-02-09 21:07:12 +01:00
Benjamin Meichsner 7a77d1aa66 Caching of css and javascript for better speed results. 2010-02-09 21:06:24 +01:00
Benjamin Meichsner 05d88d6178 Few css changes for performance improvement. 2010-02-09 20:38:48 +01:00
Benjamin Meichsner 164653dbfc Limited page versions number to 20. 2009-12-01 20:20:41 +01:00
Benjamin Meichsner 45039bf60f Replaced js article-info control with pure css. 2009-11-20 01:28:01 +01:00
sandoz d31b40bd66 Show also articles to get because of tolerance. 
* Closes #54
 2009-11-15 12:44:32 +01:00
Benjamin Meichsner 74ed02e11e Fixed broken link on start navigation menu. 
Closes #53
 2009-11-10 14:15:06 +01:00
Benjamin Meichsner 4d46f034e6 Added opacity to orderfooter. 2009-11-08 19:38:06 +01:00
Benjamin Meichsner 5e9ffa7cb1 Orderfooter design improvements. 2009-11-08 19:26:28 +01:00
sandoz b8e336b9e8 Minor layout change of order footer. 2009-11-01 19:27:48 +01:00
sandoz e4ef6556b8 Do not display tolerance column in stock order. 2009-11-01 18:57:55 +01:00
sandoz fd1eb8a1d7 Refactor orderfooter and quantity display 
* Unit, others_quantitiy and other_tolerance is now in orderfooter
* We display the missing units in the article row now.
 2009-11-01 18:33:14 +01:00
Benjamin Meichsner 2309fbe76b Reduced max articles per page for article matrix. 
Sometimes the last column wasn't displayed correctly.
 2009-10-20 23:13:08 +02:00
Benjamin Meichsner 646a6b11f5 Nice green +/- buttons for order page. 2009-10-20 23:05:41 +02:00
Benjamin Meichsner a4a48dc4fe Css fixes. 2009-10-18 14:19:02 +02:00
Benjamin Meichsner 65a0a30f5a Introduced order footer. 
An fixed element to present article meta data and other stuff.
 2009-10-17 22:50:33 +02:00
Benjamin Meichsner 036bc10282 Hide/show unavailable articles via js. 2009-10-17 20:33:36 +02:00
Benjamin Meichsner 84610cc9a5 Fixed broken link. Closes #44 2009-10-17 18:53:01 +02:00
Benjamin Meichsner 0b6b5eb0b5 Improved noscript warning on login page. 
Also add 'foodsoft' to title. closes #48
 2009-10-17 18:42:07 +02:00
Benjamin Meichsner 1f218f77a0 Corrected message in order result. Closes #47 2009-10-17 18:25:33 +02:00
Benjamin Meichsner 1f629ff861 Hide ignored articles in order result. 
* also added js-link to show them if wanted
 2009-10-17 12:22:13 +02:00
Benjamin Meichsner 20c7c0ef02 Revert "Tasks should be default page in foodcoop module." 
This reverts commit b5b27cee6e.
 2009-10-17 11:53:17 +02:00
Benjamin Meichsner b5b27cee6e Tasks should be default page in foodcoop module. 2009-10-16 21:10:52 +02:00
Benjamin Meichsner cf9fa69ac2 Minor improvements to task show view. 2009-10-16 21:06:55 +02:00
Benjamin Meichsner d0e04a05ec Removed unecessary weekly task templates. 2009-10-16 20:45:20 +02:00
Benjamin Meichsner f34c307540 Merge branch 'master' of git@github.com:bennibu/foodsoft 2009-10-12 14:44:48 +02:00
Benjamin Meichsner 42d85c63be Allow to have equal article and stockarticle. 
* Modified validation to allow the same name.
 2009-10-12 14:42:31 +02:00
sandoz 90f760858e Added site map and titel list to pages/all 
* pages/all now consists of three alternativ views: recent changes, site map and title list
 2009-10-06 22:24:51 +02:00
sandoz 305a4ac895 Don't show action "Create invoice" for stock order 2009-10-05 13:36:57 +02:00
Benjamin Meichsner c3ca3e23f9 Hide redirected pages in collection for parent ids. 2009-09-28 17:22:24 +02:00
Benjamin Meichsner 65e41efc18 Fixed problems when deleting redirected pages. 2009-09-28 17:18:09 +02:00
Benjamin Meichsner 6eba04d30d Better messages and redirect when a page is deleted. 2009-09-28 16:26:53 +02:00
Benjamin Meichsner de86fcadd3 Made blank parent_id for wikipages possible. 2009-09-28 15:41:00 +02:00
Benjamin Meichsner 7c192bbad3 Redirect /pages/id to /wiki/permalink 2009-09-28 15:31:20 +02:00
Benjamin Meichsner eca24d30f2 Show up tabnav link for wikipages. 2009-09-28 15:05:00 +02:00
Benjamin Meichsner 529956ea5a Merge branch 'wiki' 
Conflicts:
	app/helpers/pages_helper.rb
	public/stylesheets/main.css
	public/stylesheets/print.css
 2009-09-28 15:04:07 +02:00
Benjamin Meichsner 67661cb716 Added toc to wikipages. Patched wikicloth. 
* patched wikicloth to serve anchor links for sections
* added table of contents
* subpages list doesn't show up per default
 2009-09-28 14:57:11 +02:00
sandoz 741815e24e Fixed help for numbered lists in pages/_form 2009-09-28 13:53:56 +02:00
Benjamin Meichsner 8bba70594d Fixed bugs on my-ordergroup page and typos on invitation page. 2009-09-23 12:08:21 +02:00
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