klafyvel
|
5b42ca8cbe
|
Merge branch 'improve_user_history' into 'dev'
Improve user history
See merge request re2o/re2o!516
|
2020-04-23 17:06:12 +02:00 |
|
|
|
a4be2cdcef
|
Fix typo in UserHistoryEvent.__repr
|
2020-04-23 17:02:08 +02:00 |
|
|
|
d5ec64f9a8
|
Add detailed history for Adherent and Club objects
|
2020-04-23 17:02:08 +02:00 |
|
Hugo Levy-Falk
|
6d3c86f99c
|
Rebase dev
|
2020-04-23 17:01:07 +02:00 |
|
|
|
72625d8b4e
|
Change link in user profile to new history view
|
2020-04-23 16:57:24 +02:00 |
|
|
|
b1a170f3e4
|
Improve user history view event format
|
2020-04-23 16:57:24 +02:00 |
|
|
|
42cc29e2f8
|
Improve event representation in user history
|
2020-04-23 16:57:24 +02:00 |
|
|
|
3643e06bb3
|
Fix displaying new user history view
|
2020-04-23 16:57:24 +02:00 |
|
|
|
d06d6f8c00
|
Create specific view for user history
|
2020-04-23 16:57:24 +02:00 |
|
|
|
856664b66b
|
Merge branch 'self_pseudo_change' into 'dev'
Add self pseudo setting
See merge request re2o/re2o!515
|
2020-04-23 14:57:43 +02:00 |
|
Gabriel Detraz
|
60a55ea1e0
|
Fix permission check
|
2020-04-23 12:59:38 +02:00 |
|
Gabriel Detraz
|
24c000e743
|
Add self pseudo setting
|
2020-04-23 12:07:15 +02:00 |
|
klafyvel
|
3fa0dc577a
|
Merge branch 'modularity_preferences_and_tickets_fix' into 'dev'
Modularity preferences and tickets fix
See merge request re2o/re2o!512
|
2020-04-23 09:51:38 +02:00 |
|
Gabriel Detraz
|
4a1d0a1026
|
Lerennais remarques
|
2020-04-23 03:29:11 +02:00 |
|
Gabriel Detraz
|
38b119bb8e
|
Add comment to tikets + send_notif mails
|
2020-04-23 03:18:34 +02:00 |
|
Gabriel Detraz
|
c8c89fab1d
|
Fix and harmonize some issues in ticket app
|
2020-04-23 03:18:34 +02:00 |
|
Hugo Levy-Falk
|
acf510a8e7
|
No need for preferences/utils
|
2020-04-23 03:18:16 +02:00 |
|
Gabriel Detraz
|
cd46e77a03
|
New place for local preferences
|
2020-04-23 03:18:16 +02:00 |
|
Gabriel Detraz
|
9ea8808f75
|
New organisation for local apps and all settings in folder preferences
|
2020-04-23 03:18:16 +02:00 |
|
Gabriel Detraz
|
b4edd7f4dc
|
Create preferences models and edition template
|
2020-04-23 03:17:58 +02:00 |
|
klafyvel
|
623df4a9c3
|
Merge branch 'machine_history' into 'dev'
Add machine history view
See merge request re2o/re2o!513
|
2020-04-22 23:30:26 +02:00 |
|
|
|
17f0691957
|
Fix comments for machine history view and model
|
2020-04-22 23:25:19 +02:00 |
|
|
|
5639d43866
|
Remove unused file
|
2020-04-22 23:25:19 +02:00 |
|
|
|
a5b67300c9
|
Fix number of results in pagination for machine history
|
2020-04-22 23:25:19 +02:00 |
|
|
|
01236373aa
|
Add pagination for machine history results
|
2020-04-22 23:25:19 +02:00 |
|
|
|
91cee11297
|
Add missing translations in logs
|
2020-04-22 23:25:19 +02:00 |
|
|
|
41723adc89
|
Fix date check in machine history display
|
2020-04-22 23:25:19 +02:00 |
|
|
|
69666e1c91
|
Handle dates more gracefuly in machine history view
|
2020-04-22 23:25:19 +02:00 |
|
|
|
6678c15c2c
|
Fix date compare in machine history view
|
2020-04-22 23:25:19 +02:00 |
|
|
|
830f6341df
|
Add link to machine history view
|
2020-04-22 23:25:19 +02:00 |
|
|
|
e76a215579
|
Handle empty dates in machine history results view
|
2020-04-22 23:25:18 +02:00 |
|
|
|
f051d5c09c
|
Tweak machine history results view
|
2020-04-22 23:25:18 +02:00 |
|
|
|
c662fa64d8
|
Improve machine history results view
|
2020-04-22 23:25:18 +02:00 |
|
|
|
451923be3e
|
Add comments to logs/models.py
|
2020-04-22 23:25:18 +02:00 |
|
|
|
c4634191f5
|
Fix machine history views
|
2020-04-22 23:25:18 +02:00 |
|
|
|
4b7393b5e4
|
Add views to get IP / MAC history
|
2020-04-22 23:25:18 +02:00 |
|
chirac
|
ff3def9d82
|
Merge branch 'cgu_line_formatting' into 'dev'
Fix CGU multiline formatting
See merge request re2o/re2o!514
|
2020-04-22 21:40:10 +02:00 |
|
|
|
3fdcdd99b2
|
Fix CGU line formatting
|
2020-04-22 19:34:55 +00:00 |
|
klafyvel
|
469e273efb
|
Merge branch 'session_cookie_secure' into 'dev'
Explain SESSION_COOKIE_AGE in settings_local.example.py
See merge request re2o/re2o!511
|
2020-04-22 12:33:51 +02:00 |
|
Jean-Romain Garnier
|
5c56abcbd5
|
Comment SESSION_COOKIE_AGE setting
|
2020-04-22 12:30:06 +02:00 |
|
|
|
17fbaab502
|
Merge branch 'fix_132' into 'dev'
Fix #132, return in clean if ip domaine are invalid
See merge request re2o/re2o!509
|
2020-04-21 22:59:26 +02:00 |
|
Gabriel Detraz
|
badf29d26f
|
Fix #132, return in clean if ip domaine are invalid
|
2020-04-21 22:54:52 +02:00 |
|
chirac
|
ab541ab503
|
Merge branch 'handle_empty_emails' into 'dev'
Handle empty emails
See merge request re2o/re2o!508
|
2020-04-21 21:52:45 +02:00 |
|
|
|
5107a34a6e
|
Add missing translations
|
2020-04-21 19:48:59 +00:00 |
|
|
|
91a4c35d3b
|
Improve comments for User clean methods
|
2020-04-21 21:38:31 +02:00 |
|
Gabriel Detraz
|
e47b555343
|
Check email in user clean (factorise code)
|
2020-04-21 19:27:12 +02:00 |
|
|
|
24abff4106
|
Fix some email checks being bypassed for legacy users
|
2020-04-21 19:22:14 +02:00 |
|
|
|
b119bfeb65
|
Prevent user email from being null
|
2020-04-21 19:22:14 +02:00 |
|
|
|
eb4dd7ebe3
|
Make email check more pythonic
|
2020-04-21 19:22:14 +02:00 |
|
|
|
51b3c52181
|
Leave user email blank / null for compatilibity
|
2020-04-21 19:22:14 +02:00 |
|
