wvengen
|
60826ceedc
|
allow to edit GroupOrderArticle result from orders screen
Conflicts:
app/assets/javascripts/application.js
|
2014-02-10 16:03:08 +01:00 |
|
wvengen
|
f9d2c20aaa
|
cleanup articles sorted in groups
|
2014-02-10 15:58:58 +01:00 |
|
wvengen
|
e88810e4a7
|
fix "Mysql2::Error: This connection is in use by" in spec for Rails 4
Conflicts:
Gemfile
Gemfile.lock
|
2014-02-10 15:58:52 +01:00 |
|
wvengen
|
2de4a2a3a0
|
Merge pull request #256 from wvengen/feature-partial_shared_sync
Small change to allow non-shared articles with shared suppliers
|
2014-02-07 11:24:33 +01:00 |
|
wvengen
|
c322545f85
|
fix i18n buglet
|
2014-02-06 10:15:20 +01:00 |
|
wvengen
|
6e0489b25f
|
Merge pull request #257 from wvengen/feature-touchclick
Better workaround for touch devices
|
2014-02-03 06:33:27 -08:00 |
|
wvengen
|
4bfd7fa6f8
|
fix database sync when value is nil
|
2014-02-03 15:32:53 +01:00 |
|
wvengen
|
d92f3f2298
|
deploy: persist changes to session_store iniitalizer [ci skip]
|
2014-02-03 10:53:22 +01:00 |
|
wvengen
|
84e02b795c
|
proper history line
|
2014-01-31 17:53:10 +01:00 |
|
wvengen
|
5e7925366d
|
allow to view stock orders too
|
2014-01-31 13:12:29 +01:00 |
|
wvengen
|
5aef8e445e
|
add html units history line
|
2014-01-31 13:08:20 +01:00 |
|
wvengen
|
3f12627aa4
|
Merge pull request #253 from wvengen/feature-cleaner_order_details
cleanup show order and add search
|
2014-01-29 08:44:31 -08:00 |
|
wvengen
|
3e79304c5a
|
typo
|
2014-01-27 14:58:39 +01:00 |
|
wvengen
|
381d5de0a3
|
Merge pull request #250 from wvengen/feature-deploy
deployment with Capistrano 3 (in progress)
|
2014-01-27 03:08:24 -08:00 |
|
wvengen
|
7ebb2459e0
|
make click work better on touch devices (closes foodcoops#104)
|
2014-01-25 15:19:50 +01:00 |
|
wvengen
|
23ee2ef0fb
|
Revert "make touch device events work on buttons (closes foodcoop-rostock/foodsoft#34, closes foodcoops/foodsoft#104)"
This reverts commit add4afd172 .
Conflicts:
app/assets/javascripts/application.js
|
2014-01-25 15:15:42 +01:00 |
|
wvengen
|
d08f120b27
|
show message when ignoring articles due to missing order number
|
2014-01-24 22:20:29 +01:00 |
|
wvengen
|
49e563af89
|
allow non-shared articles to be part of a shared supplier using a blank order number
|
2014-01-24 22:10:00 +01:00 |
|
wvengen
|
2b0d4b0ad7
|
fix deploy_to, and use stage
|
2014-01-21 09:46:18 +01:00 |
|
wvengen
|
8db516c5f0
|
Merge branch 'master' into feature-cleaner_order_details
Conflicts:
app/assets/stylesheets/bootstrap_and_overrides.css.less
|
2014-01-20 13:36:46 +01:00 |
|
wvengen
|
c5cc714f9b
|
add Dutch translation texts
|
2014-01-20 13:30:14 +01:00 |
|
wvengen
|
3b2d4dfd08
|
localeapp roundtrip
|
2014-01-20 12:59:57 +01:00 |
|
wvengen
|
9308096e96
|
Merge pull request #252 from wvengen/feature-fix_redirect_with_suburi
fix root redirect when using suburi
|
2014-01-20 03:13:25 -08:00 |
|
wvengen
|
6c0de3dc74
|
Merge remote-tracking branch 'foodcoop-rostock/fix-order-article-update'
Conflicts:
config/locales/de.yml
config/locales/en.yml
|
2014-01-20 12:12:00 +01:00 |
|
wvengen
|
8b4c292ea0
|
Merge pull request #222 from wvengen/feature-receive
New receive screen
|
2014-01-20 03:02:27 -08:00 |
|
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 |
|