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 |
|
wvengen
|
5b53749fe6
|
fix small format bug in template
|
2013-02-04 13:13:04 +01:00 |
|
wvengen
|
034f6a8f5c
|
finish invites i18n
|
2013-02-04 12:59:04 +01:00 |
|
wvengen
|
0c09696b2c
|
finish sessions i18n
|
2013-02-04 01:46:07 +01:00 |
|
wvengen
|
2b11549d33
|
finished home i18n
|
2013-02-04 00:46:22 +01:00 |
|
Manuel Wiedenmann
|
64b3d7e17d
|
finished admin/users i18n + dry the admin i18n
|
2013-02-04 01:38:18 +07:00 |
|
Manuel Wiedenmann
|
75c9338fd9
|
finished admin/workgroups i18n
|
2013-02-04 00:36:03 +07:00 |
|
Manuel Wiedenmann
|
e949257912
|
finished admin/ordergroups i18n
|
2013-02-04 00:10:11 +07:00 |
|
Manuel Wiedenmann
|
42c97520a1
|
started with admin views
|
2013-02-03 23:16:42 +07:00 |
|
wvengen
|
e0b781fca6
|
split locales into directory, and load from there
|
2013-02-01 17:56:34 +01:00 |
|
Julius
|
396a47b6af
|
Improve stock_article_selections
|
2013-01-28 20:46:35 +01:00 |
|
Julius
|
524819b86f
|
Merge branch 'rails3' of http://github.com/bennibu/foodsoft into rails3
Conflicts:
app/helpers/application_helper.rb
|
2013-01-27 22:01:53 +01:00 |
Benjamin Meichsner
|
04b611a080
|
Temporairly deactivated helper in new delivery form.
|
2013-01-26 15:57:29 +01:00 |
|
Benjamin Meichsner
|
2a66d37c3a
|
Fixed wrong start balance in new group order.
|
2013-01-26 15:17:56 +01:00 |
|
Julius
|
099e2b9b06
|
Add stock_article_selection (deleting multiple stock articles at once)
|
2013-01-12 16:14:06 +01:00 |
|
benni
|
f6ff422405
|
Fixed missing line breaks in haml email templates.
|
2012-12-30 16:24:36 +01:00 |
|
benni
|
db07b28b1c
|
Fixed bug in accessing foodsoft config.
|
2012-12-28 13:28:03 +01:00 |
|
benni
|
2c0fe08be6
|
Replaced delayed_job with resque. See README_DEVEL
|
2012-12-23 17:38:04 +01:00 |
|
benni
|
b9138efa79
|
Fixed floating error in group_order new.
|
2012-12-22 14:42:19 +01:00 |
|
benni
|
d954279d6a
|
Show accept/reject button in task show view.
|
2012-12-22 14:29:59 +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 |