6569579c02
styles the preferences in user profile
2013-06-14 22:38:07 +02:00
e28f3eda65
Fix StockArticle creation during delivery; small cleanups
2013-06-11 13:10:18 +02:00
60c4c5510a
adds a new user settings system + migration + rake task/worker updates
2013-06-06 03:40:15 +02:00
d4b9370541
Fixed setting all user setting to false in user profile.
2013-04-10 10:52:41 +02:00
22b3f3a491
fix bug in javascript i18n
2013-02-09 10:19:48 +01:00
28c66642f5
finish shared i18n
2013-02-08 19:16:06 +01:00
552c553b77
Fixed admin, orders, wiki views. Converted all erb to haml.
2012-10-15 21:19:17 +02:00
699fb9b233
Fixed wiki pages.
2012-10-09 02:31:10 +02:00
acdb331e36
Improved tasks.
2012-10-08 21:52:03 +02:00
1708df3f6c
Fixed login, new_password and invitation views.
2012-10-08 11:51:56 +02:00
f20ae890dd
Added twitter bootstrap layout. Adapt home page.
2012-10-06 17:14:57 +02:00
29a6cd8b62
Upgraded to rails 3.1.8. Fixed various bugs in wiki.
2012-09-30 21:15:55 +02:00
cd91436f7f
Allow ignoring apple restriction for specific ordergroup.
2012-09-30 13:34:16 +02:00
ff4ab44bcc
Add option to restrict ordering when not enough apples.
2012-09-29 17:52:25 +02:00
ec2e761e7f
Fixed multi coop routing and changed config accessors.
2012-08-24 19:52:38 +02:00
5fb0bc2444
Big feactoring and bug fixing, Mailer, Tasks, GroupOrders
2012-08-24 11:11:40 +02:00
fc8418bc8e
Some fixes in group forms.
2012-07-31 18:48:41 +02:00
ad508b207b
Updated to rails 3.0.12. remove old gettext code.
2012-04-15 19:59:39 +02:00
eb4705857b
Ordering refactored: Made everything RESTful.
2011-06-19 15:30:33 +02:00
adbe93f39e
Fixed open_orders partial.
2011-06-13 15:26:06 +02:00
a27c0c67fc
Fixed some typos.
2011-06-10 13:31:01 +02:00
172db1d37e
Admin namespace beendet.
2011-06-10 13:22:15 +02:00
c173cf4a6a
my_profile and admin/ordergroups.
2011-06-10 01:36:04 +02:00
a787b3cf24
Admin/users refactored.
2011-06-09 22:03:27 +02:00
1e33411516
refactored some js stuff. Fixed forms in article modul.
2011-05-19 19:49:37 +02:00
6c98c7c755
Some fixes for task module.
2011-05-15 22:06:54 +02:00
2a72263bd3
Replaced protoype with jquery. Some fixes in mailer class.
2011-05-11 15:14:39 +02:00
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
84610cc9a5
Fixed broken link. Closes #44
2009-10-17 18:53:01 +02:00
8a37a0e746
Fixed bug in comments partial on missing users.
2009-09-11 16:10:18 +02:00
c7e37fc7b2
Added possibility to give feedbacks via ajax form. Closes #2
...
* Feedback message will send to error_recipients, configured in app_config.yml
2009-08-04 15:22:11 +02:00
ce375e1637
Fixed bad link in tasks/workgroups. Closes #23
2009-08-04 12:57:19 +02:00
178fba7b30
Create restful invites controller and ajaxified the workflow.
2009-08-02 19:41:09 +02:00
ffc3adf907
Second (last) part of multiple foodcoop installation.
...
* When before_filter select_foodcoop is activated,
the database and configs will be loaded on each request.
* Replaced APP_CONFIG with new Foodsoft.config method.
2009-03-24 17:25:33 +01:00
48b6515c08
Genderchanged string 'Lieferant'
...
* Since s.b. started this already. I changed every string 'Lieferant' to
'Lieferantin' to give note on female existance in this world :-)
2009-03-22 15:04:29 +01:00
584431d00a
Translations in shared/_user_form.rhtml
...
* Added German text in order not to user default text.
2009-03-22 14:16:52 +01:00
92e2bdd187
Renamed 'Help' to 'Hilfe' in top loginInfo bar
2009-03-22 14:16:52 +01:00
3ea8d5a2ef
Refactoring of message system.
2009-02-18 01:06:35 +01:00
a0e10141dc
Translations and other little improvements.
2009-02-12 21:38:41 +01:00
951d19db6a
Introduced StockTaking. TODO: Dry up the stockit/stock_takings/deliveries controllers/views!
2009-02-12 18:32:20 +01:00
6202e05841
Last part of order refactoring. Now order_article create/update is possible.
2009-02-09 20:12:56 +01:00
24b66ee8d4
Small bugfix in shared view. Translations on start-page.
2009-02-06 21:18:20 +01:00
1912a3fd80
First part of stock-integratino. Orders with supplier_id == 0 become stockorders.
2009-02-05 16:40:02 +01:00
251ced4fa1
Introduced group_order_article.result to save the result for each group/article.
2009-02-04 16:41:01 +01:00
6fd5d825f9
Order-refactoring part II.
2009-02-03 21:14:48 +01:00
f7b9582261
Bugfixing in memberships-filter.
2009-02-02 17:28:59 +01:00
0a2a79237a
Moved User.address-info into Ordergroup.contact_... attributes. Updated model-fixtures for testing.
2009-02-02 16:35:43 +01:00
e16bebd042
Removed acts-as-statemachine. Replaces User.find_ordergroup with ActiveRecord-Association 'has_one :ordergroup'.
2009-02-01 20:56:23 +01:00
288566f000
Moved 'shared' partial into shared-folder. Easer to maintain.
2009-01-30 19:02:35 +01:00
190a777278
Order refactoring part two: Balancing workflow was adapted to the new order schema. Article modification is still missing.
2009-01-29 21:28:22 +01:00
9eb2125f15
Complete refactoring of orders-workflow.
...
OrderResult tables are removed. Data consistency is now possible through new article.price-history (ArticlePrice).
Balancing-workflow needs to be updated.
2009-01-29 01:57:51 +01:00
6ce6c2c75a
Replaced IndexController by Home- and FoodcoopController. Some reorganizing in groups/memberships-logic (moved memberships out of admin-namespace).
2009-01-15 12:14:01 +01:00
461dfa8531
Moved users into new admin-namespace and made the controller restful. Also moved some logic from the controller into the user-model (dry it up..).
2009-01-12 18:26:09 +01:00
30f3d199d3
Introduced invoices and deliveries. Integration (especially of deliveries) isn't finished yet.
2009-01-08 16:33:27 +01:00
9f8d0d28ac
Removed gettext and simplified_localization-plugin. L18n is now the appropriate module.
...
Upgraded to rails 2.2.2 and replaced complex foodsoft.rb-loader with simple
initializers/load_app_config.rb. Multiple foodcoops option is temporarly deactivated.
2009-01-06 15:45:19 +01:00
5b9a7e05df
Initial commit of foodsoft 2
2009-01-06 11:49:19 +01:00
Manuel Wiedenmann
Julius
Benjamin Meichsner
wvengen
Benjamin Meichsner
sandoz