rezometz/re2o
8
0
Fork 0
mirror of https://gitlab.federez.net/re2o/re2o synced 2024-07-04 05:04:06 +00:00
Code Issues Releases Wiki Activity
2930 commits 211 branches 14 tags 12 MiB
Commit graph

2930 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Romain Garnier 3efedf6bcb Fix _repr definition for InterfaceHistoryEvent 2020-04-23 18:29:22 +02:00
Jean-Romain Garnier 9959b7ad0a Add pretty representation of objects in InterfaceHistory 2020-04-23 18:27:42 +02:00
Jean-Romain Garnier c1bb37d23f Fix InterfaceHistory.get 2020-04-23 16:16:26 +00:00
Jean-Romain Garnier 20ea0ead9b Add missing parameter to get_history_object call 2020-04-23 16:08:29 +00:00
Jean-Romain Garnier bb901a4c3f Add view for InterfaceHistory 2020-04-23 18:06:21 +02:00
Jean-Romain Garnier 9a88fe1d08 Fix history inheritence 2020-04-23 15:46:30 +00:00
Jean-Romain Garnier 8b83f9f4bc Create InterfaceHistory 2020-04-23 17:39:45 +02:00
Jean-Romain Garnier 290504be78 Rename MachineHistory to MachineHistorySearch 2020-04-23 17:14:42 +02:00
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
Jean-Romain Garnier a4be2cdcef Fix typo in UserHistoryEvent.__repr 2020-04-23 17:02:08 +02:00
Jean-Romain Garnier 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
Jean-Romain Garnier 72625d8b4e Change link in user profile to new history view 2020-04-23 16:57:24 +02:00
Jean-Romain Garnier b1a170f3e4 Improve user history view event format 2020-04-23 16:57:24 +02:00
Jean-Romain Garnier 42cc29e2f8 Improve event representation in user history 2020-04-23 16:57:24 +02:00
Jean-Romain Garnier 3643e06bb3 Fix displaying new user history view 2020-04-23 16:57:24 +02:00
Jean-Romain Garnier d06d6f8c00 Create specific view for user history 2020-04-23 16:57:24 +02:00
Jean-Romain Garnier 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
Jean-Romain Garnier 17f0691957 Fix comments for machine history view and model 2020-04-22 23:25:19 +02:00
Jean-Romain Garnier 5639d43866 Remove unused file 2020-04-22 23:25:19 +02:00
Jean-Romain Garnier a5b67300c9 Fix number of results in pagination for machine history 2020-04-22 23:25:19 +02:00
Jean-Romain Garnier 01236373aa Add pagination for machine history results 2020-04-22 23:25:19 +02:00
Jean-Romain Garnier 91cee11297 Add missing translations in logs 2020-04-22 23:25:19 +02:00
Jean-Romain Garnier 41723adc89 Fix date check in machine history display 2020-04-22 23:25:19 +02:00
Jean-Romain Garnier 69666e1c91 Handle dates more gracefuly in machine history view 2020-04-22 23:25:19 +02:00
Jean-Romain Garnier 6678c15c2c Fix date compare in machine history view 2020-04-22 23:25:19 +02:00
Jean-Romain Garnier 830f6341df Add link to machine history view 2020-04-22 23:25:19 +02:00
Jean-Romain Garnier e76a215579 Handle empty dates in machine history results view 2020-04-22 23:25:18 +02:00
Jean-Romain Garnier f051d5c09c Tweak machine history results view 2020-04-22 23:25:18 +02:00
Jean-Romain Garnier c662fa64d8 Improve machine history results view 2020-04-22 23:25:18 +02:00
Jean-Romain Garnier 451923be3e Add comments to logs/models.py 2020-04-22 23:25:18 +02:00
Jean-Romain Garnier c4634191f5 Fix machine history views 2020-04-22 23:25:18 +02:00
Jean-Romain Garnier 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
Jean-Romain Garnier 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
Jean-Romain Garnier 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