Benjamin Meichsner
|
0d3564492b
|
Fixed bug in sorting articles in balancing view.
|
2013-03-12 18:54:51 +01:00 |
|
Benjamin Meichsner
|
c4376f35bf
|
Removed article from includes in as it does not work with acts_as_paranoid.
See also https://github.com/goncalossilva/rails3_acts_as_paranoid/issues/62.
Better we remove acts_as_paranoid and filter manually?
|
2013-03-12 12:50:56 +01:00 |
|
Benjamin Meichsner
|
6196bdae41
|
Added some eager loading for balancing new.
|
2013-03-12 12:38:08 +01:00 |
|
Julius
|
0e1bd5c75e
|
Improve (AJAX) deletion of StockArticles
|
2013-02-25 11:12:28 +01:00 |
|
Julius
|
5dc3fc30ad
|
Revert 099e2b9b06
|
2013-02-25 10:29:47 +01:00 |
|
Julius
|
8f15cfb446
|
Revert 396a47b6af
|
2013-02-25 10:13:44 +01:00 |
|
Julius
|
ccf0d010b4
|
Apply AJAX for deleting a StockArticle
|
2013-02-25 10:02:21 +01:00 |
|
Julius
|
a511da9ae3
|
Prevent stock_articles from appearing in supplier article index
|
2013-01-30 21:21:49 +01:00 |
|
Julius
|
396a47b6af
|
Improve stock_article_selections
|
2013-01-28 20:46:35 +01:00 |
|
Julius
|
ce0300df43
|
Fix order.created_by
|
2013-01-12 16:24:13 +01:00 |
|
Julius
|
099e2b9b06
|
Add stock_article_selection (deleting multiple stock articles at once)
|
2013-01-12 16:14:06 +01:00 |
|
benni
|
0364562273
|
Fixed return_to when authorization gets lost.
|
2012-12-30 16:34:01 +01:00 |
|
benni
|
349cadd5e9
|
Renabled mail delivering in invites and login contrller.
|
2012-12-30 16:11:35 +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
|
2c0fe08be6
|
Replaced delayed_job with resque. See README_DEVEL
|
2012-12-23 17:38:04 +01:00 |
|
benni
|
807d476e44
|
Fixed missing scoping by ordergroup in financial index.
|
2012-12-22 14:23:58 +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
|
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
|
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 |
|
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
|
c17ff281c3
|
Save and display creator of Order
|
2012-11-12 14:24:49 +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
|
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
|
552c553b77
|
Fixed admin, orders, wiki views. Converted all erb to haml.
|
2012-10-15 21:19:17 +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
|
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
|
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
|
2860a3ca44
|
Fixed authentication when User is deleted during session.
|
2012-08-24 15:20:58 +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 |
|