wvengen
|
668ba1e5d6
|
add webstats_tracking_code to configuration screen (closes foodcoops#311)
|
2014-09-22 09:36:36 +02:00 |
|
Benjamin Meichsner
|
81d22e6077
|
Allow adding tracking code for webstatistics service. E.g. piwik.
|
2014-09-22 09:15:47 +02:00 |
|
Benjamin Meichsner
|
0231df9d5b
|
Delete memberships when deleting associated groups.
|
2014-09-21 12:47:58 +02:00 |
|
wvengen
|
418a8b5806
|
fix i18n issues + localeapp roundtrip
thanks, i18n-tasks!
|
2014-09-15 13:52:35 +02:00 |
|
wvengen
|
cf360335ee
|
fix articles with zero quantity showing
complements 8913ad615c
|
2014-09-11 13:47:03 +02:00 |
|
wvengen
|
ee1874a15f
|
fix upload error
|
2014-09-10 14:42:44 +02:00 |
|
wvengen
|
f18cc367ae
|
workaround for CVE-2014-4920
|
2014-09-10 13:27:45 +02:00 |
|
wvengen
|
a699f95903
|
fix fax documents for stock orders (closes foodcoops#79)
|
2014-09-02 15:47:01 +02:00 |
|
wvengen
|
1a3b690757
|
add custom css to config screen
|
2014-09-02 15:02:26 +02:00 |
|
wvengen
|
cf680d3410
|
add page break to config screen
|
2014-09-02 15:02:26 +02:00 |
|
wvengen
|
0f7dc37015
|
fix config value override
Conflicts:
app/helpers/admin/configs_helper.rb
|
2014-09-02 15:02:25 +02:00 |
|
wvengen
|
68ccc19c70
|
allow to configure currency (closes foodcoops#258)
|
2014-09-02 15:02:25 +02:00 |
|
wvengen
|
3fee071a10
|
specify timezone in configuration (closes foodcoops#282)
|
2014-09-02 14:21:33 +02:00 |
|
wvengen
|
6115979bae
|
allow protected keys to be set/unset + config_db tests
|
2014-09-02 14:21:32 +02:00 |
|
wvengen
|
9beaac2627
|
allow to specify (un)checked values for config boolean
Conflicts:
app/helpers/admin/configs_helper.rb
|
2014-09-02 14:21:32 +02:00 |
|
wvengen
|
429e111db4
|
hide protected keys from config
|
2014-09-02 14:21:32 +02:00 |
|
wvengen
|
7b000c39eb
|
add foodcoop configuration screen
|
2014-09-02 14:21:32 +02:00 |
|
wvengen
|
b5ddbcae21
|
make custom css more robust
|
2014-09-02 14:15:59 +02:00 |
|
wvengen
|
97dc090e4d
|
Merge pull request #306 from wvengen/feature-styling
allow foodcoops to add custom css
|
2014-09-02 13:59:18 +02:00 |
|
wvengen
|
19630e8607
|
allow foodcoops to add custom css
|
2014-09-02 13:35:45 +02:00 |
|
wvengen
|
8473f16091
|
query performance improvements
|
2014-09-02 12:58:32 +02:00 |
|
wvengen
|
647b7f0430
|
allow to synchronize all articles of a shared supplier
|
2014-09-02 12:58:31 +02:00 |
|
wvengen
|
3918e22214
|
synchronize price on two decimal places only
|
2014-09-02 12:58:31 +02:00 |
|
wvengen
|
d9c61b2db3
|
allow to match category names on import/sync
|
2014-09-02 12:58:31 +02:00 |
|
wvengen
|
16b78ba2a0
|
fix shared import paging without query
|
2014-09-02 12:58:31 +02:00 |
|
wvengen
|
d906a7342f
|
workaround receive error with many articles
|
2014-09-02 12:35:57 +02:00 |
|
wvengen
|
63d52db91b
|
more sensible mailer option defaults
Conflicts:
app/mailers/base_mailer.rb
config/app_config.yml.SAMPLE
spec/app_config.yml
|
2014-09-02 12:35:57 +02:00 |
|
wvengen
|
ecf5601023
|
make missing_units get correct details for closed orders
|
2014-09-01 12:25:42 +02:00 |
|
wvengen
|
0b08d461fa
|
remove html escaping from all text mails
|
2014-09-01 11:08:32 +02:00 |
|
wvengen
|
8913ad615c
|
show articles ordered by members but not by foodcoop dimmed in receive
|
2014-08-29 12:23:23 +02:00 |
|
wvengen
|
e61c3c9267
|
order articles by number then name in fax+receive
This makes it easier to enter the receive screen from an order pdf print
with received amounts.
Conflicts:
app/documents/order_fax.rb
|
2014-08-19 09:19:01 +02:00 |
|
wvengen
|
d8f4ac47dd
|
handle ajax errors (closes foodcoops#300)
|
2014-07-02 13:55:05 +02:00 |
|
wvengen
|
fa725dbf38
|
fix csv download also when searching
|
2014-07-02 09:37:03 +02:00 |
|
wvengen
|
c80a9cd68b
|
fix csv download (closes foodcoop-adam#129)
|
2014-07-01 11:14:35 +02:00 |
|
wvengen
|
59ab628e2f
|
fix layout bug
|
2014-06-23 17:51:20 +02:00 |
|
wvengen
|
873e8d44a2
|
harmonize foodsoft capitalisation
|
2014-06-23 17:51:20 +02:00 |
|
wvengen
|
6466ea9653
|
revamp footer
|
2014-06-23 17:51:20 +02:00 |
|
wvengen
|
b112028935
|
fix invititation form
(complements 9146e99bca2011c52e9a06f987251e2f5d72b11e)
|
2014-06-23 17:51:19 +02:00 |
|
wvengen
|
4b6231129c
|
only show undeleted articles in receive screen
|
2014-06-23 17:51:19 +02:00 |
|
wvengen
|
9e58a6f2b1
|
fix csv download + template optional parameters
Conflicts:
app/views/finance/financial_transactions/_transactions.html.haml
app/views/home/ordergroup.html.haml
app/views/login/_accept_invitation_form.html.haml
|
2014-06-23 17:51:19 +02:00 |
|
wvengen
|
a43020463d
|
normalize article and category attributes (closes foodcoops#294)
|
2014-06-23 17:51:19 +02:00 |
|
wvengen
|
7c2ecd8658
|
add some model api docs
|
2014-06-23 17:51:19 +02:00 |
|
wvengen
|
2bf13dbefa
|
give partially unused order articles a distinct colour
|
2014-06-23 17:51:19 +02:00 |
|
wvengen
|
fee0cfbdc7
|
make orders helpers clearer
|
2014-06-23 17:51:19 +02:00 |
|
wvengen
|
e7a476e6b6
|
remove unused season import fields
|
2014-06-23 17:51:19 +02:00 |
|
wvengen
|
2a6e0e0460
|
fix asset url in css (unbreaks heroku image 404)
|
2014-06-23 17:51:18 +02:00 |
|
wvengen
|
86a5576dc3
|
fix delete order confirmation
|
2014-06-23 17:51:18 +02:00 |
|
wvengen
|
c64a7ba3cd
|
validate date and time inputs
|
2014-06-23 17:51:18 +02:00 |
|
wvengen
|
8c0df3b4e8
|
edit order user-interface update
also closes foodcoops#145
|
2014-06-23 17:51:18 +02:00 |
|
wvengen
|
ef0888f38d
|
add view for all transactions + csv
|
2014-06-23 17:51:17 +02:00 |
|
wvengen
|
b5b4ccd922
|
make data-submit-onchange work with datepicker
|
2014-06-23 17:51:17 +02:00 |
|
wvengen
|
7b51f7aabe
|
fix negative balance email
|
2014-05-30 10:22:47 +02:00 |
|
wvengen
|
71a922a034
|
use locale in mails
Conflicts:
app/workers/supplier_notifier.rb
app/workers/user_notifier.rb
|
2014-05-13 17:01:28 +02:00 |
|
wvengen
|
5d9c9856d1
|
show proper error when all articles are deselected in order edit
|
2014-05-13 17:01:27 +02:00 |
|
wvengen
|
4c1e5e2b00
|
fix default textarea height
|
2014-05-13 17:01:27 +02:00 |
|
wvengen
|
3a41e9530f
|
fix order bug
|
2014-05-13 17:01:27 +02:00 |
|
wvengen
|
3953c21ae2
|
use capture instead of layout-hack to allow deface overrides
|
2014-05-13 17:01:27 +02:00 |
|
wvengen
|
64bb8e043d
|
enable/disable plugins by config option
|
2014-05-13 17:01:26 +02:00 |
|
wvengen
|
852f3484ad
|
make settle directly less dangerous
(closes foodcoops#275)
|
2014-05-13 17:01:26 +02:00 |
|
wvengen
|
ea8e4ee560
|
add pdf configuration options
|
2014-05-13 17:01:26 +02:00 |
|
wvengen
|
25854f2de7
|
do not store GroupOrderArticles with zero quantity and tolerance
|
2014-05-13 17:01:26 +02:00 |
|
Robert Waltemath
|
7556c753d0
|
Extract message system to plugin.
|
2014-05-13 17:01:25 +02:00 |
|
wvengen
|
fe0b17cdb0
|
cleanup email footer
|
2014-05-13 17:01:25 +02:00 |
|
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
|
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
|
8853b3efdb
|
fix sort order
|
2014-03-08 17:15:09 +01:00 |
|
wvengen
|
d9326dd984
|
allow plugins to override login redirection when authentication failed
|
2014-02-25 10:18:14 +01:00 |
|
wvengen
|
7841245795
|
migrate to Rails 4.0 (closes foodcoops#214)
Conflicts:
Gemfile.lock
|
2014-02-24 12:46:28 +01:00 |
|
wvengen
|
f8fca4d630
|
fix order article add + test
|
2014-02-24 11:37:06 +01:00 |
|
wvengen
|
8fba40eba6
|
fix submit-onchange
|
2014-02-19 11:41:10 +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
|
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
|
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
|
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
|
3e79304c5a
|
typo
|
2014-01-27 14:58:39 +01: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
|
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
|
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
|
151f851799
|
do not require authentication for root redirect
|
2014-01-15 16:33:13 +01:00 |
|