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
wvengen
aa7a2a31ae
Bundle update & restructure tests (RSpec 3)
2015-04-25 17:14:37 +02:00
wvengen
118886344a
Use boolean comparators where it makes sense
2015-01-14 21:17:00 +01:00
wvengen
6e990fed4c
Upgrade to rails 4.1
2014-11-21 14:37:56 +01:00
wvengen
3a41e9530f
fix order bug
2014-05-13 17:01:27 +02:00
wvengen
7841245795
migrate to Rails 4.0 (closes foodcoops#214)
...
Conflicts:
Gemfile.lock
2014-02-24 12:46:28 +01:00
wvengen
d071c5bba8
fix user search
2013-12-22 23:21:02 +01:00
wvengen
b1e81dc1d7
make simple_form see that first_name is required
2013-12-03 22:04:22 +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
9b47e5d6c4
use dynamic conditional in validation, to enable different foodcoops having different use_nick configuration values
2013-11-18 11:31:30 +01:00
wvengen
ce3b89c910
make authentication methods more readable (thanks @fsmanuel)
2013-11-11 16:23:20 +01:00
wvengen
6e9954c86f
remove user referencing page as it is not being used anyway
2013-10-30 11:04:22 +01:00
wvengen
e13ca74df3
fix new user form
2013-10-29 19:11:33 +01:00
wvengen
9ba425aafa
fallback for when nick is nil
2013-10-29 19:05:24 +01:00
wvengen
1946cd1ab3
make user creation possible again
2013-10-02 23:33:24 +02:00
wvengen
bc5795b052
small model change
2013-10-02 23:29:21 +02:00
wvengen
ea3db22306
user display changes in model and mailer
2013-09-22 14:38:56 +02:00
wvengen
6d3db7636a
make search work without nickname usage
2013-09-20 23:18:06 +02:00
wvengen
a77c3b59b1
allow to login with email instead of nick as well + tests
2013-09-20 22:39:19 +02:00
Benjamin Meichsner
a0760ebfdb
Fixed delivering emails to users.
...
There was a bug in User#receive_email? Return values are now true or false, not '1' or '0'.
2013-09-06 11:40:40 +02:00
Manuel Wiedenmann
c85a7fcc5c
fixes User#receive_email?
2013-07-18 16:58:04 +02:00
Manuel Wiedenmann
2c1d9aeb9c
finishes i18n set_locale with user settings
2013-06-14 02:39:25 +02:00
Manuel Wiedenmann
0061e45198
removes routes locale constrain and fixes some bugs
2013-06-06 04:29:53 +02:00
Manuel Wiedenmann
60c4c5510a
adds a new user settings system + migration + rake task/worker updates
2013-06-06 03:40:15 +02:00
wvengen
f81e315d6f
finish i18n of models without view
2013-03-22 01:21:44 +01:00
benni
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
Julius
c17ff281c3
Save and display creator of Order
2012-11-12 14:24:49 +01:00
benni
1d9815731c
Removed fancybox. Fixed profile, my ordergroup and tasks.
2012-11-12 09:18:44 +01:00
benni
29a6cd8b62
Upgraded to rails 3.1.8. Fixed various bugs in wiki.
2012-09-30 21:15:55 +02:00
benni
5fb0bc2444
Big feactoring and bug fixing, Mailer, Tasks, GroupOrders
2012-08-24 11:11:40 +02:00
benni
8a74e7d77f
Removed annoate and hirb Gemfiles.
...
Annotate: Better look in schema.rb, this reference should be always up
to date.
Hirb: To reactivate hirb, look in railscasts:
http://railscasts.com/episodes/48-console-tricks-revised
2012-07-27 18:07:42 +02:00
benni
ad508b207b
Updated to rails 3.0.12. remove old gettext code.
2012-04-15 19:59:39 +02:00
benni
172db1d37e
Admin namespace beendet.
2011-06-10 13:22:15 +02:00
benni
6c98c7c755
Some fixes for task module.
2011-05-15 22:06:54 +02:00
benni
e40f865c45
Refactored login module. Implemented standard sessions controller.
2011-05-11 13:38:46 +02:00
benni
46450cebef
New annotation, because of db switch to mysql.
...
Background: sqlite has some problems with decimal option.
2011-05-07 21:55:24 +02:00
Benjamin Meichsner
b9576dd669
Updated user validation. Fixed duplicates on 'nick'.
2010-02-16 09:53:24 +01:00
Benjamin Meichsner
e75a42d509
Merge branch 'wiki'
2009-08-15 17:24:08 +02:00
Benjamin Meichsner
d848831fea
Implemented stats for ordergroups on startpage. Annotated models.
2009-08-01 13:41:22 +02:00
Benjamin Meichsner
053c665270
Added version control for wiki pages.
2009-05-15 17:32:45 +02:00
Benjamin Meichsner
325d47b22f
Changed behaviour of acts_as_paraniod. Finder wrapper removed an replaced by simple named_scope 'without_deleted'.
2009-02-11 15:23:59 +01:00
Benjamin Meichsner
67743cd014
Implement notification for upcoming tasks via a daily fired rake-task.
2009-02-10 15:07:47 +01:00
Benjamin Meichsner
96442477d1
Fixed broken links in tasks-module. Translated some views into german.
2009-02-06 20:51:14 +01:00
Benjamin Meichsner
aec93d4b73
Fixed bugs from last commit and in ExceptionNotification-config.
2009-02-02 17:12:08 +01:00
Benjamin Meichsner
0a2a79237a
Moved User.address-info into Ordergroup.contact_... attributes. Updated model-fixtures for testing.
2009-02-02 16:35:43 +01:00
Benjamin Meichsner
80947b0059
Fixed bug from last commit. User.ordergroup ist now an 'Ordergroup'\!
2009-02-01 21:04:35 +01:00
Benjamin Meichsner
e16bebd042
Removed acts-as-statemachine. Replaces User.find_ordergroup with ActiveRecord-Association 'has_one :ordergroup'.
2009-02-01 20:56:23 +01:00
Benjamin Meichsner
190a777278
Order refactoring part two: Balancing workflow was adapted to the new order schema. Article modification is still missing.
2009-01-29 21:28:22 +01:00
Benjamin Meichsner
fc45345e0d
Introduced acts_as_paranoid. Avoid deleting of suppliers and articles. (for consistency of order-results)
2009-01-20 19:37:15 +01:00
Benjamin Meichsner
e8d55e50c0
Complete refactoring of messaging module. From now messages are saved only once and send afterwards via a the 'send_emails'-rake-task.
2009-01-15 18:26:37 +01:00
