Improving foodsoft! Railsupgrade, BNN Import/Export, Usability stuff https://prototypefund.de/project/weiterentwicklung-von-foodsoft/
Find a file
wvengen 2d382df1f1 Merge remote-tracking branch 'bennibu/rails3' into rails3
Conflicts:
	app/assets/stylesheets/bootstrap_and_overrides.css.less
	app/controllers/stockit_controller.rb
	app/models/ordergroup.rb
	app/models/workgroup.rb
	app/views/stockit/index.html.haml
2013-03-06 01:01:12 +01:00
app Merge remote-tracking branch 'bennibu/rails3' into rails3 2013-03-06 01:01:12 +01:00
config Merge remote-tracking branch 'bennibu/rails3' into rails3 2013-03-06 01:01:12 +01:00
db Revert 099e2b9b06 2013-02-25 10:29:47 +01:00
doc Corrected rake command for doc generation. 2012-10-18 09:54:59 +02:00
lib Fixed multicoops and resque rake tasks. 2013-01-07 13:44:46 +01:00
public Upgraded to rails 3.1.8. Fixed various bugs in wiki. 2012-09-30 21:15:55 +02:00
script Fixed admin, orders, wiki views. Converted all erb to haml. 2012-10-15 21:19:17 +02:00
test Removed unused test files. 2012-08-27 08:46:45 +02:00
tmp Ignored tmp, rubymine project files and other stuff. 2011-05-06 19:55:34 +02:00
vendor Moved acts_as_configurable to gemfile. 2012-11-24 16:49:19 +01:00
.gitignore tell git to ignore secret_token.rb 2013-01-12 16:04:00 +01:00
.rbenv-version Merge branch 'master' into master-rails3-merging 2012-12-11 10:32:59 +01:00
config.ru First step for upgrading to rails 3. 2011-05-11 01:32:21 +02:00
Gemfile Added bullet gem to track unusued eager loading. 2013-01-26 16:16:50 +01:00
Gemfile.lock Added bullet gem to track unusued eager loading. 2013-01-26 16:16:50 +01:00
LICENSE Update License (to GPL3) and install instructions. 2009-01-20 15:59:06 +01:00
MULTI_COOP_INSTALL Fixed multi coop routing and changed config accessors. 2012-08-24 19:52:38 +02:00
Rakefile Upgraded to rails 3.1.8. Fixed various bugs in wiki. 2012-09-30 21:15:55 +02:00
README Updated READMEs. Recommend using rails3 branch. 2012-08-25 12:24:57 +02:00
README_DEVEL Replaced delayed_job with resque. See README_DEVEL 2012-12-23 17:38:04 +01:00
VERSION Bumped new version: 3.1.1 2012-07-20 15:03:22 +02:00

== FoodSoft

Web-based software to manage a non-profit food coop (product catalog, ordering, accounting, job scheduling).

== Install

Have a look on README_DEVEL.

Update, it is highly recommended to checkout the rails3 branch. As soon as possible I will merge this branch
into master. So for beginnners, better start with the new (I hope much easier) code.

git checkout -b rails3 origin/rails3

== License

FoodSoft - a webbased foodcoop management software
Copyright (C) 2011 Benni and Lasse

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
GNU General Public License for more details.

(See file LICENSE for the full text of the GPL)