wvengen
|
65041c78c5
|
allow to preselect order view
|
2014-01-17 15:04:03 +01:00 |
|
wvengen
|
1129cf4094
|
include comments link
|
2014-01-17 14:32:12 +01:00 |
|
wvengen
|
5b6d1a66a6
|
complete show order i18n
Conflicts:
app/helpers/orders_helper.rb
|
2014-01-17 14:25:57 +01:00 |
|
wvengen
|
42d622d1b2
|
cleanup orders and add search
Conflicts:
app/assets/stylesheets/bootstrap_and_overrides.css.less
app/views/orders/_articles.html.haml
app/views/orders/show.html.haml
|
2014-01-17 13:41:38 +01:00 |
|
wvengen
|
cc1ba606c6
|
update deployment instructions [ci skip]
|
2014-01-17 09:58:06 +01:00 |
|
wvengen
|
d496c452e6
|
allow to enable/disable plugins in deploy
|
2014-01-15 21:41:54 +01:00 |
|
wvengen
|
46b36c42bd
|
simplify initial database setup deployment rules
|
2014-01-15 21:40:51 +01:00 |
|
wvengen
|
af3761fcf5
|
do not run resque verbose by default
|
2014-01-15 17:28:20 +01:00 |
|
wvengen
|
151f851799
|
do not require authentication for root redirect
|
2014-01-15 16:33:13 +01:00 |
|
wvengen
|
4e68d3b7f5
|
remove dysfunctional deployment hook
|
2014-01-15 15:50:36 +01:00 |
|
wvengen
|
ecb2f2a015
|
fix root redirect when using suburi
|
2014-01-15 15:43:29 +01:00 |
|
wvengen
|
ca234f0b70
|
deployment with Capistrano 3 (affects foodcoops#148)
|
2014-01-15 13:58:24 +01:00 |
|
wvengen
|
bab28d2770
|
i18n update
|
2014-01-13 23:23:37 +01:00 |
|
wvengen
|
b2f032ac8e
|
fix bootstrap menu on mobile [ci skip]
|
2014-01-13 14:45:48 +01:00 |
|
wvengen
|
f0b65bd738
|
Merge pull request #247 from wvengen/feature-center_rows_vertically
Center table rows vertically
|
2014-01-13 03:22:20 -08:00 |
|
wvengen
|
8f0e3af2ba
|
Merge pull request #221 from wvengen/feature-fix_float_display
Fix float display
|
2014-01-13 03:21:17 -08:00 |
|
wvengen
|
8760d87a76
|
fix receive notice
|
2014-01-13 11:48:43 +01:00 |
|
wvengen
|
3b2d50b47d
|
make receive delta work when unit_quantity changes
|
2014-01-13 11:37:18 +01:00 |
|
wvengen
|
45e529b008
|
revert i18n attributes pluralisation
until plataformatec/simple_form#974 has a solution
(reverts parts of ce17bf33e0 and 9db8cb72df)
|
2014-01-11 16:30:17 +01:00 |
|
wvengen
|
cb3e2f7ca0
|
Merge branch 'master' into feature-receive
Conflicts:
config/locales/de.yml
|
2014-01-11 15:56:33 +01:00 |
|
wvengen
|
c0dfb88c4e
|
Merge pull request #6 from foodcoop-rostock/feature-receive-en-de
Synchronize German and English locales
|
2014-01-11 06:54:51 -08:00 |
|
Julius
|
9db8cb72df
|
Synchronize German and English locales
|
2014-01-10 20:50:58 +01:00 |
|
wvengen
|
063ec61753
|
localeapp roundtrip
|
2014-01-10 00:00:57 +01:00 |
|
wvengen
|
b30b424540
|
Merge branch 'master' into feature-receive
Conflicts:
app/helpers/finance/order_articles_helper.rb
|
2014-01-09 18:42:29 +01:00 |
|
wvengen
|
0b4cfde1b2
|
put footer below body, now that is allowed in html5
|
2014-01-09 14:47:05 +01:00 |
|
wvengen
|
dcb17e04b5
|
do not show article hint in order view after all, since "old price" is
actually the price of the current article, which will probably be
different in the future
|
2014-01-09 13:24:40 +01:00 |
|
wvengen
|
2b97ca050a
|
i18n oops
|
2014-01-09 13:22:32 +01:00 |
|
wvengen
|
bea2706005
|
fix receive dynamic update (complements 90c81de872)
|
2014-01-09 13:19:27 +01:00 |
|
wvengen
|
124341c7d6
|
receive helper and i18n cleanup
|
2014-01-09 13:01:10 +01:00 |
|
wvengen
|
90c81de872
|
update receive delta column + responsive css
|
2014-01-09 12:20:54 +01:00 |
|
wvengen
|
56bd527a8b
|
keep white input background with package class [ci skip]
|
2014-01-09 10:51:54 +01:00 |
|
wvengen
|
5a7c9b817c
|
fix receive js for document updates [ci skip]
|
2014-01-09 10:14:05 +01:00 |
|
wvengen
|
b331d9a2a9
|
better css responsiveness [ci skip]
|
2014-01-08 19:58:51 +01:00 |
|
wvengen
|
65e79d7e1b
|
small receive usability changes
|
2014-01-08 19:28:39 +01:00 |
|
wvengen
|
d1c3c83ed7
|
use plural in table headings by default
|
2014-01-08 18:23:34 +01:00 |
|
wvengen
|
ffdfa63d86
|
add coveralls badge to README
|
2014-01-08 14:45:10 +01:00 |
|
wvengen
|
abb3770d08
|
bundle update
|
2014-01-08 14:39:17 +01:00 |
|
wvengen
|
bdb9499535
|
fix broken update password flow
|
2014-01-08 14:09:28 +01:00 |
|
wvengen
|
0e8e93204a
|
Merge pull request #240 from foodcoop-rostock/fix-order-article-helper-undeleted
Offer _undeleted_ StockArticles for new OrderArticle only
|
2014-01-08 04:42:55 -08:00 |
|
wvengen
|
ce17bf33e0
|
complete and improve receive i18n
|
2014-01-08 13:39:49 +01:00 |
|
wvengen
|
8f14ab31f3
|
cleanup and expand receive integration test
|
2014-01-08 13:07:11 +01:00 |
|
wvengen
|
6e60f94484
|
small receive-related i18n updates
|
2014-01-08 12:52:29 +01:00 |
|
wvengen
|
ccdb1e8add
|
Merge remote-tracking branch 'foodcoop-rostock/feature-receive-i18n' into feature-receive
|
2014-01-08 12:35:44 +01:00 |
|
wvengen
|
d01d1bc496
|
add integration tests for receive
|
2014-01-08 11:52:45 +01:00 |
|
wvengen
|
dcc3d21b4d
|
center table rows vertically [ci skip]
|
2014-01-08 10:32:30 +01:00 |
|
Julius
|
563993fffa
|
Complete I18n of current receive screen
|
2014-01-08 00:06:50 +01:00 |
|
Julius
|
d7c771d10a
|
Continue I18n of receive screen
|
2014-01-06 23:48:39 +01:00 |
|
wvengen
|
69a29b8296
|
Merge pull request #245 from fsmanuel/rss_feed + 1
|
2014-01-06 13:55:32 +01:00 |
|
wvengen
|
fe111a1422
|
require gem in plugin
|
2014-01-06 13:54:56 +01:00 |
|
Julius
|
dc92de771e
|
Comment on ArticlePrices without Article association
|
2014-01-04 21:39:11 +01:00 |
|