quark
|
e79ed6226a
|
Merge branch 'quark-main-patch-51348' into 'main'
Upload New Migration (change bde)
See merge request bde/nk20!238
|
2024-03-11 16:28:41 +01:00 |
|
quark
|
68152e6354
|
Upload New Migration (change bde)
|
2024-03-11 16:11:54 +01:00 |
|
quark
|
b8cc297baf
|
Merge branch 'quark-main-patch-c661' into 'main'
Update facture template
See merge request bde/nk20!236
|
2024-03-09 16:25:45 +01:00 |
|
quark
|
cd8224f2e0
|
Upload New File
|
2024-03-09 16:06:39 +01:00 |
|
quark
|
3c882a7854
|
Delete RavePartlist_bg.png
|
2024-03-09 16:06:01 +01:00 |
|
quark
|
357e1bbaa2
|
Replace RavePartlist_bg.png
|
2024-03-09 16:05:29 +01:00 |
|
quark
|
f5c4c58525
|
Replace RavePartlist_bg.png
|
2024-03-09 14:03:17 +01:00 |
|
quark
|
dafb602b08
|
Update models.py
|
2024-03-09 13:40:45 +01:00 |
|
quark
|
5b377e6a75
|
Update facture template
|
2024-03-09 13:04:33 +01:00 |
|
bleizi
|
28bd62531e
|
Merge branch 'docs-append' into 'main'
Add : Documentation years flag for Extract ML Registrations
See merge request bde/nk20!235
|
2024-03-08 19:51:12 +01:00 |
|
rlali
|
b3a31c27a5
|
Add : Documentation years flag for Extract ML Registrations
|
2024-03-08 19:34:48 +01:00 |
|
bleizi
|
c7a8e6a1a5
|
Merge branch 'fin_de_campagne' into 'main'
Remove BDE compaign banner
See merge request bde/nk20!234
|
2024-02-16 16:58:42 +01:00 |
|
bleizi
|
546a3a72b1
|
Remove BDE compaign banner
|
2024-02-15 10:32:39 +01:00 |
|
charliep
|
2e5664f79d
|
Merge branch 'Compromis' into 'main'
Update base.html compromis
See merge request bde/nk20!233
|
2024-02-13 23:27:32 +01:00 |
|
charliep
|
e367666fe9
|
Update base.html compromis
|
2024-02-13 23:27:11 +01:00 |
|
charliep
|
04a9b3daf0
|
Merge branch 'Revanche' into 'main'
Update base.html
See merge request bde/nk20!232
|
2024-02-13 21:25:16 +01:00 |
|
charliep
|
d1df8f3eac
|
Update base.html
📢Pour la meilleure liste BDE
|
2024-02-13 21:24:23 +01:00 |
|
nicomarg
|
a5221f66ef
|
Merge branch 'main' into 'main'
Compaign banner
See merge request bde/nk20!231
|
2024-02-13 14:58:31 +01:00 |
|
mcngnt
|
7d59cd6cd2
|
Compaign banner
|
2024-02-13 14:26:28 +01:00 |
|
bleizi
|
0db0474217
|
Merge branch 'Update_2024_Copyright' into 'main'
Update 131 files
See merge request bde/nk20!229
|
2024-02-11 17:29:46 +01:00 |
|
bleizi
|
2b3eb15f59
|
fix one copyright and a string before merge
|
2024-02-11 16:58:53 +01:00 |
|
charliep
|
a6b479db19
|
Update 131 files
- /apps/activity/api/serializers.py
- /apps/activity/api/urls.py
- /apps/activity/api/views.py
- /apps/activity/tests/test_activities.py
- /apps/activity/__init__.py
- /apps/activity/admin.py
- /apps/activity/apps.py
- /apps/activity/forms.py
- /apps/activity/tables.py
- /apps/activity/urls.py
- /apps/activity/views.py
- /apps/api/__init__.py
- /apps/api/apps.py
- /apps/api/serializers.py
- /apps/api/tests.py
- /apps/api/urls.py
- /apps/api/views.py
- /apps/api/viewsets.py
- /apps/logs/signals.py
- /apps/logs/apps.py
- /apps/logs/__init__.py
- /apps/logs/api/serializers.py
- /apps/logs/api/urls.py
- /apps/logs/api/views.py
- /apps/member/api/serializers.py
- /apps/member/api/urls.py
- /apps/member/api/views.py
- /apps/member/templatetags/memberinfo.py
- /apps/member/__init__.py
- /apps/member/admin.py
- /apps/member/apps.py
- /apps/member/auth.py
- /apps/member/forms.py
- /apps/member/hashers.py
- /apps/member/signals.py
- /apps/member/tables.py
- /apps/member/urls.py
- /apps/member/views.py
- /apps/note/api/serializers.py
- /apps/note/api/urls.py
- /apps/note/api/views.py
- /apps/note/models/__init__.py
- /apps/note/static/note/js/consos.js
- /apps/note/templates/note/mails/negative_balance.txt
- /apps/note/templatetags/getenv.py
- /apps/note/templatetags/pretty_money.py
- /apps/note/tests/test_transactions.py
- /apps/note/__init__.py
- /apps/note/admin.py
- /apps/note/apps.py
- /apps/note/forms.py
- /apps/note/signals.py
- /apps/note/tables.py
- /apps/note/urls.py
- /apps/note/views.py
- /apps/permission/api/serializers.py
- /apps/permission/api/urls.py
- /apps/permission/api/views.py
- /apps/permission/templatetags/perms.py
- /apps/permission/tests/test_oauth2.py
- /apps/permission/tests/test_permission_denied.py
- /apps/permission/tests/test_permission_queries.py
- /apps/permission/tests/test_rights_page.py
- /apps/permission/__init__.py
- /apps/permission/admin.py
- /apps/permission/backends.py
- /apps/permission/apps.py
- /apps/permission/decorators.py
- /apps/permission/permissions.py
- /apps/permission/scopes.py
- /apps/permission/signals.py
- /apps/permission/tables.py
- /apps/permission/urls.py
- /apps/permission/views.py
- /apps/registration/tests/test_registration.py
- /apps/registration/__init__.py
- /apps/registration/apps.py
- /apps/registration/forms.py
- /apps/registration/tables.py
- /apps/registration/tokens.py
- /apps/registration/urls.py
- /apps/registration/views.py
- /apps/treasury/api/serializers.py
- /apps/treasury/api/urls.py
- /apps/treasury/api/views.py
- /apps/treasury/templatetags/escape_tex.py
- /apps/treasury/tests/test_treasury.py
- /apps/treasury/__init__.py
- /apps/treasury/admin.py
- /apps/treasury/apps.py
- /apps/treasury/forms.py
- /apps/treasury/signals.py
- /apps/treasury/tables.py
- /apps/treasury/urls.py
- /apps/treasury/views.py
- /apps/wei/api/serializers.py
- /apps/wei/api/urls.py
- /apps/wei/api/views.py
- /apps/wei/forms/surveys/__init__.py
- /apps/wei/forms/surveys/base.py
- /apps/wei/forms/surveys/wei2021.py
- /apps/wei/forms/surveys/wei2022.py
- /apps/wei/forms/surveys/wei2023.py
- /apps/wei/forms/__init__.py
- /apps/wei/forms/registration.py
- /apps/wei/management/commands/export_wei_registrations.py
- /apps/wei/management/commands/import_scores.py
- /apps/wei/management/commands/wei_algorithm.py
- /apps/wei/templates/wei/weilist_sample.tex
- /apps/wei/tests/test_wei_algorithm_2021.py
- /apps/wei/tests/test_wei_algorithm_2022.py
- /apps/wei/tests/test_wei_algorithm_2023.py
- /apps/wei/tests/test_wei_registration.py
- /apps/wei/__init__.py
- /apps/wei/admin.py
- /apps/wei/apps.py
- /apps/wei/tables.py
- /apps/wei/urls.py
- /apps/wei/views.py
- /note_kfet/settings/__init__.py
- /note_kfet/settings/base.py
- /note_kfet/settings/development.py
- /note_kfet/settings/secrets_example.py
- /note_kfet/static/js/base.js
- /note_kfet/admin.py
- /note_kfet/inputs.py
- /note_kfet/middlewares.py
- /note_kfet/urls.py
- /note_kfet/views.py
- /note_kfet/wsgi.py
- /entrypoint.sh
|
2024-02-07 02:26:49 +01:00 |
|
charliep
|
048d251f75
|
Merge branch 'charliep-main-patch-40779' into 'main'
update Copyright 2024
See merge request bde/nk20!228
|
2024-02-07 02:05:59 +01:00 |
|
charliep
|
7b11cb0797
|
update Copyright 2024
|
2024-02-07 01:37:43 +01:00 |
|
bleizi
|
ff3c30517e
|
Merge branch 'happy-new-year' into 'main'
happy new year
See merge request bde/nk20!226
|
2024-01-11 16:48:06 +01:00 |
|
bleizi
|
f481ea6acb
|
happy new year (contain annually WEI change and update to follow Django Style Guide)
|
2024-01-11 16:32:37 +01:00 |
|
nicomarg
|
802fd8c2d7
|
Merge branch 'search_conso_bugfix' into 'main'
Bugfix
See merge request bde/nk20!225
|
2023-11-13 14:29:29 +01:00 |
|
Nicolas Margulies
|
5209a586a9
|
Fixed const being redeclared when script is reevaluated
|
2023-11-08 17:10:05 +01:00 |
|
nicomarg
|
24f54ac876
|
Merge branch 'search-conso' into 'main'
Added a search tab for the conso page, fixes #58
Closes #58
See merge request bde/nk20!224
|
2023-10-27 16:45:41 +02:00 |
|
Nicolas Margulies
|
988b4c9e88
|
Linting
|
2023-10-26 21:03:48 +02:00 |
|
Nicolas Margulies
|
e32c267995
|
Moved js code to the external conso file
|
2023-10-26 19:10:43 +02:00 |
|
Nicolas Margulies
|
5e39209ab1
|
Made searchbar completely client-based
|
2023-10-26 19:01:09 +02:00 |
|
Nicolas Margulies
|
08b2fabe07
|
Removing jquery means changing the event API...
|
2023-10-26 00:22:51 +02:00 |
|
Nicolas Margulies
|
405479e5ad
|
Execute script to add behavior to searched buttons
|
2023-10-26 00:10:56 +02:00 |
|
Nicolas Margulies
|
0cc130092f
|
Added a search tab for the conso page
|
2023-10-25 20:01:48 +02:00 |
|
charliep
|
ff6e207512
|
Merge branch 'beta' into 'main'
check for a model in permission and use that in treasury
See merge request bde/nk20!222
|
2023-09-29 12:08:00 +02:00 |
|
bleizi
|
0f1e4d2e60
|
check for a model in permission and use that in treasury
|
2023-09-28 18:48:57 +02:00 |
|
nicomarg
|
6255bcbbb1
|
Merge branch 'beta' into 'main'
Merge beta
See merge request bde/nk20!221
|
2023-09-27 17:14:49 +02:00 |
|
Nicolas Margulies
|
d82a1001c4
|
Moved transaction through frienships right to basic rights
|
2023-09-27 16:55:00 +02:00 |
|
Nicolas Margulies
|
31a54482f0
|
Updated doc to tell maintainers to create psql superusers
|
2023-09-27 16:53:30 +02:00 |
|
nicomarg
|
4ee02345d4
|
Merge branch 'better-friendship-view' into 'main'
Rework of the friendships page
See merge request bde/nk20!220
|
2023-09-21 15:48:00 +02:00 |
|
bleizi
|
422c087d17
|
fix wei test
|
2023-09-20 07:04:13 +02:00 |
|
Nicolas Margulies
|
30d6e2c95e
|
Added trusts to note admin site
|
2023-09-19 15:07:30 +02:00 |
|
Nicolas Margulies
|
f3a3f07e38
|
Tweaked message and did missing french translations
|
2023-09-18 17:29:52 +02:00 |
|
Nicolas Margulies
|
a5e802f370
|
Improved the error message when trying to duplicate a Trust
|
2023-09-18 17:12:31 +02:00 |
|
Nicolas Margulies
|
540f3bc354
|
regenerated messages so locations are consistent with codebase
|
2023-09-02 00:04:54 +02:00 |
|
elkmaennchen
|
2d19457506
|
Add spanish translation for friendship
|
2023-09-01 17:35:52 +02:00 |
|
Nicolas Margulies
|
72786d0d2b
|
Translated js strings, unified some case
|
2023-09-01 17:34:52 +02:00 |
|
Nicolas Margulies
|
f099cbc879
|
Linting
|
2023-09-01 17:32:29 +02:00 |
|
Nicolas Margulies
|
977eb7c0d4
|
Generated translation files, did french
|
2023-09-01 17:30:38 +02:00 |