fc32c12ccd
continue development after release
2016-06-28 20:53:21 +02:00
bf62abefbc
Bumped new version: 4.5.0
2016-06-28 20:50:48 +02:00
0d309af5f6
Update translations from localeapp
2016-06-28 20:43:53 +02:00
402a6e4251
Update changelog
2016-06-11 20:23:59 +02:00
9e53b01ca3
Update Gemfile versions where it doesn't break things
2016-06-11 19:42:14 +02:00
c2dc1d8697
Bundle update
2016-06-11 19:23:46 +02:00
c6a625e5ed
Localeapp update
2016-06-11 19:19:30 +02:00
30f2a4c25b
Merge pull request #433 from foodcoops/feature/fix-document-preloading
...
Speedup generating large PDFs
2016-06-09 22:56:51 +02:00
b9bdd04311
Fix current_order's ordergroups document preloading
2016-06-09 19:14:53 +02:00
5928640872
Fix current_order's order_articles preloading
2016-06-09 19:14:53 +02:00
78604ae09f
Fix order document preloading
2016-06-09 19:14:53 +02:00
70c79137cf
Fix order_articles document preloading
2016-06-09 19:14:53 +02:00
020b75cac8
Fix group_orders document preloading
2016-06-09 19:14:52 +02:00
0c9d20e01c
Let current_order plugin play nicer with stock articles
2016-06-07 00:37:00 +02:00
f08d131842
Fix Heroku deployment
2016-05-25 02:05:55 +02:00
be287cf67e
Fix new stock article failing
2016-05-20 21:30:56 +02:00
f9ffa0caff
Update documents plugin instructions
2016-05-06 16:48:46 +02:00
8bb58c5519
Add documents (merges foodcoops/foodsoft#353 )
2016-05-06 16:45:16 +02:00
33c9b23e2f
Update installation documentation
2016-05-06 16:00:55 +02:00
961c50b7e5
Hide delete attachment button when none present
2016-05-06 15:57:15 +02:00
3e5b320a6b
Merge pull request #345 from foodcoop1040/attachment
...
Add possibility to add an attachment to an invoice
2016-05-06 15:57:05 +02:00
749791bb7a
Add possibility to add an attachment to an invoice #345
2016-05-06 15:04:58 +02:00
8d5467ab7c
Merge pull request #355 from foodcoop1040/expeted_delivery_date
...
Add expected delivery date
2016-05-04 17:42:29 +02:00
f286dd6053
Add pickup date
...
This additional date helps users to find the correct order if the time
between end and pickup varies a lot.
2016-04-29 15:28:05 +02:00
de66cd5a2b
Update badge urls
2016-04-29 15:13:45 +02:00
86d8e90c06
Merge pull request #424 from foodcoop1040/stock_order_fixes
...
Add missing changes for the stock order
2016-04-29 15:06:58 +02:00
2e2efec5e7
Get rid of coffeescript.
2016-04-25 20:34:30 +02:00
483c2aba29
Fix rake in production environment
2016-04-25 09:01:19 +02:00
6a7b0ae409
Fix sync ignored article count
2016-04-16 21:15:53 +02:00
61189dc035
Bundle update
2016-04-07 16:07:58 +02:00
9e0ec35e9c
Fix schema version ( closes foodcoops/foodsoft#425 )
2016-03-30 20:27:00 +02:00
5c56ae6775
Add missing changes for the stock order
2016-03-11 22:52:49 +01:00
42eb6c8509
Make ordergroup break fields a bit nicer
2016-03-11 13:56:02 +01:00
b067808937
Merge pull request #404 from foodcoop1040/ordergroup_break
...
Add break to ordergroup
2016-03-11 13:48:57 +01:00
4433a665e4
Merge pull request #421 from foodcoop1040/edit_links
...
Add page to edit deliveries and orders linked to an invoice
2016-03-11 13:39:27 +01:00
b8010fedca
Add ordergroup_name to GroupOrder
2016-03-11 13:36:49 +01:00
efb929e64f
Allow editing of linked deliveries and orders at invoice
2016-03-11 13:23:13 +01:00
9c4d9d5c20
Add stock group order
...
This allows us to add additional items to an order, which do not belong
a specific user, but will be put into stock. The benefit of this change
is that we use the same order for ordergroups and stock.
2016-03-11 13:15:16 +01:00
b56df39623
Merge pull request #417 from foodcoop1040/deliveries_col
...
Hide deliveries column if there are no deliveries
2016-03-11 11:53:40 +01:00
253512eb51
Add break to ordergroup
...
In some foodcoops it is possible that ordergroups make a break. During that
they e.g. pay reduced or no membership fees and do not need to do work for
the foodcoop. This new fields make this visible to all members.
2016-03-08 04:38:13 +01:00
14e2fd179e
Merge pull request #403 from foodcoops/feature/402-messagegroups
...
Add messagegroups
2016-03-07 22:36:37 +01:00
80ab359860
Correct messages i18n
2016-03-07 22:17:18 +01:00
5d9e1845b7
Fix i18n key typo
2016-03-07 21:06:49 +01:00
a0358aab01
Merge pull request #420 from foodcoop1040/wiki_diff
...
Add diff for wiki pages
2016-03-07 20:23:09 +01:00
8545190a84
Merge pull request #419 from foodcoop1040/wiki
...
Improve sorting of wiki pages
2016-03-07 20:22:32 +01:00
d358278333
Merge pull request #416 from foodcoop1040/invite_config
...
Add config option to disable the invites
2016-03-07 19:47:00 +01:00
0b70ce39a8
Merge pull request #414 from foodcoop1040/ftc
...
Add a button to add all ordergroups to a new finanacial transaction c…
2016-03-07 19:45:45 +01:00
cb8205e4de
Merge pull request #413 from foodcoop1040/error_translations
...
Add missing German translations for error messages
2016-03-07 19:44:29 +01:00
b4e2ddf66d
Merge pull request #412 from foodcoop1040/confirm
...
Get rid of duplicated confirm_delete translations
2016-03-07 19:44:06 +01:00
58e84b8923
Merge pull request #411 from foodcoop1040/invoice_total
...
Add more infos to the invoice page
2016-03-07 19:42:38 +01:00
wvengen
wvengen
Patrick Gansterer