wvengen
8d5467ab7c
Merge pull request #355 from foodcoop1040/expeted_delivery_date
...
Add expected delivery date
2016-05-04 17:42:29 +02:00
Patrick Gansterer
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
Patrick Gansterer
5c56ae6775
Add missing changes for the stock order
2016-03-11 22:52:49 +01:00
wvengen
b067808937
Merge pull request #404 from foodcoop1040/ordergroup_break
...
Add break to ordergroup
2016-03-11 13:48:57 +01:00
Patrick Gansterer
b8010fedca
Add ordergroup_name to GroupOrder
2016-03-11 13:36:49 +01:00
Patrick Gansterer
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
Patrick Gansterer
01cf6431a9
Add messagegroup
...
Messagegroups are a new kind of group. Every user can join and leave such a
group on her own. They are useful to create topics for mails.
E.g. if there is a weekly newsletter we can create a new messagegroup for
it and every user which is interested in receiving the newsletter can join
the corresponding group.
2016-03-04 18:32:57 +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
wvengen
6a0147d2e7
Improve article header consistency
2015-11-18 22:44:38 +01:00
wvengen
86eee94249
Add hint for ordergroup address in user form
2014-12-16 20:53:38 +01:00
wvengen
56f6efa590
Allow to edit address from user profile
2014-12-10 21:27:53 +01:00
wvengen
5c78bdde7e
Cleanup old task-related i18n
2014-11-23 01:42:15 +01:00
wvengen
6188567931
hide message preferences when messages are disabled
2014-11-20 23:11:04 +01:00
wvengen
3953c21ae2
use capture instead of layout-hack to allow deface overrides
2014-05-13 17:01:27 +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
7841245795
migrate to Rails 4.0 (closes foodcoops#214)
...
Conflicts:
Gemfile.lock
2014-02-24 12:46:28 +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
42d622d1b2
cleanup orders and add search
...
Conflicts:
app/assets/stylesheets/bootstrap_and_overrides.css.less
app/views/orders/_articles.html.haml
app/views/orders/show.html.haml
2014-01-17 13:41:38 +01:00
wvengen
436ebc0190
Merge pull request #234 from foodcoop-adam/article-dialog
...
introduce new layout in balancing article screen as well
2014-01-03 05:16:03 -08:00
wvengen
699be6a6d9
introduce new layout in balancing article screen as well
2013-12-23 16:11:14 +01:00
Julius
ed228c4bd7
Allow control of password autocomplete by flag
2013-12-22 23:21:14 +01:00
Julius
53e611c1c0
Allow browser to store new password after change
2013-12-22 18:26:28 +01:00
wvengen
3e1d561a5e
fix user form field order and autocompletion
2013-12-22 13:28:33 +01:00
wvengen
d448707b1a
i18n cleanup (affects foodcoops#137)
2013-12-12 00:13:19 +01:00
wvengen
b53cb36714
give proper block to link_to_ordering ( closes #201 )
2013-12-11 22:58:50 +01:00
wvengen
e25570d870
Merge remote-tracking branch 'tg-x/master'
...
Conflicts:
app/views/shared/_open_orders.html.haml
2013-12-11 22:39:37 +01:00
wvengen
1f08ee4759
Merge remote-tracking branch 'foodcoops/master' into feature-link_to_group_order
...
Conflicts:
app/views/shared/_open_orders.html.haml
2013-11-25 10:11:56 +01:00
wvengen
810656a53b
small link_to_ordering refactoring
2013-11-25 10:04:44 +01:00
wvengen
652a392b37
simplify i18n and fix some small ui issues
2013-11-23 17:49:43 +01:00
wvengen
66ac3be81f
Merge branch 'master' into allow-no-nickname
...
Conflicts:
app/views/home/ordergroup.html.haml
app/views/login/new_password.html.haml
app/views/shared/_auto_complete_users.rhtml
app/views/shared/memberships/_current_members.rhtml
app/views/shared/memberships/_non_members.rhtml
2013-11-18 11:42:49 +01:00
tg(x)
de9453fa24
dashboard: link to view order page
2013-11-13 16:42:32 +01:00
wvengen
3588962329
remove unused layout
2013-10-30 20:53:01 +01:00
wvengen
fef17604c5
remove unused autocomplete templates
2013-10-30 20:50:56 +01:00
wvengen
5ead67f88c
remove unused memberships controller/view
2013-10-30 20:46:59 +01:00
wvengen
c37ed74942
Merge branch 'master' into allow-no-nickname
...
Conflicts:
app/views/foodcoop/users/_users.html.haml
2013-10-29 19:15:52 +01:00
wvengen
e13ca74df3
fix new user form
2013-10-29 19:11:33 +01:00
wvengen
e968919cce
beautify map invocations of users
2013-10-29 18:46:55 +01:00
wvengen
4e61e764df
fix haml indentation errors
2013-10-17 16:35:50 +02:00
wvengen
f6c2fd9a9d
more user display changes
2013-09-22 02:15:35 +02:00
wvengen
e4f0a1e3ed
start of making nickname optional
2013-09-20 22:40:13 +02:00
wvengen
b11706f30a
sort ordergroups in order screen and pdfs
2013-09-17 00:25:38 +02:00
wvengen
8ca95f396f
make both ordered and received products visible in order screens and pdfs
2013-09-16 23:52:58 +02:00
wvengen
74bfc85562
Merge remote-tracking branch 'fsmanuel/master' into master.
...
Updated migration date to today.
Conflicts:
db/schema.rb
2013-07-18 18:48:49 +02:00
Julius
b303b48853
Merge branch 'master' into improve-delivery-workflow-further
2013-07-13 21:08:50 +02:00
Julius
a6228bdcf2
Style bootstrap tooltip; show FC share in article price info
2013-07-08 22:10:36 +02:00
Julius
8a79dfd167
Add tooltip for article prices
2013-06-26 20:06:38 +02:00
Julius
2ee7f716ae
Improve delivery validation: StockArticles must not be associated more than once
2013-06-26 17:58:55 +02:00
Robert Waltemath
a7fd7a7936
Removed obsolete code of old workgroup-centric weekly task concept.
2013-06-22 18:14:11 +02:00
wvengen
c48ce138f3
cleanup of profile layout
2013-06-18 12:25:05 +02:00
