Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity
1825 commits 22 branches 1 tag 31 MiB
Commit graph

1825 commits

This branch
This branch
All branches
Author SHA1 Message Date
wvengen
cb8205e4de Merge pull request #413 from foodcoop1040/error_translations 
Add missing German translations for error messages
 2016-03-07 19:44:29 +01:00
wvengen
b4e2ddf66d Merge pull request #412 from foodcoop1040/confirm 
Get rid of duplicated confirm_delete translations
 2016-03-07 19:44:06 +01:00
wvengen
58e84b8923 Merge pull request #411 from foodcoop1040/invoice_total 
Add more infos to the invoice page
 2016-03-07 19:42:38 +01:00
Patrick Gansterer
7aacc7fef6 Fix German ui.* translations 2016-03-07 15:21:03 +01:00
Patrick Gansterer
f24a18371e Add missing German translations for error messages 2016-03-04 23:23:56 +01:00
Patrick Gansterer
c62104a388 Get rid of duplicated confirm_delete translations 2016-03-04 23:13:28 +01:00
Patrick Gansterer
5e744453f8 Add more infos to the invoice page 
When a foodcoop does not use the balancing feature the invoice page is
the main page for informations. Add all related information to it, so
people do not need to open the balancing page.
 2016-03-04 22:26:55 +01:00
wvengen
f5b6fbcf18 Merge pull request #408 from foodcoop1040/count_to_any 
Replace "count > 0" with "any?"
 2016-03-04 21:37:21 +01:00
wvengen
50e6c9f88b Merge pull request #409 from foodcoop1040/confirm 
Rename translation "admin.confirm" to "ui.confirm_delete"
 2016-03-04 21:37:03 +01:00
wvengen
e5db84b17c Merge pull request #410 from foodcoop1040/user_count 
Count only undeleted users for the user_count expansion varibale
 2016-03-04 21:36:35 +01:00
Patrick Gansterer
294d14624c Count only undeleted users for the user_count expansion varibale 2016-03-04 20:47:49 +01:00
Patrick Gansterer
0fc80a1ef5 Rename translation "admin.confirm" to "ui.confirm_delete" 2016-03-04 20:10:11 +01:00
Patrick Gansterer
1efd3745df Replace "count > 0" with "any?" 2016-03-04 20:01:56 +01:00
wvengen
97f81d9826 Merge pull request #406 from foodcoop1040/delete_user 
Add deleted_at for User
 2016-03-04 19:12:04 +01:00
Patrick Gansterer
b623b6abbf Remove useless if in invoices form 
The created_at field has a value all the time, so the check if it is set
make no sense since it evaluates to true all the time.
 2016-03-04 19:06:05 +01:00
Patrick Gansterer
b05ac2ab64 Add deleted_at for User 
Do not remove the user from the database. Mark as deleted instead.
 2016-03-04 19:03:52 +01:00
Patrick Gansterer
b30b4e46d8 Order items in select boxes 2016-03-04 18:28:00 +01:00
Patrick Gansterer
4e35e2d58e Add handling for message reply via email 
If the reply_email_domain configuration is set the messages plugin will
use unique Reply-To addresses for every email. They contain enough
information to reconstruct the message context and a hash to avoid
user forgery and spam.
A mail transfer agent must be configured to call the new rake task
foodsoft:parse_reply_email for incoming mails. The rake task requires
the receipt of the mail in the RECIPIENT variable and the raw message
via standard input. An example invocation would look like:
rake foodsoft:parse_reply_email RECIPIENT=f.1.1.HASH < test.eml
 2016-03-04 18:11:27 +01:00
wvengen
6b32d0c960 Improve message threads (by @paroga) 2016-03-04 17:54:15 +01:00
Patrick Gansterer
673448a5ac Store group_id of message also in the database 2016-03-04 17:33:59 +01:00
Patrick Gansterer
72ef31c0ec Make unassigned tasks more prominent in the dashboard 
Show all unassigned task in the dashboard to make it more interesting
for members to pick tasks. Some members do not (want to) click on the
task list very often it is not clear if there are new tasks if we show
the number of unassigned tasks only.
 2016-03-04 17:15:45 +01:00
Patrick Gansterer
4cae94eff9 Sort Task index 2016-03-04 17:14:43 +01:00
Patrick Gansterer
9ae7c05a89 Create next tasks directly after creating a periodic task 2016-03-04 17:13:16 +01:00
Patrick Gansterer
6015d16cab Add link for creating invoice at an order 2016-03-04 17:12:46 +01:00
Patrick Gansterer
36dd19f324 Require due_date for periodic tasks 2016-03-04 17:11:47 +01:00
Patrick Gansterer
d383288f4f Add missing class="btn" to edit button of invoice 
This aligns the interface with all other pages.
 2016-03-04 17:04:00 +01:00
Patrick Gansterer
8ac1471a89 Add message threads #394 
This new view sorts the messages by threads based on the reply_to.
Now we store only the message which started a new thread in the reply_to
field to avoid recursive queries.
 2016-03-04 16:52:34 +01:00
wvengen
d56828fa4d Show last user activity in admin ordergroups too 2016-03-04 16:28:22 +01:00
Patrick Gansterer
8b8693df5a Show last activity of ordergroups 2016-03-04 16:16:09 +01:00
wvengen
4cacb740d1 Small improvement in invoice edit 2016-03-04 16:14:54 +01:00
Patrick Gansterer
1315103a7d Add role_invoices 
This new role allows users to create invoices without role_finance. Users
can then only modify their own created invoices until somebody with the
role_finance sets the paid_on value.
 2016-03-04 16:06:02 +01:00
Patrick Gansterer
273969ac90 Change sort order of ordergroups to ascending 
Since we sort usually sort list ascending it seams strange to do this
different for ordergroups. So align the sort order with the other lists.
 2016-03-04 15:59:35 +01:00
Patrick Gansterer
460cf1e82c Change relationship of invoices #390 
This change will allow us to have invoices for more than one order/delivery
in the future. There are no UI changes for now.
 2016-03-04 15:55:39 +01:00
wvengen
9f919c3e54 Bundle update (for CVE-2016-2098) 2016-03-02 23:10:01 +01:00
Patrick Gansterer
53b51f0f5c Remove useless upper bound of 99 items #388 2016-02-24 00:39:57 +01:00
Patrick Gansterer
a97eee68b1 Make date clickable in finance overview #392 2016-02-24 00:39:50 +01:00
Patrick Gansterer
a42dd07d5c Make invoice date clickable #391 2016-02-24 00:39:34 +01:00
Patrick Gansterer
3d6f908102 Add created_by to invoice and show it 2016-02-24 00:39:07 +01:00
wvengen
76ea0cc411 Add release note for Docker setup 
https://github.com/foodcoops/foodsoft/pull/399#issuecomment-181529341
 2016-02-24 00:14:36 +01:00
Benjamin Meichsner
0bdeaa1570 Updated Docker setup. 
* Use ruby version 3
* Use bundle container
* Run rails commands as app user
 2016-02-24 00:11:31 +01:00
wvengen
6d338ffa9e Add display manager on Travis to fix running tests 2016-02-24 00:02:35 +01:00
wvengen
d6bf09b0b8 Fix failing tests 2016-02-18 23:52:07 +01:00
wvengen
a1a7bb02fe Bundle update 2016-02-01 16:41:52 +01:00
wvengen
73bd2c6a8e Bundle update nokogiri (fixes CVEs) 
https://github.com/sparklemotion/nokogiri/pull/1378
 2015-12-19 11:31:04 +01:00
wvengen
44ee63d156 Bundle update nokogiri 2015-11-26 11:54:26 +01:00
wvengen
227ca0dd84 Merge pull request #387 from foodcoops/feature/boxfills 
Add optional boxfill phase to orders (+ bootstrap buttons)
 2015-11-20 14:25:41 +01:00
wvengen
6a0147d2e7 Improve article header consistency 2015-11-18 22:44:38 +01:00
wvengen
dcf921dc8d Improve delta-input styling 2015-11-18 22:44:38 +01:00
wvengen
496dd34cc3 Avoid Rails 4.2 deprecation warning 2015-11-14 18:23:33 +01:00
wvengen
6bf693e0ee Fix lingering buglet (would not even run with Array) 2015-11-14 17:07:44 +01:00