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 |
|
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
|
971e80b505
|
Fixed foodsoft rake tasks.
|
2012-08-27 08:38:43 +02:00 |
|
benni
|
ec2e761e7f
|
Fixed multi coop routing and changed config accessors.
|
2012-08-24 19:52:38 +02:00 |
|
benni
|
2860a3ca44
|
Fixed authentication when User is deleted during session.
|
2012-08-24 15:20:58 +02:00 |
|
benni
|
8f8d866bb9
|
Moved notification about negative account balance to background.
|
2012-08-24 15:04:54 +02:00 |
|
benni
|
edadb7d8d1
|
Moved message delivering into background process.
|
2012-08-24 14:33:45 +02:00 |
|
benni
|
af3875d46b
|
Refactored order finishing. Delay user notifications.
|
2012-08-24 14:24:36 +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
|
ef2ce98e46
|
Performance improvement for stockit view.
|
2012-07-31 17:37:32 +02:00 |
|
benni
|
8a74e7d77f
|
Removed annoate and hirb Gemfiles.
Annotate: Better look in schema.rb, this reference should be always up
to date.
Hirb: To reactivate hirb, look in railscasts:
http://railscasts.com/episodes/48-console-tricks-revised
|
2012-07-27 18:07: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 |
|
davidrabel
|
cda3c37e20
|
Umlaute eingefügt
|
2012-07-19 15:37:17 +02:00 |
|
davidrabel
|
2c1385c9ce
|
Preisänderungen beim Abrechnen können auch global angewandt werden.
|
2012-07-18 22:16:08 +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
|
5b2df07378
|
Fixed ordering before filter.
|
2011-06-10 13:58:50 +02:00 |
|
benni
|
afb2c26ab3
|
Fixed orders form.
|
2011-06-10 13:53:51 +02:00 |
|
benni
|
9ad93e9c06
|
Catch exceptions when deleting ordegroups.
|
2011-06-10 13:33:10 +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 |
|
benni
|
a47d4b1f0e
|
Unobtrusive pagination_links_remote
|
2011-06-10 11:43:56 +02:00 |
|
benni
|
c173cf4a6a
|
my_profile and admin/ordergroups.
|
2011-06-10 01:36:04 +02:00 |
|
benni
|
a787b3cf24
|
Admin/users refactored.
|
2011-06-09 22:03:27 +02:00 |
|
benni
|
ea6348bc5c
|
Refactored finance/ordergroups|transactions module.
|
2011-06-09 21:35:05 +02:00 |
|
benni
|
fc1d130113
|
Refactored stockit, delivery an stock_takings.
|
2011-05-27 14:09:01 +02:00 |
|
benni
|
5bf6503a8f
|
Included new localize_input gem.
|
2011-05-20 00:19:58 +02:00 |
|
benni
|
3f133bb8c3
|
Added client side validations. Fixed shared sync.
|
2011-05-19 22:35:13 +02:00 |
|
benni
|
013637a4fc
|
Refactored shared article import. Added meta search gem.
|
2011-05-19 22:22:05 +02:00 |
|
benni
|
1e33411516
|
refactored some js stuff. Fixed forms in article modul.
|
2011-05-19 19:49:37 +02:00 |
|
benni
|
9388e918a7
|
Implemented fancy box for ajax forms. Refactored articles modul.
|
2011-05-18 17:37:10 +02:00 |
|
benni
|
0decbb36e1
|
Refactored article_categories.
|
2011-05-18 16:10:30 +02:00 |
|
benni
|
0b1682af7c
|
Fixed suppliers module.
|
2011-05-18 15:52:06 +02:00 |
|
benni
|
772cf87c92
|
Fixed wiki module.
|
2011-05-18 15:29:38 +02:00 |
|
benni
|
d5552059ce
|
Refactored messages modul, but refactoring is still neccessary.
|
2011-05-18 14:47:17 +02:00 |
|
benni
|
6ac04d5e19
|
Fixed foodcoop/ordergroups view.
|
2011-05-18 11:47:00 +02:00 |
|
benni
|
2ee30fee16
|
Refactored home/ordergroup.
|
2011-05-16 11:00:52 +02:00 |
|
benni
|
1cf63fc40b
|
Some fixes to home view.
|
2011-05-16 10:34:14 +02:00 |
|
benni
|
06f2cc2007
|
Fixed and refactored foodcoop/workgroups.
|
2011-05-16 00:34:43 +02:00 |
|
benni
|
c87ead8da9
|
Added meta where and jquery observe field. Fixed members view.
|
2011-05-15 23:43:23 +02:00 |
|
benni
|
6c98c7c755
|
Some fixes for task module.
|
2011-05-15 22:06:54 +02:00 |
|
benni
|
79f8836da0
|
Fixed some html safe strings.
|
2011-05-15 21:17:01 +02:00 |
|
benni
|
5d028ccf3a
|
Added new autocomplete for task assignments.
Introduced the cool jquery token plugin.
|
2011-05-14 19:41:46 +02:00 |
|
benni
|
2e56bfe895
|
Some fixes for tasks.
|
2011-05-14 19:02:52 +02:00 |
|
benni
|
03d84aed1d
|
Added simple form for easier form building.
|
2011-05-14 17:06:32 +02:00 |
|
benni
|
185376d53d
|
Some improved validations for task.
|
2011-05-14 16:34:10 +02:00 |
|
benni
|
8da229316c
|
Some improved validations for task.
|
2011-05-13 22:43:23 +02:00 |
|
benni
|
197516b7fc
|
Fixed language and flash divs.
|
2011-05-11 17:41:43 +02:00 |
|
benni
|
2eb714b603
|
Fixed missing js for login layout.
|
2011-05-11 15:24:34 +02:00 |
|
benni
|
2a72263bd3
|
Replaced protoype with jquery. Some fixes in mailer class.
|
2011-05-11 15:14:39 +02:00 |
|
benni
|
e40f865c45
|
Refactored login module. Implemented standard sessions controller.
|
2011-05-11 13:38:46 +02:00 |
|
benni
|
eab16e337e
|
Updated router. Temporarly replaced routing filter with rails internal.
|
2011-05-11 12:27:58 +02:00 |
|
benni
|
8db221ca5f
|
New validate_on/before syntax.
|
2011-05-11 11:17:02 +02:00 |
|
benni
|
2d7d0d3b94
|
Updated actionmailer classes and API.
|
2011-05-11 10:54:02 +02:00 |
|
benni
|
4eba5fbc9c
|
First step for upgrading to rails 3.
Check rake rails:upgrade:check for next steps.
|
2011-05-11 01:32:21 +02:00 |
|
benni
|
46450cebef
|
New annotation, because of db switch to mysql.
Background: sqlite has some problems with decimal option.
|
2011-05-07 21:55:24 +02:00 |
|
benni
|
c2496aa4fd
|
Consider task duration in ordergroup stats.
* Also added duration to task template in workgroup task_duration.
|
2011-05-07 21:54:00 +02:00 |
|
benni
|
dcd2a514a6
|
Added duration to tasks. Annotated all models.
|
2011-05-07 20:50:39 +02:00 |
|
yep
|
383241621c
|
increased invite link lifetime from 2 days to 7 days.
|
2011-05-02 14:53:22 +02:00 |
|
benni
|
6c82d0e06a
|
Avoid setting page as parent id, which has current page as parent.
|
2011-03-09 13:36:02 +01:00 |
|
Benjamin Meichsner
|
80691c441b
|
Fixed bug on new delivery page.
|
2010-09-17 18:45:07 +02:00 |
|
Benjamin Meichsner
|
7742403bbe
|
Hide deleted stockarticles when creating new deliveries.
|
2010-07-24 20:28:37 +02:00 |
|
Benjamin Meichsner
|
f640c673de
|
Fixed bad when selecting same page as parent.
|
2010-07-08 10:57:42 +02:00 |
|
Benjamin Meichsner
|
5f51afb5ee
|
Fixed input control in balancing mode.
|
2010-07-01 16:12:02 +02:00 |
|
Benjamin Meichsner
|
fbf6a283a0
|
Fixed bug in orders index if order.ends.nil?
|
2010-06-19 12:25:35 +02:00 |
|