benni
|
b9138efa79
|
Fixed floating error in group_order new.
|
2012-12-22 14:42:19 +01:00 |
|
benni
|
d954279d6a
|
Show accept/reject button in task show view.
|
2012-12-22 14:29:59 +01:00 |
|
benni
|
807d476e44
|
Fixed missing scoping by ordergroup in financial index.
|
2012-12-22 14:23:58 +01:00 |
|
benni
|
1298af8377
|
Small improvement for update price. Removed delayed job.
Attention, every delayed job has to know its Foodcoop scope. Otherwise
every task will be executed in the default database. See email delivery.
|
2012-12-16 21:46:24 +01:00 |
|
benni
|
0dff5ea784
|
Fixed some bugs in tasks, apple feature:
* Update ordergroup stats when task is destroyed.
* Removed assigned caching attribute in task object.
* A lot of eager loading for tasks controller.
|
2012-12-16 19:07:45 +01:00 |
|
benni
|
9919183cb0
|
Fixed missing group_order_article in group_order show.
Also add eager loading for associated objects.
|
2012-12-16 16:50:09 +01:00 |
|
benni
|
0fcd5abb3a
|
Fixed strange RecordReadOnly exception in task done.
|
2012-12-16 14:13:54 +01:00 |
|
benni
|
cabcd201a6
|
Improvements for Ordergroup.avg_jobs_per_euro.
Tip #2, Avoid initializing hole activerecord object whenever possible.
Use Class.pluck(:attribute) instead of Class.all.map(&:attribute)!
|
2012-12-16 13:56:47 +01:00 |
|
benni
|
b86172bc62
|
Performance improvements for ordergroup.update_stats!
As I have learned today. Let mysql do the counting, calculation stuff.
In most of the cases, it will be much faster!
|
2012-12-16 13:48:15 +01:00 |
|
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 |
|
benni
|
d9681eaf30
|
Added validation for article_price. Avoid unit_quantity of 0.
|
2012-12-11 10:59:50 +01:00 |
|
benni
|
bae09624b7
|
Avoid deleting categories which still have articles.
|
2012-12-11 10:53:01 +01:00 |
|
benni
|
620ec946f1
|
Merge branch 'master' into master-rails3-merging
Conflicts:
.gitignore
.rbenv-version
app/controllers/finance/balancing_controller.rb
app/views/finance/balancing/_order_article_form.html.haml
Fixed updating current price in finance balancing.
|
2012-12-11 10:32:59 +01: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
|
7c9d666909
|
Merge branch 'rails3' of github.com:bennibu/foodsoft into rails3
Conflicts:
Gemfile
|
2012-11-24 15:27:48 +01:00 |
|
benni
|
ecc31641aa
|
Changed header to copy old foodsoft style.
|
2012-11-24 15:23:12 +01:00 |
|
benni
|
e1cb866935
|
Remove html5 support for IE Browsers.
|
2012-11-24 13:53:19 +01:00 |
Robert Waltemath
|
2bd52b9270
|
Corrected config hash index to ':mailing_list_subscribe'
|
2012-11-13 10:18:40 +01:00 |
|
Robert Waltemath
|
c032fdca6e
|
Merge remote-tracking branch 'upstream/master'
|
2012-11-13 08:55:50 +01:00 |
Julius
|
d086fe7cc7
|
Fix task validation again #16; mark assignment validation TODO
|
2012-11-12 21:31:04 +01:00 |
|
Julius
|
e561ddb064
|
Fix task validation #16
|
2012-11-12 20:14:06 +01:00 |
|
Julius
|
95efe554fc
|
Add another option for mailing list subscription tip
|
2012-11-12 18:08:47 +01:00 |
|
Julius
|
c17ff281c3
|
Save and display creator of Order
|
2012-11-12 14:24:49 +01:00 |
|
benni
|
f4f10b1e4c
|
Introduced actionbar. Some fixes for balancing page.
|
2012-11-12 13:13:01 +01:00 |
|
benni
|
1d9815731c
|
Removed fancybox. Fixed profile, my ordergroup and tasks.
|
2012-11-12 09:18:44 +01:00 |
|
benni
|
dce79802e0
|
Fixed feedback.
|
2012-11-10 17:05:43 +01:00 |
|
benni
|
181695d1bd
|
Small fixes for article_categories.
|
2012-11-10 16:51:30 +01:00 |
|
benni
|
0236fb5a60
|
Fixed finance module to work with bootstrap design.
|
2012-11-10 16:44:05 +01:00 |
|
benni
|
16de9124fe
|
Fixes orders.
|
2012-10-30 00:20:47 +01:00 |
|
benni
|
8f7e21b918
|
Fixed stockit.
|
2012-10-29 18:28:17 +01:00 |
|
benni
|
27c719d8da
|
Fixed article categories.
|
2012-10-29 17:35:50 +01:00 |
|
benni
|
fc1c173718
|
Fixed articles module.
|
2012-10-28 18:03:50 +01:00 |
|
benni
|
ee3da51ad3
|
Fixed bug in new stockit article form.
|
2012-10-24 12:19:53 +02:00 |
|
benni
|
f30e57dd49
|
Fixed articles views.
|
2012-10-19 01:12:47 +02:00 |
|
benni
|
fd361090b4
|
Nice breadcrumb
|
2012-10-18 23:43:31 +02:00 |
|
benni
|
9af26e1da6
|
Fixed deliveries.
|
2012-10-17 20:45:52 +02:00 |
|
benni
|
552c553b77
|
Fixed admin, orders, wiki views. Converted all erb to haml.
|
2012-10-15 21:19:17 +02:00 |
|
Robert Waltemath
|
f0bf196934
|
order group recepient list ascending
|
2012-10-15 17:33:33 +02:00 |
|
benni
|
e9383e0d17
|
Remove searching shared articles by list.
This is necessary to go with newest fixes in sharedlists app.
|
2012-10-13 22:19:01 +02:00 |
|
benni
|
699fb9b233
|
Fixed wiki pages.
|
2012-10-09 02:31:10 +02: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
|
c0c41a7752
|
Fixed foodcoop/ordergroups and workgroups views.
|
2012-10-08 16:20:24 +02:00 |
|
benni
|
ab81ef09d5
|
Replace will_paginate with kaminari. Fixed foodcoop/users page.
|
2012-10-08 15:24:32 +02:00 |
|
benni
|
1708df3f6c
|
Fixed login, new_password and invitation views.
|
2012-10-08 11:51:56 +02:00 |
|
benni
|
f20ae890dd
|
Added twitter bootstrap layout. Adapt home page.
|
2012-10-06 17:14:57 +02:00 |
|
benni
|
31735f35ab
|
Reenabled sidebar..
|
2012-10-03 20:27:40 +02:00 |
|
benni
|
92649d3053
|
Removed acts_as_ordered. Fixed bug in group_orders archive.
|
2012-10-03 20:08:54 +02:00 |