Patrick Gansterer
6cc02cb563
Add format helper for currency
2018-10-11 21:56:46 +02:00
Patrick Gansterer
924f346b4c
Show the financial transaction type if there are more than one type #367
2017-12-09 11:51:23 +01:00
Patrick Gansterer
2d641b683a
Show links to details beside the header to save space
2017-10-28 20:17:45 +02:00
Patrick Gansterer
72b5a5ca82
Add option to show account balance instead of available funds
...
Some foodcoops do not use the accounting feature of the foodsoft, which
results in wrong calculation of the available credit. To avoid
confusions show the current account balance instead.
2017-10-28 20:16:25 +02:00
Patrick Gansterer
e16a0fb336
Add config option to disable the invites
...
Some foodcoops require that an admin adds all users to have more control
over the users.
2016-03-06 13:56:33 +01:00
Patrick Gansterer
1efd3745df
Replace "count > 0" with "any?"
2016-03-04 20:01:56 +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
1c0db4374f
Merge pull request #332 from foodcoops/feature/edit-address
...
Allow to edit address from user profile
2014-12-23 21:00:20 +01:00
wvengen
bf6a31a032
Cleanup groups view on profile page
2014-12-16 21:14:20 +01:00
wvengen
56f6efa590
Allow to edit address from user profile
2014-12-10 21:27:53 +01: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
Robert Waltemath
7556c753d0
Extract message system to plugin.
2014-05-13 17:01:25 +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
Julius
ed228c4bd7
Allow control of password autocomplete by flag
2013-12-22 23:21:14 +01:00
wvengen
3e1d561a5e
fix user form field order and autocompletion
2013-12-22 13:28:33 +01:00
wvengen
135e938d3d
i18n cleanups (affects #137 )
2013-11-23 12:05:29 +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
wvengen
bb5a67033d
Merge pull request #194 from foodcoop-adam/plugin-move
...
Better support for plugins (engines) + move wiki to plugin
2013-11-12 03:46:15 -08:00
wvengen
891b9a21c0
fix and improve i18n of "My Ordergroup"
2013-11-09 14:19:54 +01:00
wvengen
de948d7692
fix and cleanup routing (closes foodcoops#190)
2013-10-30 02:27:04 +01:00
wvengen
e4f0a1e3ed
start of making nickname optional
2013-09-20 22:40:13 +02:00
wvengen
f1d6df9ecc
move commonly used verbs to common i18n identifier
2013-04-04 02:49:52 +02:00
wvengen
7af796c09c
Merge remote-tracking branch 'bennibu/rails3' into rails3
...
Conflicts:
app/controllers/admin/ordergroups_controller.rb
app/controllers/finance/balancing_controller.rb
app/controllers/suppliers_controller.rb
app/views/articles/_article.html.haml
app/views/finance/balancing/_summary.haml
app/views/finance/balancing/new.html.haml
app/views/group_orders/_form.html.haml
app/views/home/_apple_bar.html.haml
app/views/suppliers/index.haml
2013-03-21 22:08:09 +01:00
Benjamin Meichsner
762d529894
Added info link for apple restriction feature.
2013-03-09 18:14:53 +01:00
wvengen
2b11549d33
finished home i18n
2013-02-04 00:46:22 +01:00
wvengen
e0b781fca6
split locales into directory, and load from there
2013-02-01 17:56:34 +01:00
benni
f4f10b1e4c
Introduced actionbar. Some fixes for balancing page.
2012-11-12 13:13:01 +01:00
benni
1d9815731c
Removed fancybox. Fixed profile, my ordergroup and tasks.
2012-11-12 09:18:44 +01:00
benni
552c553b77
Fixed admin, orders, wiki views. Converted all erb to haml.
2012-10-15 21:19:17 +02:00
benni
699fb9b233
Fixed wiki pages.
2012-10-09 02:31:10 +02:00
benni
acdb331e36
Improved tasks.
2012-10-08 21:52:03 +02:00
benni
f20ae890dd
Added twitter bootstrap layout. Adapt home page.
2012-10-06 17:14:57 +02:00
benni
29a6cd8b62
Upgraded to rails 3.1.8. Fixed various bugs in wiki.
2012-09-30 21:15:55 +02:00
benni
ff4ab44bcc
Add option to restrict ordering when not enough apples.
2012-09-29 17:52:25 +02:00
benni
5fb0bc2444
Big feactoring and bug fixing, Mailer, Tasks, GroupOrders
2012-08-24 11:11:40 +02:00
benni
6f7682d6a0
Fixed new user invite.
2012-08-06 12:00:40 +02:00
benni
f759552022
Fixed user settings.
2012-07-31 18:21:42 +02:00
benni
dc0d1b3e46
Fixed bug in apples stats.
2012-07-22 21:12:53 +02:00
benni
182742fbec
Merge branch 'master' into rails3
...
Conflicts:
.gitignore
app/models/task.rb
app/models/workgroup.rb
app/views/shared/_group_form.html.haml
config/locales/de.yml
db/schema.rb
2012-06-26 11:51:56 +02:00
benni
f1b71a5588
Minor refactoring in stats partial.
2012-06-24 21:43:36 +02:00
benni
ad508b207b
Updated to rails 3.0.12. remove old gettext code.
2012-04-15 19:59:39 +02:00
benni
adbe93f39e
Fixed open_orders partial.
2011-06-13 15:26:06 +02:00
benni
c173cf4a6a
my_profile and admin/ordergroups.
2011-06-10 01:36:04 +02:00
benni
ea6348bc5c
Refactored finance/ordergroups|transactions module.
2011-06-09 21:35:05 +02:00
benni
1e33411516
refactored some js stuff. Fixed forms in article modul.
2011-05-19 19:49:37 +02:00
benni
2ee30fee16
Refactored home/ordergroup.
2011-05-16 11:00:52 +02:00
benni
1cf63fc40b
Some fixes to home view.
2011-05-16 10:34:14 +02:00
benni
79f8836da0
Fixed some html safe strings.
2011-05-15 21:17:01 +02:00
benni
197516b7fc
Fixed language and flash divs.
2011-05-11 17:41:43 +02:00