benni
|
0edd29dfd4
|
Merge branch 'master' into master-to-rails3
Conflicts:
Gemfile
README_DEVEL
app/controllers/articles_controller.rb
app/controllers/orders_controller.rb
app/controllers/tasks_controller.rb
app/models/task.rb
app/views/articles/_import_search_results.haml
app/views/articles/index.haml
app/views/messages/new.haml
app/views/ordering/_order_head.haml
app/views/ordering/my_order_result.haml
app/views/orders/show.haml
app/views/stockit/new.html.haml
db/schema.rb
|
2012-12-14 18:10:46 +01:00 |
Robert Waltemath
|
8c0af4bd87
|
Documented config/initializers/session_store.rb
|
2012-11-14 09:52:32 +01:00 |
|
Robert Waltemath
|
a8d61d2591
|
Removed environment.rb to avoid overwriting it on update.
|
2012-11-13 10:12:06 +01:00 |
Julius
|
1e725872da
|
Add advise to modify secret token
|
2012-11-12 14:39:38 +01:00 |
|
benni
|
8883d0dfaf
|
Updated READMEs. Recommend using rails3 branch.
|
2012-08-25 12:24:57 +02:00 |
|
benni
|
7bc23698d1
|
Updated README_DEVEL.
|
2012-08-24 15:20:33 +02:00 |
|
benni
|
cd90439cc9
|
Updated readme for delayed_job.
|
2012-08-24 15:10:15 +02:00 |
Willem Broekema
|
c7ff6e3b90
|
Add rake comamnds to initialize database
|
2011-05-31 05:33:54 -07:00 |
|
benni
|
face58ebef
|
Updated README_DEVEL.
|
2011-05-06 20:38:39 +02:00 |
lasse
|
80287aeea4
|
Updating README_DEVEL and fixing environment.rb so foodsoft runs on a clean system.
Signed-off-by: bennibu <benni@dresdener27.de>
|
2009-01-27 19:57:07 +08:00 |
Benjamin Meichsner
|
b820577382
|
Update License (to GPL3) and install instructions.
|
2009-01-20 15:59:06 +01:00 |
|
Benjamin Meichsner
|
5b9a7e05df
|
Initial commit of foodsoft 2
|
2009-01-06 11:49:19 +01:00 |