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

125 Commits

Author SHA1 Message Date
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 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
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 eddf20b063 Added TOC (Table of contents) for wiki pages. 2009-06-11 17:59:21 +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 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 dafbb077b6 wiki-syntax: Use markup instead of textile. 2009-05-07 17:59:34 +02:00
Benjamin Meichsner f450070dbf First steps for an own wiki. 
* Scaffold for Page Objekt
* Using textile for rendering html
* Easy wiki-links with [[wikipage]]
 2009-03-25 19:54:04 +01:00
Benjamin Meichsner 37199bae1d Implemented pagination for messages overview. 2009-03-23 11:31:36 +01:00
Benjamin Meichsner 759217763e Added pagination to task archiv. 2009-03-23 11:23:41 +01:00
Benjamin Meichsner f018db5b15 Translated tasks/workgroup page. 2009-03-23 11:08:56 +01:00
Benjamin Meichsner 549c03f223 Updated workgroups page. 
* Make use of render :collection helper.
* Translated some links.
 2009-03-23 10:57:41 +01:00
Benjamin Meichsner 1772e8840c Translated pagination links. 2009-03-23 10:47:42 +01:00
Benjamin Meichsner 51f9826ea6 Merge branch 'master' of git://github.com/sandoz/foodsoft 2009-03-23 10:40:03 +01: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
sandoz 7c6a01b0fc Genderneutralization in stockit/index.html.haml 
* Genderneutralized string 'Lieferant'
 2009-03-22 15:04:29 +01:00
sandoz 1c62bf8786 Genderneutralized/Fixed strings in suppliers/index.haml 
* Genderneutralized 'Lieferanten'
* Fixed string 'ArtikelDatenbank'
* Fixed string 'KundenNr'
 2009-03-22 15:04:28 +01:00
sandoz a4900bf8e0 Translation/Genderneutralization in admin/index.html.haml 
* Translated 'Nick' to 'Benutzername'
* Genderneutralized 'Neueste Benutzer'
* Genderneutralized '...Gruppen und Benutzer...'
* Changed 'Name' to 'Gruppenname' in section 'Neueste Gruppen'
 2009-03-22 15:04:28 +01:00
sandoz de105bea70 SASS: Changed padding of input, textacrea, select 
* At membership list, the layout was slightly broken by the top-padding
* of an input-element after a div with a float:left.
 2009-03-22 15:03:50 +01:00
sandoz 8cdcb10c69 Translation in foodcoop/members.html.haml 
* Renamed "Sort by Ordergroups :"
* Removed whitespace before ':'
* Improved German Grammar. Hope you agree :-)
 2009-03-22 14:16:53 +01:00
sandoz 8171d3d173 Translation in foodcoop/_users.html.haml 
* Transalated 'Nick' to 'Benutzername'
 2009-03-22 14:16:53 +01:00
sandoz fea8c0993b Translation in profile.html.erb 
* Translated "cancal membership" and warning.
 2009-03-22 14:16:53 +01:00
sandoz 8d4acac081 Removed string "Benutzername: in home/profile.html.erb 
* I think it doubles it self to have the same string again on the next
 line. Hope you find it more beautiful too :-)
 2009-03-22 14:16:52 +01:00
sandoz 584431d00a Translations in shared/_user_form.rhtml 
* Added German text in order not to user default text.
 2009-03-22 14:16:52 +01:00
sandoz ceec784e62 Translation in profile.html.erb 
* Renamed "Nickname" to "Benutzername"
* Removed also '#' in end of line.
 2009-03-22 14:16:52 +01:00
sandoz 92e2bdd187 Renamed 'Help' to 'Hilfe' in top loginInfo bar 2009-03-22 14:16:52 +01:00
sandoz 54715e50fc Changed caption of group orders sum price 
* Changed caption of order_article.group_orders_sum[:price] to be "Summe
 (FC-Preis)" in _group_order_articles.html
* Trying to improve clarification of diffrent prices.
 2009-03-22 14:16:52 +01:00
sandoz cde1fb3525 Show total price of ordered units per article in finance/balancing 
* Implement functions total_price and total_gross_price on model
order_article
* Show total_price and total_gross_price in view finance/balancing
 _order_article (Closed #108)
 2009-03-22 14:16:52 +01:00
sandoz 2e490d1a52 Capitalized first letter of 'netto' and 'brutto' in Captions. 2009-03-22 14:16:52 +01:00
sandoz b189bc31d0 Small hack to make button "+" and "-" to be same size. 
* It would be better to put a specific class for de/increase buttons.
* Right now just adding min-width to input globally in SASS.
 2009-03-22 14:16:04 +01:00
sandoz 3654ba7cf1 Added buttons to in/decrease group order article results. 
Signed-off-by: bennibu <benni@dresdener27.de>
 2009-03-21 05:39:02 +08:00
sandoz f7f13ee7a6 Correct 'brutto'-price to be price.gross not fc_price. 
* We want to be more consistent in the use of diffrent price types:
* netto, brutto, fc_price

Signed-off-by: bennibu <benni@dresdener27.de>
 2009-03-21 05:38:58 +08:00
sandoz 39fdda4019 Fixed buggy link in finance/balancing/new.html.haml 
* Link to "Rechnung anlegen" did not send supplier id.

Signed-off-by: bennibu <benni@dresdener27.de>
 2009-03-21 05:38:57 +08:00
sandoz f655272448 Removed auto-created fixtures in stock_takings.yml 
Signed-off-by: bennibu <benni@dresdener27.de>
 2009-03-21 05:38:55 +08:00
sandoz 6da9190b03 Added buttons to in/decrease group order article results. 2009-03-20 20:37:13 +01:00
sandoz 8fbce954e3 Correct 'brutto'-price to be price.gross not fc_price. 
* We want to be more consistent in the use of diffrent price types:
* netto, brutto, fc_price
 2009-03-20 20:28:44 +01:00
sandoz 2c52944956 Fixed buggy link in finance/balancing/new.html.haml 
* Link to "Rechnung anlegen" did not send supplier id.
 2009-03-20 16:32:47 +01:00