wvengen
|
c25d4d3f4f
|
use ruby-units for unit parsing (closes foodcoops/foodsoft#200)
Conflicts:
Gemfile
Gemfile.lock
|
2014-05-13 17:01:25 +02:00 |
|
wvengen
|
48e9a3e4f5
|
add fax csv
|
2014-05-13 17:01:25 +02:00 |
|
wvengen
|
03585e272f
|
add configuration for default language
|
2014-05-13 17:01:25 +02:00 |
|
wvengen
|
3f032e5dd9
|
make apple points optional
a next step would be to move this to a plugin
|
2014-05-13 17:01:25 +02:00 |
|
wvengen
|
f71b78665e
|
allow 500 items per page
|
2014-05-13 17:01:24 +02:00 |
|
wvengen
|
0fa9bebac9
|
show supplier user-interface update
|
2014-05-13 17:01:24 +02:00 |
|
wvengen
|
0014435663
|
improved shared database import ui
|
2014-05-13 17:01:24 +02:00 |
|
wvengen
|
950480941a
|
expanded data-ignore-onchange support
|
2014-05-13 17:01:24 +02:00 |
|
wvengen
|
9214fff5a1
|
localeapp roundtrip (mostly formatting changes)
|
2014-03-15 17:17:25 +01:00 |
|
wvengen
|
bb9269f755
|
avoid word-wrap when showing currency
|
2014-03-15 16:40:53 +01:00 |
|
wvengen
|
8853b3efdb
|
fix sort order
|
2014-03-08 17:15:09 +01:00 |
|
wvengen
|
fccdaccb8d
|
fix initial deploy (return value) [ci skip]
|
2014-03-03 17:05:01 +01:00 |
|
wvengen
|
cd32f702b0
|
fix resque task user switching
|
2014-02-26 13:09:22 +01:00 |
|
wvengen
|
d9326dd984
|
allow plugins to override login redirection when authentication failed
|
2014-02-25 10:18:14 +01:00 |
|
wvengen
|
41aa05df68
|
Bumped new version: 4.0.0
|
2014-02-24 12:47:44 +01:00 |
|
wvengen
|
e5f8d2d425
|
make heroku work again
|
2014-02-24 12:46:28 +01:00 |
|
wvengen
|
ab514d7eb6
|
use encrypted cookies on new installations
|
2014-02-24 12:46:28 +01:00 |
|
wvengen
|
7841245795
|
migrate to Rails 4.0 (closes foodcoops#214)
Conflicts:
Gemfile.lock
|
2014-02-24 12:46:28 +01:00 |
|
wvengen
|
12d1221bfc
|
Bumped new version: 3.3.0
|
2014-02-24 12:42:46 +01:00 |
|
wvengen
|
f8fca4d630
|
fix order article add + test
|
2014-02-24 11:37:06 +01:00 |
|
wvengen
|
775137f7c0
|
bundle update
Forcing rails to version 3.2.17 because of CVE-2014-0081
Forcing net-ssh to version 2.7.0 because of https://github.com/net-ssh/net-ssh/issues/148
|
2014-02-19 16:54:58 +01:00 |
|
wvengen
|
346bf00b67
|
localeapp roundtrip (includes updated German translation)
|
2014-02-19 11:42:25 +01:00 |
|
wvengen
|
8fba40eba6
|
fix submit-onchange
|
2014-02-19 11:41:10 +01:00 |
|
wvengen
|
e61b3dc248
|
update Dutch translation
|
2014-02-15 12:38:05 +01:00 |
|
wvengen
|
286c96196c
|
localeapp roundtrip
|
2014-02-15 12:37:01 +01:00 |
|
wvengen
|
a4dca6ae11
|
show more info in add article dialog
|
2014-02-15 00:18:49 +01:00 |
|
wvengen
|
2c85618284
|
fix balancing and matrix since receive
|
2014-02-13 16:06:45 +01:00 |
wvengen
|
0128f72103
|
Merge pull request #255 from wvengen/feature-orders_group_edit
Edit order_group_article result in orders screen
|
2014-02-12 11:49:48 +01:00 |
|
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 |