wvengen
|
de730808e7
|
finish mailer i18n
|
2013-02-06 00:50:59 +01:00 |
|
wvengen
|
b12a906a74
|
finish login i18n + controller
|
2013-02-05 12:54:55 +01:00 |
|
wvengen
|
c5de69bfc5
|
typo
|
2013-02-05 12:30:44 +01:00 |
|
wvengen
|
39812bef99
|
finish layouts i18n, use help url from config, use html language from locale
|
2013-02-05 12:11:29 +01:00 |
|
wvengen
|
5b53749fe6
|
fix small format bug in template
|
2013-02-04 13:13:04 +01:00 |
|
wvengen
|
ecce8041a1
|
invites controller i18n
|
2013-02-04 13:01:06 +01:00 |
|
wvengen
|
034f6a8f5c
|
finish invites i18n
|
2013-02-04 12:59:04 +01:00 |
|
wvengen
|
9138f0da03
|
also internationalize home controller
|
2013-02-04 02:12:24 +01:00 |
|
wvengen
|
1860e1c4cc
|
also internationalize sessions controller
|
2013-02-04 02:00:27 +01:00 |
|
wvengen
|
0c09696b2c
|
finish sessions i18n
|
2013-02-04 01:46:07 +01:00 |
|
wvengen
|
2b11549d33
|
finished home i18n
|
2013-02-04 00:46:22 +01:00 |
|
Manuel Wiedenmann
|
64b3d7e17d
|
finished admin/users i18n + dry the admin i18n
|
2013-02-04 01:38:18 +07:00 |
|
Manuel Wiedenmann
|
75c9338fd9
|
finished admin/workgroups i18n
|
2013-02-04 00:36:03 +07:00 |
|
Manuel Wiedenmann
|
e949257912
|
finished admin/ordergroups i18n
|
2013-02-04 00:10:11 +07:00 |
|
Manuel Wiedenmann
|
42c97520a1
|
started with admin views
|
2013-02-03 23:16:42 +07:00 |
|
wvengen
|
e0b781fca6
|
split locales into directory, and load from there
|
2013-02-01 17:56:34 +01:00 |
|
Benjamin Meichsner
|
8b2b70f8bf
|
Fixed saving user for new orders.
|
2013-01-26 16:24:45 +01:00 |
|
Benjamin Meichsner
|
04b611a080
|
Temporairly deactivated helper in new delivery form.
|
2013-01-26 15:57:29 +01:00 |
|
Benjamin Meichsner
|
310a97912c
|
Fixed disabling submit_button in group order form.
|
2013-01-26 15:41:46 +01:00 |
|
Benjamin Meichsner
|
3ab3ff2bc4
|
Minor speed improvements for group order load.
|
2013-01-26 15:18:35 +01:00 |
|
Benjamin Meichsner
|
2a66d37c3a
|
Fixed wrong start balance in new group order.
|
2013-01-26 15:17:56 +01:00 |
|
benni
|
0364562273
|
Fixed return_to when authorization gets lost.
|
2012-12-30 16:34:01 +01:00 |
|
benni
|
f6ff422405
|
Fixed missing line breaks in haml email templates.
|
2012-12-30 16:24:36 +01:00 |
|
benni
|
349cadd5e9
|
Renabled mail delivering in invites and login contrller.
|
2012-12-30 16:11:35 +01:00 |
|
benni
|
28aec7e4d6
|
Replace ordergroup.account_updated with non database attr.
|
2012-12-30 15:31:37 +01:00 |
|
benni
|
a489079334
|
Fixed wrong request method in deny_access.
|
2012-12-30 15:13:50 +01:00 |
|
benni
|
ba75a6e328
|
Fixed accidently switching to english locale in production.
|
2012-12-29 17:48:14 +01:00 |
|
benni
|
cd583cc9b2
|
Set host infos for urls in emails via app_config.
|
2012-12-28 13:55:18 +01:00 |
|
benni
|
db07b28b1c
|
Fixed bug in accessing foodsoft config.
|
2012-12-28 13:28:03 +01:00 |
|
benni
|
2c0fe08be6
|
Replaced delayed_job with resque. See README_DEVEL
|
2012-12-23 17:38:04 +01:00 |
|
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 |
|