Julius
|
edaf91b029
|
Inline before_filter of stock_changes_controller
|
2013-07-12 22:19:11 +02:00 |
|
Julius
|
620686fa46
|
Merge branch 'master' into stock_article_quantity_history
|
2013-07-11 19:23:52 +02:00 |
|
Julius
|
54afbb7af5
|
Add locales for stock_changes index
|
2013-07-11 19:21:56 +02:00 |
|
Julius
|
7c27017306
|
Link delivery/stock_taking/order in stock_changes index
|
2013-07-11 18:37:55 +02:00 |
|
Julius
|
ffcb9490c9
|
Make stock_changes readonly in index view
|
2013-07-11 18:20:24 +02:00 |
|
wvengen
|
2ef7e58b0b
|
Merge pull request #146 from foodcoop-adam/add-only-undeleted-articles
only add undeleted articles in balancing screen
|
2013-07-10 13:05:50 -07:00 |
|
wvengen
|
33d3b9c466
|
merge branch minimum_balance into master (closes #133)
|
2013-07-10 22:03:57 +02:00 |
|
Julius
|
de9541a0df
|
Ask how to fetch readonly associations
|
2013-07-09 21:49:39 +02:00 |
|
Julius
|
ef62a18ac9
|
Add StockChanges index
|
2013-07-09 21:46:04 +02:00 |
|
wvengen
|
1eeec23c80
|
only add undeleted articles in balancing screen
|
2013-07-08 02:31:54 +02:00 |
|
wvengen
|
d397132f7b
|
be safe even with locale string
|
2013-07-07 02:31:42 +02:00 |
|
wvengen
|
8080cd6b7e
|
pass locale to datepicker, use gem for that
|
2013-07-07 01:47:22 +02:00 |
|
wvengen
|
76645ebd12
|
add default tax percentage to app_config
|
2013-07-06 23:11:50 +02:00 |
|
wvengen
|
3da27734c7
|
allow import of files with categories that do not exist (map to no category)
|
2013-07-06 17:49:10 +02:00 |
|
wvengen
|
a6688b3b43
|
import manufacturer and origin too (closes #140)
|
2013-07-06 17:48:40 +02:00 |
|
wvengen
|
d7540bdd20
|
fix i18n key
|
2013-06-30 13:08:13 +02:00 |
|
wvengen
|
9ef208fa13
|
small translation changes
|
2013-06-29 03:02:05 +02:00 |
|
wvengen
|
b807e9d059
|
beautify order mail
|
2013-06-29 02:54:00 +02:00 |
|
wvengen
|
9b0db5bb0b
|
translation updates: capitalisations, order_result mail
|
2013-06-29 02:46:20 +02:00 |
|
wvengen
|
f11d10ff07
|
update order result mail (fixing html quoting of quotes)
|
2013-06-29 02:22:01 +02:00 |
|
wvengen
|
9d406bbc08
|
make resque worker function on non-multi-coop-installs too
|
2013-06-29 01:48:57 +02:00 |
|
wvengen
|
befe89d4ef
|
fix tolerance display in group_order form
|
2013-06-26 01:36:44 +02:00 |
|
wvengen
|
c31e864c73
|
internationalise currency in order screen
|
2013-06-26 01:17:04 +02:00 |
|
wvengen
|
dddd11d8f0
|
do not autocapitalize or autocorrect on login fields to avoid login errors on iPad/iPhone
|
2013-06-26 00:42:09 +02:00 |
|
wvengen
|
91c8be6b6c
|
make tests work again
|
2013-06-25 13:05:25 +02:00 |
|
wvengen
|
e450cf404e
|
harmonize order cycle translations
|
2013-06-25 00:16:30 +02:00 |
|
wvengen
|
7dbe1363ed
|
fix adding article balancing failing with 'already taken' (closes foodcoops/foodsoft#125)
|
2013-06-24 13:32:07 +02:00 |
|
wvengen
|
cab6ada8b8
|
small invoice i18n cleanup/refactoring
|
2013-06-21 14:24:05 +02:00 |
|
wvengen
|
c5c4b1f93f
|
small translation updates
|
2013-06-21 13:54:36 +02:00 |
|
wvengen
|
906093b3ce
|
small i18n fixes and clarifications
|
2013-06-21 13:49:34 +02:00 |
|
wvengen
|
3cfd8b2d44
|
fix i18n key
|
2013-06-21 13:25:52 +02:00 |
|
wvengen
|
931b3bef5e
|
fix touch event twice bug (complements ac62dcce9d )
|
2013-06-20 01:20:13 +02:00 |
|
wvengen
|
1e984df3aa
|
more beautiful ordergroup edit form
|
2013-06-18 01:35:12 +02:00 |
|
wvengen
|
f47237ebe0
|
update link
|
2013-06-17 03:13:42 +02:00 |
|
wvengen
|
9523eba65f
|
add badges
|
2013-06-17 02:59:36 +02:00 |
|
Benjamin Meichsner
|
eee5d4a896
|
Fixed indentation bug in sync template.
|
2013-06-16 15:10:50 +02:00 |
|
Benjamin Meichsner
|
8c4da55561
|
Merge branch 'show-percent-sign' of git://github.com/foodcoop-rostock/foodsoft into foodcoop-rostock-show-percent-sign
|
2013-06-16 14:55:48 +02:00 |
|
wvengen
|
713c030213
|
i18n and translate missing entry
|
2013-06-15 18:43:42 +02:00 |
|
wvengen
|
8c08de9eae
|
translation fixes, clarifications and additions
|
2013-06-15 17:59:15 +02:00 |
|
wvengen
|
18f067ea60
|
make localeapp updates work in production environment too
|
2013-06-14 03:10:32 +02:00 |
|
wvengen
|
2f31d1a5f8
|
add heroku deploy script
|
2013-06-14 02:42:13 +02:00 |
|
wvengen
|
9b05923d7c
|
Merge branch 'touchscreens'
|
2013-06-14 01:44:04 +02:00 |
|
wvengen
|
ac62dcce9d
|
make touch device events work on buttons (closes foodcoop-rostock/foodsoft#34, closes foodcoops/foodsoft#104)
|
2013-06-14 01:42:47 +02:00 |
|
wvengen
|
8141ad0233
|
remove duplicate code
|
2013-06-14 01:39:30 +02:00 |
|
wvengen
|
13f2c128c6
|
do not use string values for integers (closes foodcoops/foodsoft#128)
|
2013-06-14 01:36:41 +02:00 |
|
wvengen
|
add4afd172
|
make touch device events work on buttons (closes foodcoop-rostock/foodsoft#34, closes foodcoops/foodsoft#104)
|
2013-06-13 11:59:50 +02:00 |
|
wvengen
|
ca9841dd02
|
fixup translation string order for localeapp roundtrip
|
2013-06-13 00:09:04 +02:00 |
|
wvengen
|
e3e1b5a1b3
|
add start of Dutch translation
|
2013-06-13 00:08:15 +02:00 |
|
wvengen
|
d63e1f8066
|
translation updates previously missed
|
2013-06-12 23:20:02 +02:00 |
|
wvengen
|
848ef67e40
|
update documentation urls in config after repository move
|
2013-06-12 22:57:44 +02:00 |
|