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
|
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 |
|
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
|
92649d3053
|
Removed acts_as_ordered. Fixed bug in group_orders archive.
|
2012-10-03 20:08:54 +02:00 |
|
benni
|
eb532babd6
|
Refactored pdf generation with newest prawn.
|
2012-10-02 02:50:48 +02:00 |
|
benni
|
29a6cd8b62
|
Upgraded to rails 3.1.8. Fixed various bugs in wiki.
|
2012-09-30 21:15:55 +02:00 |
|
benni
|
cd91436f7f
|
Allow ignoring apple restriction for specific ordergroup.
|
2012-09-30 13:34:16 +02:00 |
|
benni
|
ff4ab44bcc
|
Add option to restrict ordering when not enough apples.
|
2012-09-29 17:52:25 +02:00 |
|
benni
|
ec2e761e7f
|
Fixed multi coop routing and changed config accessors.
|
2012-08-24 19:52:38 +02:00 |
|
benni
|
5fb0bc2444
|
Big feactoring and bug fixing, Mailer, Tasks, GroupOrders
|
2012-08-24 11:11:40 +02:00 |
|
benni
|
c936813967
|
Some fixes for mailer module.
|
2012-08-17 19:08:02 +02:00 |
|
benni
|
6f7682d6a0
|
Fixed new user invite.
|
2012-08-06 12:00:40 +02:00 |
|
benni
|
fc8418bc8e
|
Some fixes in group forms.
|
2012-07-31 18:48:41 +02:00 |
|
benni
|
f759552022
|
Fixed user settings.
|
2012-07-31 18:21:42 +02:00 |
|
benni
|
af3c07f031
|
Simplifiying balancing view part 2. Lets call it finished.
|
2012-07-27 18:03:46 +02:00 |
|
benni
|
dc0d1b3e46
|
Fixed bug in apples stats.
|
2012-07-22 21:12:53 +02:00 |
|
benni
|
182742fbec
|
Merge branch 'master' into rails3
Conflicts:
.gitignore
app/models/task.rb
app/models/workgroup.rb
app/views/shared/_group_form.html.haml
config/locales/de.yml
db/schema.rb
|
2012-06-26 11:51:56 +02:00 |
|
benni
|
f1b71a5588
|
Minor refactoring in stats partial.
|
2012-06-24 21:43:36 +02:00 |
|
benni
|
7d54a416df
|
Allow changing number of automaticly created next weekly tasks.
|
2012-06-24 11:01:16 +02:00 |
|
benni
|
467874a8a5
|
Simplify balancing view. Part 1 of ...
|
2012-06-21 17:19:00 +02:00 |
|
benni
|
6bd4bbec86
|
Deactivated broken links in balancing.
|
2012-05-12 11:18:46 +02:00 |
|
benni
|
c49edb79a2
|
Fixed edit_not in balancing.
|
2012-05-12 10:55:20 +02:00 |
|
benni
|
b295f62322
|
Updated finance/invoices
|
2012-04-20 18:33:47 +02:00 |
|
benni
|
4a8e286d98
|
Fixed encoding issues with ruby > 1.9.2..
|
2012-04-16 08:49:54 +02:00 |
|
benni
|
ad508b207b
|
Updated to rails 3.0.12. remove old gettext code.
|
2012-04-15 19:59:39 +02:00 |
|
benni
|
b3c64ecb85
|
Fixed order views.
|
2011-06-20 00:26:17 +02:00 |
|
benni
|
88b268cb0b
|
Refactoring of order comments.
|
2011-06-19 20:47:27 +02:00 |
|
benni
|
38b5dcba1f
|
Refactored ordering part two. Integrated stock order.
|
2011-06-19 19:56:04 +02:00 |
|
benni
|
eb4705857b
|
Ordering refactored: Made everything RESTful.
|
2011-06-19 15:30:33 +02:00 |
|
benni
|
45e0048490
|
Minor refactoring for ordering js data.
|
2011-06-13 16:45:37 +02:00 |
|
benni
|
f3773314a7
|
Fixed ordering view.
|
2011-06-13 16:23:56 +02:00 |
|
benni
|
adbe93f39e
|
Fixed open_orders partial.
|
2011-06-13 15:26:06 +02:00 |
|
benni
|
afb2c26ab3
|
Fixed orders form.
|
2011-06-10 13:53:51 +02:00 |
|
benni
|
a27c0c67fc
|
Fixed some typos.
|
2011-06-10 13:31:01 +02:00 |
|
benni
|
172db1d37e
|
Admin namespace beendet.
|
2011-06-10 13:22:15 +02:00 |
|
benni
|
6ddef7267a
|
Refactored items_per_page. Start on admin/workgroups.
|
2011-06-10 12:18:55 +02:00 |
|
benni
|
689cfcfe01
|
Fixed items_per_page helper.
|
2011-06-10 12:03:32 +02:00 |
|