3d964b7bcf
Bundle update
2015-04-11 01:44:23 +02:00
379dc86ffa
Make order_pdf more generally useful
2015-04-10 21:30:04 +02:00
bc1eb3bc44
Show receive button in grey when already received
2015-04-10 21:25:09 +02:00
7974d2ec81
Use svg badges where possible [ci skip]
2015-04-10 19:03:48 +02:00
507651f5ba
Move small close button to helper.
...
Workaround for show order deface override nuking attributes of the close button.
2015-04-10 18:58:51 +02:00
cf0fcccfc3
Fix typo
2015-04-10 18:46:12 +02:00
4239843b3e
Merge foodcoop1040:order_message into master
...
Conflicts:
plugins/messages/app/models/message.rb
2015-04-10 18:30:54 +02:00
497488ef0e
Improve associations
2015-04-10 18:30:12 +02:00
de794a48b0
Reorder roles and add icons
2015-04-04 10:56:42 +02:00
07311aa032
Merge pull request #357 from foodcoop1040/user_activity
...
Add last user login and activity
2015-04-03 16:01:18 +02:00
8d8a64d613
Bundle update
2015-03-20 17:16:50 +01:00
097a7ffbe8
Merge pull request #359 from foodcoop1040/reply_private
...
Reply private to private messages
2015-03-20 16:42:38 +01:00
15ac566ece
Add help page for Foodsoft variables
2015-03-20 16:32:58 +01:00
a6f02a24d4
Improve wiki edit documentation
2015-03-20 15:50:49 +01:00
700eed27b8
Add last user login and activity
2015-03-03 14:55:30 +01:00
ac1f6ab258
Reply private to private messages
2015-03-03 13:34:16 +01:00
c59ee3a6a7
Show wikipage on login screen when present
2015-02-28 14:50:25 +01:00
1447b38bb3
Use foodsoft expansion variables in footer
2015-02-28 14:50:25 +01:00
9df483cf4e
Add foodsoft expansion variables for wiki
2015-02-28 14:50:25 +01:00
be128243fc
Cleanup wiki plugin a bit
2015-02-28 14:50:25 +01:00
b42672c06c
Add forgotten migration
2015-02-27 17:59:30 +01:00
55e8ff481c
Add reply_to and group_id to messages schema
2015-02-27 17:30:26 +01:00
3a3119f274
Regenerate schema
2015-02-27 17:28:50 +01:00
124f77f2ab
Add messaging to order ( closes #327 )
2015-02-19 00:53:57 +01:00
1b48882c0e
Refactor orders index
2015-02-18 23:46:50 +01:00
27fe8a4d42
Merge pull request #347 from foodcoop1040/suppliers_with_articles
...
Show only suppliers with articles in the dropdown-menu for new orders
2015-02-18 23:42:37 +01:00
26c364bf4b
Merge pull request #354 from foodcoop1040/recipients
...
Show recipients of messages
2015-02-18 23:28:29 +01:00
1ac24781f4
Merge pull request #348 from foodcoop1040/copy_order
...
Add possibility to copy an order
2015-02-18 23:27:12 +01:00
bd31092a65
Merge pull request #349 from foodcoop1040/reply_to
...
Use FoodsoftConfig[:email_sender] for sender address
2015-02-18 22:58:40 +01:00
5b309d3d51
Show only suppliers with articles in the dropdown-menu for new orders
...
When there are many suppliers to be able to select them for invoices,
the menu for creating new orders gets unclear.
2015-02-18 22:35:38 +01:00
e57fd500fc
Add possibility to copy an order
...
If a supplier has a long list of articles, which are all available, but
the order should contain only a subset of them, selecting them for every
order can take a long time. Starting with a copy of an existing order
can safe a lot of time.
2015-02-18 22:09:37 +01:00
23f0a1613a
Show recipients of messages
2015-02-18 17:45:20 +01:00
32bd8f600b
Use FoodsoftConfig[:email_sender] for sender address
...
Not every email provider allows sending messages from an unauthorized server.
2015-02-18 16:54:44 +01:00
65c7673a41
Allow updating profile without ordergroup
2015-01-16 20:25:58 +01:00
987f14c226
Add missing gem (since Rails 4.2 upgrade)
2015-01-16 20:22:32 +01:00
7d3d524107
Merge pull request #341 from aboutsource/fix-order-edit-loading
...
Fixed broken eager loading in orders#edit.
2015-01-16 16:19:41 +01:00
65dee49cdb
Fixed broken eager loading in orders#edit.
2015-01-16 15:57:11 +01:00
557fa78ebe
Add caching for Travis CI
2015-01-14 23:00:12 +01:00
7e0aa66936
Use more boolean comparators where it makes sense
2015-01-14 22:56:32 +01:00
1063aea4af
Add file import test
2015-01-14 22:52:17 +01:00
c31d015434
Bundle update (and fix spec that started failing)
2015-01-14 21:20:14 +01:00
118886344a
Use boolean comparators where it makes sense
2015-01-14 21:17:00 +01:00
dbdc7ae4aa
Workaround occasional mailer test failure
2015-01-14 20:57:43 +01:00
2687da357a
Fix mailer warnings
2015-01-13 18:02:30 +01:00
8a4b65c4a5
Add test for reset password
2015-01-13 17:59:31 +01:00
cfdfe5f23e
Improve header+footer in PDFs
2015-01-03 00:24:33 +01:00
d1ece157c6
Get rid of last empty page in PDFs
2015-01-03 00:24:33 +01:00
68f56a55e5
Merge pull request #333 from foodcoops/feature/plugin-uservoice
...
Add uservoice plugin
2015-01-02 23:22:12 +01:00
1b9b81fa75
Make sync work when unit has no name
...
(closes foodcoops#337)
Conflicts:
app/models/article.rb
2015-01-02 23:20:36 +01:00
cec5a93c82
Speedup Travis build a little
2015-01-02 18:23:49 +01:00
wvengen
wvengen
Patrick Gansterer
wvengen
Benjamin Meichsner