Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity
271 commits 22 branches 1 tag 31 MiB
Commit graph

271 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
8df679163e Change line "edited by" in pages/show 
* The line "Zuletzt bearbeitet" display now first the user and then the date.
* The user name is displayed in bold characters.
 2009-08-25 23:30:49 +02:00
sandoz
8927a80246 You can change the page parent now at pages/edit. 
* Increased text area size for better layout with the new feature.
* Closes #39
 2009-08-22 23:04:51 +02:00
sandoz
7ec5381ca0 Improved wiki layout for sidebar and version sections 
* Added new helper function format_datetime_timespec
 2009-08-22 18:14:56 +02:00
sandoz
f7e24d26b4 Better layout with equal distance from each sides. 
* Added css class middle_column
 2009-08-21 23:37:05 +02:00
sandoz
bbe8caa98a Tweeked a bit the wiki layout. 2009-08-21 23:09:38 +02:00
sandoz
004ce464c1 Fix problem in breadcrumps, when no "Home"-page exists. 2009-08-21 20:59:50 +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