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

246 commits

Author SHA1 Message Date
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
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
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
8a37a0e746 Fixed bug in comments partial on missing users. 2009-09-11 16:10:18 +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
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
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
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
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
27bec1f860 Remember per_page number when updating multiple articles. Closes #36 2009-08-13 17:23:14 +02:00
Benjamin Meichsner
d470c660d8 Fixed broken link in ordergroups view. 2009-08-13 00:38:12 +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
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
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
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
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
Benjamin Meichsner
c7e37fc7b2 Added possibility to give feedbacks via ajax form. Closes #2 
* Feedback message will send to error_recipients, configured in app_config.yml
 2009-08-04 15:22:11 +02:00
Benjamin Meichsner
b84ec884bd Highlight javascript dependencies. Closes #19 2009-08-04 13:49:14 +02:00
Benjamin Meichsner
4d57bd2e73 Show current stock value on stockit page. 2009-08-04 13:41:28 +02:00
Benjamin Meichsner
6761a41048 Hide articles with a stock amount of zero. Closes #17 2009-08-04 13:35:52 +02:00
Benjamin Meichsner
f72dccae18 Added edit invoice link to balancing sheet. Closes #8 2009-08-04 13:25:59 +02:00
Benjamin Meichsner
ce375e1637 Fixed bad link in tasks/workgroups. Closes #23 2009-08-04 12:57:19 +02:00
root
68f8d00930 Fixed bug in stats on a fresh installation. 2009-08-04 12:32:25 +02:00
Benjamin Meichsner
d9d800b41f Fixed bug in stats modul. Consider missing ordergroup. 2009-08-02 20:04:54 +02:00
Benjamin Meichsner
6659fe90f3 Merge branch 'stats' 2009-08-02 19:57:19 +02:00
Benjamin Meichsner
4545a5f17c Fixed wrong url during last commits. 2009-08-02 19:56:08 +02:00
Benjamin Meichsner
178fba7b30 Create restful invites controller and ajaxified the workflow. 2009-08-02 19:41:09 +02:00
Benjamin Meichsner
5cf75ee32a Moved foodcoop/members into new foodcoop/users restful controller. 2009-08-02 19:01:45 +02:00
Benjamin Meichsner
0d910dfbbd Moved foodcoop/workgroups into new namespace foodcoop. Closes #20 2009-08-02 18:42:52 +02:00
Benjamin Meichsner
1a8026c5a7 Move foodcoop/ordergroups into nwe namespace foodcoop. Made it more restful. 2009-08-02 18:12:13 +02:00
Benjamin Meichsner
d848831fea Implemented stats for ordergroups on startpage. Annotated models. 2009-08-01 13:41:22 +02:00
Benjamin Meichsner
d2efe64343 Fixed display bug in menu when using IE. Closes #15 2009-06-19 21:38:51 +02:00
Benjamin Meichsner
55729e20f9 Create a redirect when editing the title of a page. 2009-06-11 23:51:26 +02:00
Benjamin Meichsner
434fc4b2ff Change wiki-parser again. Now wikitext is used. 2009-06-11 22:40:56 +02:00
Benjamin Meichsner
255a4cd6c7 Fixed problems in interacting of acts_as_versioned and optimistic locking. 2009-05-20 15:26:53 +02:00
Benjamin Meichsner
2660d86b89 Added table of contents to wiki page. 2009-05-20 14:06:40 +02:00
Benjamin Meichsner
d371839eba Prefer textile over markup because markup doesn't support any tables. bähh. 2009-05-20 13:03:58 +02:00
Benjamin Meichsner
7de45543c4 Added page-preview feature to wiki module. 2009-05-20 12:42:01 +02:00
Benjamin Meichsner
0fb8ee214f Added helpful links to submenu. 2009-05-20 11:54:18 +02:00
Benjamin Meichsner
2af35e55bc Improved stockit overiew. Fixed article ordering by suppliers. 2009-05-17 16:50:13 +02:00
Benjamin Meichsner
e59ce8c313 Added deliveries counter to suppliers overview. 2009-05-17 16:18:14 +02:00
Benjamin Meichsner
a8e35bd421 Refactoring of delivery-workflow. Added ability to add stock_changes after creating a delivery. 2009-05-17 16:11:39 +02:00
Benjamin Meichsner
c03f3da21a Added more info to delivery/show for easier comparision of invoice amount and sum of delivered items. 2009-05-15 17:58:02 +02:00
Benjamin Meichsner
053c665270 Added version control for wiki pages. 2009-05-15 17:32:45 +02:00
Benjamin Meichsner
7ba6bc3680 Added optimistic locking to wiki pages. 2009-05-15 13:54:42 +02:00
Benjamin Meichsner
f83d2659de Added better routing for wiki-root-path. 2009-05-15 13:53:45 +02:00
Benjamin Meichsner
0d11e68bad Added syntax help to wiki form. 2009-05-13 17:32:43 +02:00
Benjamin Meichsner
7e4409bc11 Few improvements to wiki module. 2009-05-07 18:15:14 +02:00
Benjamin Meichsner
e8fa912e8c Removed contact data from ordergroups-page. Added names of users and date of last order. 2009-05-04 17:06:08 +02:00
Benjamin Meichsner
ecc0340a70 Added message-link and notes to new foodcoop/ordergroups page. 2009-04-20 14:33:24 +02:00
Benjamin Meichsner
a3fbc2d37b Merge branch 'master' of git@github.com:bennibu/foodsoft 2009-04-20 14:13:47 +02:00
Benjamin Meichsner
4db8184daa Fixed some bugs in orders lists. Closes #3 2009-04-20 14:11:11 +02:00
Benjamin Meichsner
e71cacfe50 Fixed typing error and changed default foodcoop tab to /tasks 2009-04-20 13:58:22 +02:00
sandoz
e32e97d178 Added "ordergroups" view to list the ordergroups 
* You can search in the name.
* You can show only active order groups (order in last 3 months)
* Future feature: generate text and pdf files for the box
  labels
 2009-04-18 15:39:07 +02:00