2557645f4f
Rails 5.0
2020-09-05 14:40:11 +02:00
057f3ec8ea
Add welcome mail
2020-07-30 17:14:14 +02:00
9b889dd643
Add option to create ordergroup together with user
2020-04-11 00:04:49 +02:00
d476993321
Add polls plugin
2020-02-24 14:27:22 +01:00
1d9856ff93
Handle nil values correctly in User.authenticateUser
2019-11-11 11:10:26 +01:00
e498f9cb58
Add default roles for users
...
Some foodcoops want to give some roles to every member by default,
without adding every users to a workgroup.
2019-11-04 11:39:33 +01:00
abe847c0ee
Add and inherit from ApplicationRecord to match Rails 5.0 style
2019-01-15 04:40:05 +01:00
ac11ba1cc1
Add pickups role
2018-01-25 18:09:29 +01:00
75deec9f06
Add custom fields to invoice, odergroup, supplier and user
2017-10-28 20:16:47 +02:00
97abcabffa
Log mail delivery errors to database and add an UI for it
2017-10-02 16:02:39 +02:00
c6731b4e4f
Add IBAN field to supplier and user model
2017-01-21 22:43:48 +01:00
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
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
aa7a2a31ae
Bundle update & restructure tests (RSpec 3)
2015-04-25 17:14:37 +02: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
3a41e9530f
fix order bug
2014-05-13 17:01:27 +02:00
7841245795
migrate to Rails 4.0 (closes foodcoops#214)
...
Conflicts:
Gemfile.lock
2014-02-24 12:46:28 +01:00
d071c5bba8
fix user search
2013-12-22 23:21:02 +01:00
b1e81dc1d7
make simple_form see that first_name is required
2013-12-03 22:04:22 +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
9b47e5d6c4
use dynamic conditional in validation, to enable different foodcoops having different use_nick configuration values
2013-11-18 11:31:30 +01:00
ce3b89c910
make authentication methods more readable (thanks @fsmanuel)
2013-11-11 16:23:20 +01:00
6e9954c86f
remove user referencing page as it is not being used anyway
2013-10-30 11:04:22 +01:00
e13ca74df3
fix new user form
2013-10-29 19:11:33 +01:00
9ba425aafa
fallback for when nick is nil
2013-10-29 19:05:24 +01:00
1946cd1ab3
make user creation possible again
2013-10-02 23:33:24 +02:00
bc5795b052
small model change
2013-10-02 23:29:21 +02:00
ea3db22306
user display changes in model and mailer
2013-09-22 14:38:56 +02:00
6d3db7636a
make search work without nickname usage
2013-09-20 23:18:06 +02:00
a77c3b59b1
allow to login with email instead of nick as well + tests
2013-09-20 22:39:19 +02:00
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
c85a7fcc5c
fixes User#receive_email?
2013-07-18 16:58:04 +02:00
2c1d9aeb9c
finishes i18n set_locale with user settings
2013-06-14 02:39:25 +02:00
0061e45198
removes routes locale constrain and fixes some bugs
2013-06-06 04:29:53 +02:00
60c4c5510a
adds a new user settings system + migration + rake task/worker updates
2013-06-06 03:40:15 +02:00
f81e315d6f
finish i18n of models without view
2013-03-22 01:21:44 +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
1d9815731c
Removed fancybox. Fixed profile, my ordergroup and tasks.
2012-11-12 09:18:44 +01:00
29a6cd8b62
Upgraded to rails 3.1.8. Fixed various bugs in wiki.
2012-09-30 21:15:55 +02:00
5fb0bc2444
Big feactoring and bug fixing, Mailer, Tasks, GroupOrders
2012-08-24 11:11:40 +02:00
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
ad508b207b
Updated to rails 3.0.12. remove old gettext code.
2012-04-15 19:59:39 +02:00
172db1d37e
Admin namespace beendet.
2011-06-10 13:22:15 +02:00
6c98c7c755
Some fixes for task module.
2011-05-15 22:06:54 +02:00
e40f865c45
Refactored login module. Implemented standard sessions controller.
2011-05-11 13:38:46 +02:00
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
b9576dd669
Updated user validation. Fixed duplicates on 'nick'.
2010-02-16 09:53:24 +01:00
e75a42d509
Merge branch 'wiki'
2009-08-15 17:24:08 +02:00
Patrick Gansterer
wvengen
Benjamin Meichsner
Manuel Wiedenmann
Julius
Benjamin Meichsner
Benjamin Meichsner