Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

Merge branch 'rails3' of github.com:bennibu/foodsoft into rails3

Browse source
This commit is contained in:
benni 2012-08-27 10:08:20 +02:00
commit d3abc03e56
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
README
View file

@ -6,6 +6,11 @@ Web-based software to manage a non-profit food coop (product catalog, ordering,
Have a look on README_DEVEL. 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 == License
FoodSoft - a webbased foodcoop management software FoodSoft - a webbased foodcoop management software
@ -21,4 +26,4 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
(See file LICENSE for the full text of the GPL) (See file LICENSE for the full text of the GPL)

4
README_DEVEL
View file

@ -69,7 +69,7 @@ With this, you also get a ready to go user with username 'admin' and password 's
--------------- ---------------
Start the WEBrick server to try it out: Start the WEBrick server to try it out:
script/server bundle exec rails s
(8) (optional) Get background jobs done (8) (optional) Get background jobs done
@ -81,4 +81,4 @@ start the workers:
or as a daemon process in the background or as a daemon process in the background
scrip/delayed_job start # and stop scrip/delayed_job start # and stop