Benjamin Meichsner
|
c18fb20115
|
Ensure to get also deleted entries in belongs_to assoc.
|
2013-03-10 19:39:59 +01:00 |
|
Benjamin Meichsner
|
b0e12d177e
|
Fixed editing an order and take care of group_orders.
|
2013-03-10 19:22:26 +01:00 |
|
Benjamin Meichsner
|
762d529894
|
Added info link for apple restriction feature.
|
2013-03-09 18:14:53 +01:00 |
|
Benjamin Meichsner
|
50873addf8
|
Fixed deleting of articles. Added missing id.
|
2013-03-09 16:46:33 +01:00 |
|
Benjamin Meichsner
|
1cbf663b39
|
Merge branch 'rails3' of github.com:bennibu/foodsoft into rails3
|
2013-03-09 16:31:00 +01:00 |
|
Benjamin Meichsner
|
2f109c376d
|
Fixed bug when submitting huge forms. (stock taking etc)
|
2013-03-09 16:14:20 +01:00 |
|
wvengen
|
19527f8425
|
fix some link handling in i18n (using html_safe)
|
2013-03-09 00:48:52 +01:00 |
|
wvengen
|
cb537bc11c
|
start articles i18n
|
2013-03-09 00:40:07 +01:00 |
|
wvengen
|
b81f414ae5
|
finish finance/order_articles i18n + en translation
|
2013-03-08 23:35:50 +01:00 |
|
Robert Waltemath
|
63d8a3a1a6
|
Do not exclude ordered articles (with zero quantity) when editing orders.
|
2013-03-07 20:43:02 +01:00 |
|
Robert Waltemath
|
93a99c45d8
|
Revert "Do not subtract articles in open orders when calculating quantity."
This reverts commit 6bf3b241e6.
|
2013-03-07 20:39:35 +01:00 |
|
Robert Waltemath
|
6bf3b241e6
|
Do not subtract articles in open orders when calculating quantity.
|
2013-03-06 14:19:06 +01:00 |
|
wvengen
|
c9b2d01fa5
|
i18n last merge
|
2013-03-06 01:24:57 +01:00 |
|
wvengen
|
2d382df1f1
|
Merge remote-tracking branch 'bennibu/rails3' into rails3
Conflicts:
app/assets/stylesheets/bootstrap_and_overrides.css.less
app/controllers/stockit_controller.rb
app/models/ordergroup.rb
app/models/workgroup.rb
app/views/stockit/index.html.haml
|
2013-03-06 01:01:12 +01:00 |
|
wvengen
|
2b03a15a9a
|
finish finance invoice i18n and en translation
|
2013-02-27 12:31:01 +01:00 |
|
wvengen
|
d3d4bf1e2b
|
add en translation of finance
|
2013-02-27 12:11:48 +01:00 |
|
wvengen
|
d9949681a2
|
localize invite model
|
2013-02-27 11:59:03 +01:00 |
|
JuliusR
|
5032fbb63d
|
Merge pull request #30 from bennibu/rails3
Update
|
2013-02-27 00:06:29 -08:00 |
|
Benjamin Meichsner
|
c4ce5dea98
|
Fixed bug when submitting huge forms. (stock taking etc)
|
2013-02-26 10:59:05 +01:00 |
|
bennibu
|
c0c2954f92
|
Merge pull request #92 from balkansalat/rails3-ajaxArticleDelete
Delete StockArticles without reloading; small fixes, ignore secret_token initializer.
|
2013-02-26 01:41:42 -08:00 |
|
Benjamin Meichsner
|
7e0a4acf59
|
No need to track specific ruby version.
Already defined in Gemfile.
|
2013-02-26 10:05:37 +01:00 |
|
Julius
|
467b53c009
|
Merge branch 'rails3' of http://github.com/bennibu/foodsoft into rails3-ajaxArticleDelete
|
2013-02-25 11:14:48 +01:00 |
|
Julius
|
0e1bd5c75e
|
Improve (AJAX) deletion of StockArticles
|
2013-02-25 11:12:28 +01:00 |
|
Benjamin Meichsner
|
2d1ae0ad97
|
Fixed bad syntax (from already dropped meta_where gem).
Thanks to wvengen, closed #91
Conflicts:
app/models/workgroup.rb
|
2013-02-25 10:51:01 +01:00 |
|
Benjamin Meichsner
|
3fb5c313ee
|
Show usefull error message for uniqueness_of_name with acts_as_paranoid.
Fixed #88
Conflicts:
app/models/ordergroup.rb
|
2013-02-25 10:49:55 +01:00 |
|
wvengen
|
0b66fe6d62
|
add en translation foodcop, navigation
|
2013-02-25 10:36:15 +01:00 |
|
wvengen
|
ae727576dd
|
en translation update
|
2013-02-25 10:35:14 +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 |
|
Benjamin Meichsner
|
6685012a3e
|
Fixed bad syntax (from already dropped meta_where gem).
Thanks to wvengen, closed #91
|
2013-02-24 23:56:56 +01:00 |
|
Benjamin Meichsner
|
82178161fa
|
Show usefull error message for uniqueness_of_name with acts_as_paranoid.
Fixed #88
|
2013-02-24 23:26:16 +01:00 |
|
Benjamin Meichsner
|
b308442b3c
|
Also validate article price attributes.
Fixed adding articles with unit_quantity = 0, what causes an error in ordering page. Fixed #86
|
2013-02-24 19:59:29 +01:00 |
|
Benjamin Meichsner
|
877a55a614
|
Avoid sending mails twice via concurrent background processes.
|
2013-02-24 19:15:54 +01:00 |
|
wvengen
|
c8c269e66a
|
update en translation after small additions
|
2013-02-22 00:51:58 +01:00 |
|
wvengen
|
569cdce2db
|
finish finance controller i18n
|
2013-02-22 00:44:39 +01:00 |
|
wvengen
|
922a6f3a2a
|
finish navigation i18n
|
2013-02-22 00:37:17 +01:00 |
|
wvengen
|
8043fd2164
|
finish foodcoop i18n + controller + model
|
2013-02-22 00:19:22 +01:00 |
|
Benjamin Meichsner
|
fe632abf2c
|
Fixed missing recipients when Message.send_emails.
|
2013-02-17 22:04:08 +01:00 |
|
Benjamin Meichsner
|
7ca561a17a
|
Installed rdoc to avoid messages in rake tasks.
|
2013-02-17 22:01:48 +01:00 |
|
Benjamin Meichsner
|
16ba5fa0ca
|
Comment out rake/rdoctask due to rake update.
|
2013-02-17 21:29:48 +01:00 |
|
Benjamin Meichsner
|
35dbb58e67
|
Damn'it. Forget to update environment file after rails update.
|
2013-02-17 21:19:03 +01:00 |
|
Benjamin Meichsner
|
6a0bab58f1
|
Temporairly deactivated ruby spec in Gemfile.
Background. Our bundler is too old on the production server and
I don't want to break other applications.
|
2013-02-17 21:01:08 +01:00 |
|
Benjamin Meichsner
|
ccdf3c0bf1
|
Updated rails to 2.3.17.
|
2013-02-17 21:00:12 +01:00 |
|
wvengen
|
c69a559dc4
|
add en translation stock_takings
|
2013-02-13 23:17:28 +01:00 |
|
wvengen
|
c693f697ff
|
workgroups i18n
|
2013-02-13 01:34:58 +01:00 |
|
wvengen
|
02f04be6e8
|
finish stock_takings i18n + controller
|
2013-02-13 01:20:20 +01:00 |
|
wvengen
|
1cb933240b
|
improve translations
|
2013-02-13 00:53:36 +01:00 |
|
wvengen
|
b59244783e
|
initial en translation of simple_form, stockit
|
2013-02-13 00:39:21 +01:00 |
|
wvengen
|
d88a9757ca
|
improve translations
|
2013-02-12 00:25:54 +01:00 |
|