8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-24 12:23:11 +00:00
Commit graph

3107 commits

Author SHA1 Message Date
67b03827df Always sync email_change_date on manual state change 2020-04-17 11:13:56 +00:00
b171ac64bb Move user email_change_date update on manual state change to seperate method 2020-04-17 13:01:10 +02:00
97ce17792b Fix overlapping conditions in User.state_sync 2020-04-17 12:53:03 +02:00
bd153d53b2 Automatically consider email valid when user is set to STATE_ACTIVE 2020-04-17 12:50:22 +02:00
32a7c80133 Handle manually switching user state to/from STATE_EMAIL_NOT_YET_CONFIRMED 2020-04-17 12:41:33 +02:00
781c459db3 Fix string formatting error during email confirmation 2020-04-17 10:30:44 +00:00
dbefd3a0d7 Fix confirm email template 2020-04-17 10:28:04 +00:00
c41c723b0c Replace ConfirmMailForm with an html template 2020-04-17 12:25:42 +02:00
608f77b013 Improve template of email confirmation view 2020-04-17 11:38:05 +02:00
4322540077 Fix user referenced before assignment 2020-04-17 11:34:54 +02:00
fca81fe906 Fix template shown when confirming send an email 2020-04-17 11:30:17 +02:00
c76d5c7102 Improve template for resending a confirmation email 2020-04-17 11:22:29 +02:00
f171eeb607 Add missing migrations 2020-04-17 00:17:18 +00:00
5e2e609474 Fix handling of confirmation email for front facing elements 2020-04-17 00:16:56 +00:00
b91efa3d29 Start implementing user-facing confirmation email mechanics 2020-04-17 00:24:35 +02:00
d4380f866f Add option to select number of days before disabling users 2020-04-16 23:14:19 +02:00
91edc7ed31 Create disable_emailnotyetconfirmed.py 2020-04-16 22:24:34 +02:00
8728bc69f5 Create EMAIL_NOT_YET_CONFIRMED state 2020-04-16 22:07:25 +02:00
e57ec2ccd1 Add help text for password checkbox in user creation 2020-04-16 17:59:53 +00:00
dbe8223efc Add translations for initial password related strings 2020-04-16 17:41:37 +00:00
8c827cc845 Add option to enable the password field during account creation 2020-04-16 17:41:33 +00:00
653a059725 Add optional fields to select password during user creation 2020-04-16 17:41:18 +00:00
chirac
d6155ef091 Merge branch 'fix_ttl_export' into 'dev'
Fix TTL export in API.

See merge request re2o/re2o!494
2020-04-03 18:31:19 +02:00
Hugo Levy-Falk
6f7e39e841 Fix TTL export in API. 2020-04-03 17:01:38 +02:00
chirac
eb48572162 Merge branch 'mailing_groups' into 'dev'
Add group mailings

See merge request federez/re2o!482
2020-03-29 01:31:43 +01:00
742db91f1d Add group mailings 2020-03-29 01:29:41 +01:00
Gabriel Detraz
dcb51bf267 Merge branch 'master' into dev 2020-03-29 01:24:50 +01:00
Laouen Fernet
43d207590b Merge branch 'fix_tickets_perm_name' into 'master'
Fix tickets permissions name

See merge request federez/re2o!493
2020-03-29 01:10:32 +01:00
Gabriel Detraz
c356613a83 Fix tickets permissions name 2020-03-29 01:00:21 +01:00
b0f02bcee5 Merge branch 'fix_bootstrap3_correctversion' into 'master'
Drop support python2 in boostrap3 12

See merge request federez/re2o!492
2020-03-27 21:35:07 +01:00
Gabriel Detraz
d526759270 Drop support python2 in boostrap3 12 2020-03-27 20:21:49 +00:00
chirac
2555e50f63 Merge branch 'translate_readme' into 'dev'
Translate readme

See merge request federez/re2o!490
2020-03-03 18:52:26 +01:00
grisel-davy
2f9ac1a168 finish readme 2020-03-01 00:07:10 +00:00
grizzly
2e2c5f625c Adding english version, respond to #157 2020-02-28 20:24:10 +01:00
chirac
5b4ba6c7dc Merge branch 'cant_change_user_roles' into 'dev'
Cant change user roles without being superuser

See merge request federez/re2o!489
2020-02-20 09:41:49 +01:00
97151cd656 Fix permission allowing user to change groups 2020-02-20 09:30:41 +01:00
chirac
d058fe5b59 Merge branch 'room_building_search' into 'dev'
Improve search functionality

See merge request federez/re2o!488
2020-02-19 11:21:28 +01:00
Jean-Romain Garnier
57631f368d Fix wrong translation in advanced search 2020-02-19 11:10:07 +01:00
Jean-Romain Garnier
d6316bbc0b Fix translation 2020-02-19 11:07:53 +01:00
Jean-Romain Garnier
a708fe2dda Fix linting issues 2020-02-19 11:06:57 +01:00
870523b439 Add ability to search by building and room name without space 2020-02-19 09:50:16 +00:00
Jean-Romain Garnier
27b4bee02c Remove duplicate translation 2020-02-18 23:43:35 +01:00
Jean-Romain Garnier
562973efc7 Fix typo in translation 2020-02-18 23:41:15 +01:00
Jean-Romain Garnier
615f25146f Fix wrongfuly "No result" in search 2020-02-18 23:37:37 +01:00
Jean-Romain Garnier
a6be269eec Fix some translations 2020-02-18 23:04:38 +01:00
1a49c1a744 Improve behavior when searching for rooms 2020-02-18 21:45:34 +00:00
0347086ca4 Fix identation error 2020-02-18 18:01:39 +00:00
Jean-Romain Garnier
805cc450cc Merge branch 'room_building_search' of gitlab.federez.net:federez/re2o into room_building_search 2020-02-18 18:53:04 +01:00
Jean-Romain Garnier
8a9c8eaaaa Add ability to make queries case sensitive 2020-02-18 18:52:50 +01:00
c49beb02ee Fix import error 2020-02-18 17:18:44 +00:00