1799 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
bleizi	eb355f547c	Merge branch 'SogeNotForMembership' into 'main' ... Soge not for membership See merge request bde/nk20!202	2022-09-04 22:56:07 +02:00
Yoann Beaugnon	7068170f18	fixing grammar in comments	2022-09-04 13:24:39 +02:00
Théo Le Moigne	45ee9a8941	Soge only payd WEI (not bde/kfet membership)	2022-09-04 12:52:40 +02:00
Théo Le Moigne	454ea19603	hide Soge during registration	2022-09-04 12:31:08 +02:00
ynerant	5a77a66391	Merge branch 'beta' into 'main' ... Friendships See merge request bde/nk20!200	2022-04-13 12:45:06 +02:00
elkmaennchen	761fc170eb	Update Spanish translation	2022-04-13 12:30:22 +02:00
Nicolas Margulies	ac23d7eb54	Generated translation files for de/es (but didn't translate anything)	2022-04-13 12:30:22 +02:00
Nicolas Margulies	40e7415062	Added translations for friendships	2022-04-13 12:30:22 +02:00
Nicolas Margulies	319405d2b1	Added a message to explain what frendships do ... Signed-off-by: Nicolas Margulies <nicomarg@crans.org>	2022-04-13 12:30:22 +02:00
Nicolas Margulies	633ab88b04	Linting	2022-04-13 12:30:22 +02:00
Nicolas Margulies	e29b42eecc	Add permissions related to trusting	2022-04-13 12:30:22 +02:00
Nicolas Margulies	dc69faaf1d	Better user search to add friendships	2022-04-13 12:30:22 +02:00
Nicolas Margulies	442a5c5e36	First proro of trusting, with models and front, but no additional permissions	2022-04-13 12:30:22 +02:00
Nicolas Margulies	7ab0fec3bc	Added trust model	2022-04-13 12:30:22 +02:00
aeltheos	bd4fb23351	Merge branch 'color_survi' into 'main' ... switching to survivalist color See merge request bde/nk20!199	2022-04-12 20:16:55 +02:00
Yoann Beaugnon	ee22e9b3b6	fixing color to follow the proper theme	2022-04-12 18:33:22 +02:00
Yoann Beaugnon	19ae616fb4	switching to survivalist color	2022-04-12 17:40:52 +02:00
Otthorn	b7657ec362	Merge branch 'color_ttlsp' into 'main' ... Passage des couleur vers ttlsp See merge request bde/nk20!197	2022-04-05 15:05:41 +02:00
parpaing	4d03d9460d	Passage des couleurs ttlsp	2022-04-05 14:45:41 +02:00
ynerant	3633f66a87	Merge branch 'beta' into 'main' ... Corrections de bugs See merge request bde/nk20!195	2022-03-09 15:10:37 +01:00
ynerant	d43fbe7ac6	Merge branch 'harden' into 'beta' ... Harden Django project configuration See merge request bde/nk20!194	2022-03-09 12:30:23 +01:00
Alexandre Iooss	df5f9b5f1e	Harden Django project configuration ... Set session and CSRF cookies as secure for production. Set HSTS header to let browser remember HTTPS for 1 year.	2022-03-09 12:12:56 +01:00
Yohann D'ANELLO	4161248bff	Add permissions to view/create/change/delete OAuth2 applications ... Signed-off-by: Yohann D'ANELLO <ynerant@crans.org>	2022-03-09 12:06:19 +01:00
Yohann D'ANELLO	58136f3c48	Fix permission checks in the /api/me view ... Signed-off-by: Yohann D'ANELLO <ynerant@crans.org>	2022-03-09 11:45:24 +01:00
Yohann D'ANELLO	d9b4e0a9a9	Fix membership tables for clubs without an ending membership date ... Signed-off-by: Yohann D'ANELLO <ynerant@crans.org>	2022-02-13 17:53:05 +01:00
Yohann D'ANELLO	8563a8d235	Fix membership tables for clubs without an ending membership date ... Signed-off-by: Yohann D'ANELLO <ynerant@crans.org>	2022-02-13 17:51:22 +01:00
ynerant	5f69232560	Merge branch 'beta' into 'main' ... Optional scopes + small bug fix See merge request bde/nk20!193	2022-02-12 14:37:58 +01:00
Yohann D'ANELLO	d3273e9ee2	Prepare WEI 2022 (because tests are broken) ... Signed-off-by: Yohann D'ANELLO <ynerant@crans.org>	2022-02-12 14:24:32 +01:00
ynerant	4e30f805a7	Merge branch 'optional-scopes' into 'beta' ... Implement optional scopes : clients can request scopes, but they are not guaranteed to get them See merge request bde/nk20!192	2022-02-12 13:57:19 +01:00
Yohann D'ANELLO	546e422e64	Ensure some values exist before updating them ... Signed-off-by: Yohann D'ANELLO <ynerant@crans.org>	2022-02-12 13:56:07 +01:00
Yohann D'ANELLO	9048a416df	In the /api/me page, display note, profile and memberships only if we have associated permissions ... Signed-off-by: Yohann D'ANELLO <ynerant@crans.org>	2021-12-23 23:25:18 +01:00
Yohann D'ANELLO	8578bd743c	Add documentation about optional scopes ... Signed-off-by: Yohann D'ANELLO <ynerant@crans.org>	2021-12-23 22:15:06 +01:00
Yohann D'ANELLO	45a10dad00	Refresh token expire between 14 days ... Signed-off-by: Yohann D'ANELLO <ynerant@crans.org>	2021-12-23 22:00:08 +01:00
Yohann D'ANELLO	18a1282773	Implement optional scopes : clients can request scopes, but they are not guaranteed to get them ... Signed-off-by: Yohann D'ANELLO <ynerant@crans.org>	2021-12-23 21:59:37 +01:00
Yohann D'ANELLO	132afc3d15	Fix scope view ... Signed-off-by: Yohann D'ANELLO <ynerant@crans.org>	2021-12-15 18:59:23 +01:00
Yohann D'ANELLO	6bf16a181a	[ansible] Deploy buster-backports repository only on Debian 10 ... Signed-off-by: Yohann D'ANELLO <ynerant@crans.org>	2021-12-15 15:59:58 +01:00
Yohann D'ANELLO	e20df82346	Main branch is now called main ... Signed-off-by: Yohann D'ANELLO <ynerant@crans.org>	2021-12-15 15:55:13 +01:00
ynerant	1eb72044c2	Merge branch 'beta' into 'master' ... Changements variés et mineurs Closes #107 et #91 See merge request bde/nk20!191	2021-12-13 21:16:26 +01:00
Yohann D'ANELLO	f88eae924c	Use local version of Turbolinks instead of using Cloudfare ... Signed-off-by: Yohann D'ANELLO <ynerant@crans.org>	2021-12-13 21:00:34 +01:00
Yohann D'ANELLO	4b6e3ba546	Display club transactions only with note rights, fixes #107 ... Signed-off-by: Yohann D'ANELLO <ynerant@crans.org>	2021-12-13 20:01:00 +01:00
ynerant	bf0fe3479f	Merge branch 'lock-club-notes' into 'beta' ... Verrouillage de notes See merge request bde/nk20!190	2021-12-13 18:55:03 +01:00
Yohann D'ANELLO	45ba4f9537	Linting ... Signed-off-by: Yohann D'ANELLO <ynerant@crans.org>	2021-12-13 18:33:18 +01:00
Yohann D'ANELLO	b204805ce2	Add permissions to (un)lock club notes ... Signed-off-by: Yohann D'ANELLO <ynerant@crans.org>	2021-12-13 18:31:36 +01:00
Yohann D'ANELLO	2f28e34cec	Fix permissions to lock our own note ... Signed-off-by: Yohann D'ANELLO <ynerant@crans.org>	2021-12-13 18:27:24 +01:00
Yohann D'ANELLO	9c8ea2cd41	Club notes can now be locked through web interface ... Signed-off-by: Yohann D'ANELLO <ynerant@crans.org>	2021-12-13 17:48:20 +01:00
ynerant	41289857b2	Merge branch 'tirage-au-sort' into 'beta' ... Boutons See merge request bde/nk20!189	2021-12-13 17:37:13 +01:00
Yohann D'ANELLO	28a8792c9f	[activity] Add space before line breaks in Wiki export of activities ... Signed-off-by: Yohann D'ANELLO <ynerant@crans.org>	2021-12-13 17:30:13 +01:00
Yohann D'ANELLO	58cafad032	Sort buttons by category name instead of id in button list ... Signed-off-by: Yohann D'ANELLO <ynerant@crans.org>	2021-12-13 17:19:10 +01:00
Yohann D'ANELLO	7848cd9cc2	Don't search buttons by prefix ... Signed-off-by: Yohann D'ANELLO <ynerant@crans.org>	2021-12-13 17:18:54 +01:00
Yohann D'ANELLO	d18ccfac23	Sort aliases by normalized name in profile alias view ... Signed-off-by: Yohann D'ANELLO <ynerant@crans.org>	2021-12-13 17:18:54 +01:00