Commit graph

1950 commits

Author SHA1 Message Date
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
9343b965a0 Merge pull request #287 from wvengen/feature-sync_all
Allow to synchronise all articles + category matching
2014-09-02 13:11:08 +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
790a6b1972 allow to set page break options for each document 2014-08-29 12:01:21 +02:00
wvengen
72709be60a try workaround for failing test
(closes foodcoops#303)
2014-08-25 18:29:59 +02:00
wvengen
21838e9c84 prepare for RSpec 3.0 2014-08-19 11:53:01 +02:00
wvengen
61a1efdfcf bundle update 2014-08-19 10:50:10 +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
fd8b9ac19d expand gitignore [ci skip] 2014-07-09 14:26:49 +02:00
wvengen
94639b2817 Merge pull request #302 from orangeman/patch-1
typo
2014-07-09 10:31:40 +02:00
flo detig
c8f699535b typo 2014-07-08 21:32:52 +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
5349add890 fix fax txt table 2014-07-01 10:12:59 +02:00
wvengen
d375572358 continue development after release 2014-06-24 09:13:50 +02:00
wvengen
88252e034f Bumped new version: 4.1.0 2014-06-24 09:13:50 +02:00
wvengen
133b832d78 fix database migrations 2014-06-24 09:13:35 +02:00
wvengen
94e100b78b localeapp roundtrip 2014-06-23 17:51:20 +02:00
wvengen
fcd2cd8713 update documentation generation 2014-06-23 17:51:20 +02:00
wvengen
cdc746b364 update production environment to match 3.3.0 version 2014-06-23 17:51:20 +02:00
wvengen
59ab628e2f fix layout bug 2014-06-23 17:51:20 +02:00
wvengen
ae392ad861 fix number display 2014-06-23 17:51:20 +02:00
wvengen
873e8d44a2 harmonize foodsoft capitalisation 2014-06-23 17:51:20 +02:00
wvengen
86c972a201 fix document indentation 2014-06-23 17:51:20 +02:00
wvengen
6466ea9653 revamp footer 2014-06-23 17:51:20 +02:00
wvengen
81c18097a5 update doc [ci skip] 2014-06-23 17:51:20 +02:00
wvengen
d0790609f6 Add Inch CI (documentation status) badge 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
b1d085c618 bundle update 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
ffd1c06729 fix number crash 2014-06-23 17:51:19 +02:00
wvengen
06bed3698f upgrade rails-settings-cached & bundle update 2014-06-23 17:51:19 +02:00
wvengen
e7a476e6b6 remove unused season import fields 2014-06-23 17:51:19 +02:00
wvengen
4bc43645e0 touchclick update 2014-06-23 17:51:18 +02:00