wvengen
|
0bb080526a
|
Merge remote-tracking branch 'bennibu/rails3' into rails3
Conflicts:
app/controllers/login_controller.rb
app/models/message.rb
app/views/sessions/new.html.haml
|
2013-04-04 00:29:50 +02:00 |
|
wvengen
|
e1f5969719
|
use short form plus title for unit quantity
|
2013-04-04 00:24:14 +02:00 |
|
Benjamin Meichsner
|
915e1b9e79
|
Fixed bug in reset password error handling.
|
2013-03-27 22:12:46 +01:00 |
|
wvengen
|
aabeb1a332
|
finish articles i18n
|
2013-03-22 00:20:37 +01:00 |
|
wvengen
|
7af796c09c
|
Merge remote-tracking branch 'bennibu/rails3' into rails3
Conflicts:
app/controllers/admin/ordergroups_controller.rb
app/controllers/finance/balancing_controller.rb
app/controllers/suppliers_controller.rb
app/views/articles/_article.html.haml
app/views/finance/balancing/_summary.haml
app/views/finance/balancing/new.html.haml
app/views/group_orders/_form.html.haml
app/views/home/_apple_bar.html.haml
app/views/suppliers/index.haml
|
2013-03-21 22:08:09 +01:00 |
|
Benjamin Meichsner
|
22550029b3
|
Added missing ajax support for messages index. Fixed #101
|
2013-03-20 23:31:13 +01:00 |
|
Benjamin Meichsner
|
931bb1d7ca
|
Merge branch 'rails3' of github.com:bennibu/foodsoft into rails3
|
2013-03-17 20:03:18 +01:00 |
|
Benjamin Meichsner
|
6745b79bb9
|
Allow importing articles again, when article was deleted before.
|
2013-03-17 20:02:14 +01:00 |
|
bennibu
|
033d3459a0
|
Merge pull request #98 from balkansalat/rails3-stock-taking-article-name
Prevent article name from being truncated in StockTaking form
|
2013-03-17 11:41:32 -07:00 |
|
Benjamin Meichsner
|
dd0bd0ad7e
|
Fixed updating order article in stockit balancing.
|
2013-03-17 18:33:04 +01:00 |
|
Benjamin Meichsner
|
3a9ec5a3dd
|
Fixed wiki site-map, when there is no homepage.
|
2013-03-17 17:57:35 +01:00 |
|
Benjamin Meichsner
|
329c451774
|
Fixed articles sync view.
|
2013-03-17 17:47:37 +01:00 |
|
Benjamin Meichsner
|
c05b3e0e19
|
Balancing: Do not update oder summary automaticly when changing group orders.
|
2013-03-17 15:47:50 +01:00 |
|
Benjamin Meichsner
|
07581b7ecf
|
Removed acts_as_paranoid. Implemented own version.
|
2013-03-16 17:57:38 +01:00 |
|
Julius
|
396e220369
|
Prevent article names from being truncated in StockTaking form
|
2013-03-14 22:30:22 +01:00 |
|
Benjamin Meichsner
|
8bafb3f4b2
|
Show supplier name for articles in stockit order.
|
2013-03-12 19:08:18 +01:00 |
|
Benjamin Meichsner
|
6196bdae41
|
Added some eager loading for balancing new.
|
2013-03-12 12:38:08 +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 |
|
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 |
|
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 |
|
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 |
|
wvengen
|
8043fd2164
|
finish foodcoop i18n + controller + model
|
2013-02-22 00:19:22 +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
|
734179a2bd
|
clarify group_orders i18n
|
2013-02-12 00:06:23 +01:00 |
|
wvengen
|
20533a5163
|
fix orders i18n
|
2013-02-11 15:34:31 +01:00 |
|
wvengen
|
a0a974b9ce
|
finish stockit i18n + controllers + model
|
2013-02-11 11:19:26 +01:00 |
|
Manuel Wiedenmann
|
0065c44b74
|
i18n finance ordergroups
|
2013-02-11 10:21:39 +07:00 |
|
Manuel Wiedenmann
|
d2cd5b2b02
|
i18n group order articles
|
2013-02-11 10:21:39 +07:00 |
|
Manuel Wiedenmann
|
640e9799aa
|
i18n financial_transactions + controller
|
2013-02-11 10:21:39 +07:00 |
|
Manuel Wiedenmann
|
8be93c33f8
|
i18n finance + controller
|
2013-02-10 15:05:31 +07:00 |
|
Manuel Wiedenmann
|
2d58054d1c
|
added order for interpolation
|
2013-02-10 15:05:31 +07:00 |
|
wvengen
|
22b3f3a491
|
fix bug in javascript i18n
|
2013-02-09 10:19:48 +01:00 |
|
wvengen
|
36b18bcfbd
|
finish messages i18n + controller + model
|
2013-02-09 10:18:52 +01:00 |
|
Manuel Wiedenmann
|
5941bbbf4f
|
i18n feedback + controller
|
2013-02-09 13:01:44 +07:00 |
|
wvengen
|
8d899581bd
|
finish group_orders i18n + controller
|
2013-02-09 02:01:31 +01:00 |
|
wvengen
|
28c66642f5
|
finish shared i18n
|
2013-02-08 19:16:06 +01:00 |
|
wvengen
|
e06524ca37
|
finish ordergroups and orders i18n + controller
|
2013-02-08 01:52:20 +01:00 |
|
wvengen
|
eb1e02015e
|
finish suppliers i18n
|
2013-02-08 00:11:58 +01:00 |
|
wvengen
|
de730808e7
|
finish mailer i18n
|
2013-02-06 00:50:59 +01:00 |
|
wvengen
|
b12a906a74
|
finish login i18n + controller
|
2013-02-05 12:54:55 +01:00 |
|
wvengen
|
39812bef99
|
finish layouts i18n, use help url from config, use html language from locale
|
2013-02-05 12:11:29 +01:00 |
|