wvengen
60826ceedc
allow to edit GroupOrderArticle result from orders screen
...
Conflicts:
app/assets/javascripts/application.js
2014-02-10 16:03:08 +01:00
wvengen
7ebb2459e0
make click work better on touch devices (closes foodcoops#104)
2014-01-25 15:19:50 +01:00
wvengen
201f23381b
remove deprecated plugins directory
2013-10-29 20:28:09 +01:00
wvengen
8080cd6b7e
pass locale to datepicker, use gem for that
2013-07-07 01:47:22 +02:00
benni
ddcb4a9b2d
Moved acts_as_configurable to gemfile.
2012-11-24 16:49:19 +01:00
benni
7e6ac8c924
Moved acts_as_tree to gemfile.
2012-11-24 16:41:34 +01:00
benni
7fc0462fc4
Upgrade to rails 3.2.9. Moved acts_as_versioned to gem.
2012-11-24 16:36:40 +01:00
benni
acdb331e36
Improved tasks.
2012-10-08 21:52:03 +02:00
benni
52e62f8ddb
Fixed messages. New styling for token input plugin.
2012-10-08 18:19:15 +02:00
benni
92649d3053
Removed acts_as_ordered. Fixed bug in group_orders archive.
2012-10-03 20:08:54 +02:00
benni
eb532babd6
Refactored pdf generation with newest prawn.
2012-10-02 02:50:48 +02:00
benni
78cc423a46
Replaced prawnto plugin with rails31 compatible version.
2012-09-30 21:48:57 +02:00
benni
29a6cd8b62
Upgraded to rails 3.1.8. Fixed various bugs in wiki.
2012-09-30 21:15:55 +02:00
benni
f759552022
Fixed user settings.
2012-07-31 18:21:42 +02:00
benni
5636e200dc
Moved some plugins from vendor/plugins into Gemfile.
2012-04-15 19:13:38 +02:00
benni
d4715fef4b
Removed old plugin.
2011-05-20 00:23:27 +02:00
benni
a4f71bd672
Updated haml and acts_as_paranoid. Removed sass templates.
2011-05-15 21:50:43 +02:00
benni
b1a700ab5d
Upgraded will_paginate.
2011-05-11 12:31:17 +02:00
benni
eab16e337e
Updated router. Temporarly replaced routing filter with rails internal.
2011-05-11 12:27:58 +02:00
benni
d09d3922c1
Upgraded exception notifier plugin.
2011-05-11 11:03:36 +02:00
benni
4eba5fbc9c
First step for upgrading to rails 3.
...
Check rake rails:upgrade:check for next steps.
2011-05-11 01:32:21 +02:00
Benjamin Meichsner
3a85d4f49f
Fixed bug on ordergroups account managment page.
2010-05-28 11:50:18 +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
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
5d9385cde4
Changed wiki parser to wikicloth.
...
* Temporarly removing of TOC.
2009-08-11 14:30:35 +02:00
Benjamin Meichsner
053c665270
Added version control for wiki pages.
2009-05-15 17:32:45 +02:00
Benjamin Meichsner
325d47b22f
Changed behaviour of acts_as_paraniod. Finder wrapper removed an replaced by simple named_scope 'without_deleted'.
2009-02-11 15:23:59 +01:00
Benjamin Meichsner
9eb2125f15
Complete refactoring of orders-workflow.
...
OrderResult tables are removed. Data consistency is now possible through new article.price-history (ArticlePrice).
Balancing-workflow needs to be updated.
2009-01-29 01:57:51 +01:00
Benjamin Meichsner
fc45345e0d
Introduced acts_as_paranoid. Avoid deleting of suppliers and articles. (for consistency of order-results)
2009-01-20 19:37:15 +01:00
Benjamin Meichsner
fadc951208
Second part of admin-namespace-reorder. Also renamed OrderGroup into Ordergroup. More view-sharing between groups is neccessary.
2009-01-14 12:46:01 +01:00
Benjamin Meichsner
461dfa8531
Moved users into new admin-namespace and made the controller restful. Also moved some logic from the controller into the user-model (dry it up..).
2009-01-12 18:26:09 +01:00
Benjamin Meichsner
a6c7b04e33
Replaced rfpdf with prawn and prawnto. Start to convert pdf-views.
2009-01-07 15:29:23 +01:00
Benjamin Meichsner
9f8d0d28ac
Removed gettext and simplified_localization-plugin. L18n is now the appropriate module.
...
Upgraded to rails 2.2.2 and replaced complex foodsoft.rb-loader with simple
initializers/load_app_config.rb. Multiple foodcoops option is temporarly deactivated.
2009-01-06 15:45:19 +01:00
Benjamin Meichsner
5b9a7e05df
Initial commit of foodsoft 2
2009-01-06 11:49:19 +01:00