Benjamin Meichsner
|
81d22e6077
|
Allow adding tracking code for webstatistics service. E.g. piwik.
|
2014-09-22 09:15:47 +02:00 |
|
wvengen
|
418a8b5806
|
fix i18n issues + localeapp roundtrip
thanks, i18n-tasks!
|
2014-09-15 13:52:35 +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
|
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
|
7b000c39eb
|
add foodcoop configuration screen
|
2014-09-02 14:21:32 +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
|
647b7f0430
|
allow to synchronize all articles of a shared supplier
|
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
|
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
|
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
|
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
|
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
|
86a5576dc3
|
fix delete order confirmation
|
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
|
7b51f7aabe
|
fix negative balance email
|
2014-05-30 10:22:47 +02:00 |
|
wvengen
|
5d9c9856d1
|
show proper error when all articles are deselected in order edit
|
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
|
852f3484ad
|
make settle directly less dangerous
(closes foodcoops#275)
|
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
|
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
|
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
|
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
|
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
|
5aef8e445e
|
add html units history line
|
2014-01-31 13:08:20 +01:00 |
|
wvengen
|
7ebb2459e0
|
make click work better on touch devices (closes foodcoops#104)
|
2014-01-25 15:19:50 +01:00 |
|
wvengen
|
d08f120b27
|
show message when ignoring articles due to missing order number
|
2014-01-24 22:20:29 +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 |
|