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
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
de794a48b0
Reorder roles and add icons
2015-04-04 10:56:42 +02:00
1447b38bb3
Use foodsoft expansion variables in footer
2015-02-28 14:50:25 +01:00
118886344a
Use boolean comparators where it makes sense
2015-01-14 21:17:00 +01:00
6e990fed4c
Upgrade to rails 4.1
2014-11-21 14:37:56 +01:00
f18cc367ae
workaround for CVE-2014-4920
2014-09-10 13:27:45 +02:00
b5ddbcae21
make custom css more robust
2014-09-02 14:15:59 +02:00
19630e8607
allow foodcoops to add custom css
2014-09-02 13:35:45 +02:00
8c0df3b4e8
edit order user-interface update
...
also closes foodcoops#145
2014-06-23 17:51:18 +02:00
ef0888f38d
add view for all transactions + csv
2014-06-23 17:51:17 +02:00
7556c753d0
Extract message system to plugin.
2014-05-13 17:01:25 +02:00
f71b78665e
allow 500 items per page
2014-05-13 17:01:24 +02:00
60826ceedc
allow to edit GroupOrderArticle result from orders screen
...
Conflicts:
app/assets/javascripts/application.js
2014-02-10 16:03:08 +01:00
f9d2c20aaa
cleanup articles sorted in groups
2014-02-10 15:58:58 +01:00
d1c3c83ed7
use plural in table headings by default
2014-01-08 18:23:34 +01:00
45ad8e6524
move helper to new module
2013-12-23 11:48:17 +01:00
ed228c4bd7
Allow control of password autocomplete by flag
2013-12-22 23:21:14 +01:00
20bd86fe65
make heading_helper work with empty _short translation
2013-11-24 01:59:44 +01:00
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
13c8af3642
use abbr instead of acronym for heading helper
2013-11-01 12:49:21 +01:00
c37ed74942
Merge branch 'master' into allow-no-nickname
...
Conflicts:
app/views/foodcoop/users/_users.html.haml
2013-10-29 19:15:52 +01:00
9ba425aafa
fallback for when nick is nil
2013-10-29 19:05:24 +01:00
78c81b194c
i18n simple_form move of foodcoop
2013-10-09 23:00:07 +02:00
bbcad49831
start moving from simple_form i18n to activerecord
2013-10-03 16:03:13 +02:00
f6c2fd9a9d
more user display changes
2013-09-22 02:15:35 +02:00
e4f0a1e3ed
start of making nickname optional
2013-09-20 22:40:13 +02:00
2ee7f716ae
Improve delivery validation: StockArticles must not be associated more than once
2013-06-26 17:58:55 +02:00
3b7cbf71e0
fix i18n typos
2013-05-16 00:05:47 +02:00
6c65799025
use more beautiful close mark
2013-04-10 17:34:24 +02:00
a501fac76f
helpers i18n
2013-04-10 17:29:06 +02:00
8b2b70f8bf
Fixed saving user for new orders.
2013-01-26 16:24:45 +01:00
0edd29dfd4
Merge branch 'master' into master-to-rails3
...
Conflicts:
Gemfile
README_DEVEL
app/controllers/articles_controller.rb
app/controllers/orders_controller.rb
app/controllers/tasks_controller.rb
app/models/task.rb
app/views/articles/_import_search_results.haml
app/views/articles/index.haml
app/views/messages/new.haml
app/views/ordering/_order_head.haml
app/views/ordering/my_order_result.haml
app/views/orders/show.haml
app/views/stockit/new.html.haml
db/schema.rb
2012-12-14 18:10:46 +01:00
c17ff281c3
Save and display creator of Order
2012-11-12 14:24:49 +01:00
0236fb5a60
Fixed finance module to work with bootstrap design.
2012-11-10 16:44:05 +01:00
f30e57dd49
Fixed articles views.
2012-10-19 01:12:47 +02:00
552c553b77
Fixed admin, orders, wiki views. Converted all erb to haml.
2012-10-15 21:19:17 +02:00
ab81ef09d5
Replace will_paginate with kaminari. Fixed foodcoop/users page.
2012-10-08 15:24:32 +02:00
1708df3f6c
Fixed login, new_password and invitation views.
2012-10-08 11:51:56 +02:00
c49edb79a2
Fixed edit_not in balancing.
2012-05-12 10:55:20 +02:00
ad508b207b
Updated to rails 3.0.12. remove old gettext code.
2012-04-15 19:59:39 +02:00
6ddef7267a
Refactored items_per_page. Start on admin/workgroups.
2011-06-10 12:18:55 +02:00
689cfcfe01
Fixed items_per_page helper.
2011-06-10 12:03:32 +02:00
a47d4b1f0e
Unobtrusive pagination_links_remote
2011-06-10 11:43:56 +02:00
013637a4fc
Refactored shared article import. Added meta search gem.
2011-05-19 22:22:05 +02:00
2ee30fee16
Refactored home/ordergroup.
2011-05-16 11:00:52 +02:00
e40f865c45
Refactored login module. Implemented standard sessions controller.
2011-05-11 13:38:46 +02:00
571548dfbc
Fixed routing bug on (ex) admin controller.
2010-03-22 01:58:37 +01:00
cf9fa69ac2
Minor improvements to task show view.
2009-10-16 21:06:55 +02:00
529956ea5a
Merge branch 'wiki'
...
Conflicts:
app/helpers/pages_helper.rb
public/stylesheets/main.css
public/stylesheets/print.css
2009-09-28 15:04:07 +02:00
Patrick Gansterer
wvengen
Robert Waltemath
Julius
Benjamin Meichsner
Benjamin Meichsner