8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-28 15:42:25 +00:00
Commit graph

3865 commits

Author SHA1 Message Date
ef8bc842df Merge branch 'dev' into 'dev'
Update contributor name

See merge request re2o/re2o!627
2022-02-27 11:34:59 +00:00
Yohann D'ANELLO
cc5212f0d4
Replace contributor name
Signed-off-by: Yohann D'ANELLO <ynerant@crans.org>
2022-02-22 15:53:29 +01:00
8627c7d686 Merge branch 'fix-autocapture' into 'dev'
fix: Fix autocapture

See merge request re2o/re2o!623
2022-01-09 19:20:07 +00:00
6bf8494a5d fix: Fix autocapture 2022-01-09 19:20:04 +00:00
ca2e999089 Merge branch '343-ldap_sync-and-ldap_rebuild-do-not-regenerate-service-users-2' into 'dev'
fix: Resolve "ldap_sync and ldap_rebuild do not regenerate service-users"

See merge request re2o/re2o!618
2021-09-05 12:58:00 +00:00
545c370c6a fix: Resolve "ldap_sync and ldap_rebuild do not regenerate service-users" 2021-09-05 12:57:59 +00:00
nanoy
8eeace95ce Merge branch 'html_invoice_template' into 'dev'
feat: Replace LaTeX invoice templates with HTML templates

See merge request re2o/re2o!621
2021-08-09 09:04:40 +00:00
0901b9b439 feat: Replace LaTeX invoice templates with HTML templates 2021-08-09 09:04:39 +00:00
nanoy
71e219735b Merge branch 'add_deposit_app' into 'dev'
feat: Create deposits app

See merge request re2o/re2o!622
2021-08-07 22:28:19 +00:00
369942e2e4 feat: Create deposits app 2021-08-07 22:28:18 +00:00
2efe778ed8 Merge branch 'fix_342' into 'dev'
fix: invalid function signature in DateTimePicker since django 2.1

See merge request re2o/re2o!619
2021-07-17 15:38:20 +00:00
avrstud
0b8ea4ccfb fix: #342 2021-07-15 23:29:08 +02:00
01e316914a Merge branch 'fix_set' into 'dev'
Fix : reverse set declaration

See merge request re2o/re2o!616
2021-07-06 12:15:33 +00:00
fb70401d63 fix set 2021-07-06 12:08:12 +00:00
ea4ebd5c08 Merge branch 'fix_pwd_ntlm' into 'dev'
fix: #339

See merge request re2o/re2o!615
2021-07-06 12:07:51 +00:00
avrstud
536c971ae6 fix: #339 2021-05-26 22:27:18 +02:00
17bf10a1d6 Merge branch 'radius_api' into 'dev'
feat: add radius api

See merge request re2o/re2o!614
2021-05-23 09:26:24 +00:00
5a5fb1befd change regex to remove a dos vuln 2021-05-23 10:45:40 +02:00
Jean-Romain Garnier
cf5756733d Tweak "magic split" comments 2021-05-20 23:20:51 +02:00
118f5af269 black 2021-05-17 22:01:09 +02:00
c5e21e05dd documentation 2021-05-17 16:57:33 +02:00
c15ec606c6 adapt radius api for django 2 2021-05-17 13:48:07 +02:00
2a6c09c808 add app name 2021-05-16 22:30:01 +02:00
e4789c6d8b documentation 2021-05-14 11:05:32 +00:00
303defa16d remove print 2021-05-14 10:58:05 +00:00
2381ae2169 Update views.py 2021-05-14 10:32:17 +00:00
1e6c6348b8 add slash support in apache conf 2021-05-13 19:46:26 +02:00
a234be0981 linter 2021-05-13 19:44:39 +02:00
f70b97677f separate radius from re2o repo 2021-05-13 19:33:56 +02:00
989410509d merge 2021-05-13 19:31:48 +02:00
425d47c52d merge 2021-05-13 19:31:27 +02:00
1bc5b51439 a few small fixes 2021-05-13 19:30:56 +02:00
f689d6640a add brand news ACL 2021-05-13 19:30:56 +02:00
ce862c2853 merge 2021-05-13 19:30:52 +02:00
d1a1d6613d merge 2021-05-13 19:29:49 +02:00
a323bf7d68 première passe de debug 2021-05-13 19:29:03 +02:00
01e7822d95 merge 2021-05-13 19:28:56 +02:00
8ba9fa2fa0 premiere version de l'api radius 2021-05-13 19:27:20 +02:00
8e370a15d9 merge 2021-05-13 19:26:54 +02:00
chirac
567c20a0f1 Merge branch 'fix_mandate_history' into 'dev'
fix: RegistrationError when accessing mandate history

See merge request re2o/re2o!612
2021-04-27 20:54:27 +00:00
Jean-Romain Garnier
a2bd34297d fix: RegistrationError when accessing mandate history 2021-04-27 19:24:07 +02:00
klafyvel
4fabd68ca3 Merge branch 'fix_318' into 'dev'
fix: 🎨 Better placement for forgetten password button (#318)

See merge request re2o/re2o!608
2021-02-28 09:38:47 +00:00
eb92e4d71a fix: 🎨 Better placement for forgetten password button (#318) 2021-02-28 09:28:24 +00:00
klafyvel
d1435720f4 Merge branch 'quick_fix_about' into 'dev'
fix: 🐛 Quick fix bug with MIDDLEWARE_CLASSES

See merge request re2o/re2o!610
2021-02-28 09:27:58 +00:00
f95babce51 fix: 🐛 Quick fix bug with MIDDLEWARE_CLASSES
Support for django 2.22 introduces the use of MIDDLEWARE instead of MIDDLEWARE_CLASSES. This change was not reflected everywhere, about function for instance.
2021-02-28 09:23:53 +00:00
klafyvel
848b5bb7a1 Merge branch 'docker' into 'dev'
feat: 🎨 Dev docker file in repository (Close #322)

See merge request re2o/re2o!607
2021-02-18 19:02:44 +00:00
e0ca9eb380 fix: ✏️ locale != local 2021-02-18 19:59:03 +01:00
639ff7f9b5 test: 🔥 Remove old test code 2021-02-18 19:59:03 +01:00
ce2e77546e fix: 🐛 Use correct settings in ldap_sync + typo 2021-02-18 19:59:03 +01:00
43b6a2cdf2 feat: Add dev docker support
Dockerfile and docker-compose files are now included in directory. They start a db, migrate, create a superuser if it doesn't already exists and start the server
2021-02-18 19:59:03 +01:00