1
0
mirror of https://gitlab.crans.org/bde/nk20 synced 2024-12-04 22:26:52 +00:00
Commit Graph

369 Commits

Author SHA1 Message Date
Benjamin Graillot
c86ddf17ad [member] Check membership of parent club 2020-03-25 17:54:28 +01:00
Pierre-antoine Comby
a41e51e23a add member get side information 2020-03-25 17:42:54 +01:00
Pierre-antoine Comby
26d70c4ef9 page title and edit buttons 2020-03-25 17:25:44 +01:00
Pierre-antoine Comby
826573f553 whitespaces compliance 2020-03-25 16:58:15 +01:00
Pierre-antoine Comby
2d18cb983f fee in cents for fixture and initial picture 2020-03-25 16:12:57 +01:00
Pierre-antoine Comby
ff17f1e877 Club view should as good as profile ones 2020-03-25 16:11:44 +01:00
Benjamin Graillot
a4cb19e5b1 [member] Added parent_club field to Club 2020-03-23 09:07:39 +01:00
Yohann D'ANELLO
d494a3e7fa Quality assurance 2020-03-20 18:13:34 +01:00
Yohann D'ANELLO
091c427707 Restructurate code 2020-03-20 14:43:35 +01:00
Yohann D'ANELLO
3f2b21f7f4 Fix CI 2020-03-20 02:14:43 +01:00
Yohann D'ANELLO
6fc43e651e More optimisation 2020-03-20 01:46:59 +01:00
Yohann D'ANELLO
f80cb635d3 Optimize permissions, full support add perms, more fixtures 2020-03-20 00:06:28 +01:00
Yohann D'ANELLO
7794210cc8 Being superuser is not enough (must have the correct mask), add some initial fixtures 2020-03-19 18:53:06 +01:00
Yohann D'ANELLO
95315cdbe2 Implements permission masks 2020-03-19 16:12:52 +01:00
Yohann D'ANELLO
730d37c620 Protect views from viewing if the user has no right to view an object 2020-03-19 02:26:06 +01:00
Yohann D'ANELLO
057f42fdb6 Handle permissions (and it seems working!) 2020-03-18 14:42:35 +01:00
Yohann D'ANELLO
112d4b6c5a Merge branch 'consos' into rights
# Conflicts:
#	apps/logs/signals.py
#	note_kfet/settings/base.py
2020-03-17 21:11:14 +01:00
Yohann D'ANELLO
a1f37f0eea Validation/devalidation of a transaction on profile page 2020-03-17 17:48:55 +01:00
Yohann D'ANELLO
2bd59544ec Remove two whitespaces for tox 2020-03-11 17:10:16 +01:00
ynerant
46e472ed6d Merge branch 'master' into 'fix-what-i-broke'
# Conflicts:
#   templates/base.html
2020-03-11 17:03:44 +01:00
Benjamin Graillot
b17ff59984 Added indexes for Membership 2020-03-11 13:51:26 +01:00
Benjamin Graillot
c8f5451ea4 Added indexes for Transaction, Alias and Profile 2020-03-11 13:46:47 +01:00
Yohann D'ANELLO
417cd5da04 Improve REST API with filters 2020-03-11 11:15:03 +01:00
Yohann D'ANELLO
aa731d1ae4 Regexp must begin with ^ 2020-03-10 17:16:03 +01:00
Pierre-antoine Comby
0de2c18bec profile is first created via signal. 2020-03-09 18:08:37 +01:00
Yohann D'ANELLO
d0206fb790 Make erdnaxe be happy 2020-03-07 22:28:59 +01:00
Pierre-antoine Comby
663ee072d4 always save to png 2020-03-07 17:58:41 +01:00
Yohann D'ANELLO
30ce17b644 Update a lot of things 2020-03-07 13:12:17 +01:00
Yohann D'ANELLO
a014a97e14 Merge remote-tracking branch 'origin/rights' into rights 2020-03-07 11:21:08 +01:00
Benjamin Graillot
9d61e217e9 [permission] Only split permission up to 3 2020-03-07 11:21:19 +01:00
Yohann D'ANELLO
0884270474 Merge branch 'master' into rights
# Conflicts:
#	note_kfet/settings/base.py
2020-03-07 10:42:51 +01:00
ynerant
6f7374710b Merge branch 'master' into 'logging'
# Conflicts:
#   locale/de/LC_MESSAGES/django.po
#   locale/fr/LC_MESSAGES/django.po
2020-03-07 10:32:17 +01:00
Pierre-antoine Comby
38feb693f3 crop,resized, and save picture at the right place 2020-03-06 20:07:15 +01:00
Pierre-antoine Comby
08b97e722b add support for cropping image. WIP. 2020-03-05 23:32:01 +01:00
Pierre-antoine Comby
2e8505e9b4 ménage dans les imports 2020-03-04 16:34:52 +01:00
Pierre-antoine Comby
fd74080ce3 profile picture update view is working 2020-03-04 16:34:12 +01:00
Pierre-antoine Comby
c4198a64af add button for profile pic view 2020-03-03 14:45:50 +01:00
Pierre-antoine Comby
f992c117f4 rename second_form to profile_form 2020-03-03 14:25:16 +01:00
Pierre-antoine Comby
901454f338 rename template for consistency 2020-03-03 11:05:02 +01:00
Pierre-antoine Comby
b7e68722aa front improvement on alias page 2020-03-01 16:20:13 +01:00
Pierre-antoine Comby
35d5bcdf0f Deletion of alias now possible! 2020-03-01 00:25:53 +01:00
Pierre-antoine Comby
27391049f2 remove duplicated form 2020-02-28 16:12:35 +01:00
Pierre-antoine Comby
db95944574 add delete boutons, work with only one alias 2020-02-28 15:25:45 +01:00
Pierre-antoine Comby
c77bc0c032 add deleteView for aliases 2020-02-28 13:52:15 +01:00
Pierre-antoine Comby
f77351b444 Add view for aliases 2020-02-28 13:37:31 +01:00
Pierre-antoine Comby
0ea0d77707 fix #27 2020-02-27 20:56:06 +01:00
Yohann D'ANELLO
b23237f669 Uncomment required line 2020-02-27 16:26:07 +01:00
Yohann D'ANELLO
9cd050e2f0 Logging is finally processed at post saved, but old instance is querried 2020-02-27 16:25:18 +01:00
Yohann D'ANELLO
125f437345 Profiles are saved after the user 2020-02-27 15:41:15 +01:00
Yohann D'ANELLO
3c52c1d002 Users have now automatically an attached profile to a user (fix an old bug) 2020-02-27 15:36:12 +01:00
Pierre-antoine Comby
707770a5b4 fix #28 2020-02-25 22:55:27 +01:00
Pierre-antoine Comby
eb6f142bf8 autofocus of signup form on first field 2020-02-25 22:26:43 +01:00
Pierre-antoine Comby
6ad7974612 import script is move to new repository 2020-02-24 14:17:48 +01:00
Pierre-antoine Comby
9207c5cdec add aliases import 2020-02-23 21:11:42 +01:00
Pierre-antoine Comby
e850c5755b clean code, dont activate user 2020-02-23 21:10:48 +01:00
Pierre-antoine Comby
b18e5b03a4 add boutons import 2020-02-23 18:45:21 +01:00
Pierre-antoine Comby
ea5737ac8f refactoring in atomic function 2020-02-23 16:43:13 +01:00
Pierre-antoine Comby
889ddc15f8 handle password the correct way 2020-02-23 14:23:02 +01:00
Pierre-antoine Comby
efe32e45bf Merge branch 'import_nk15' of gitlab.crans.org:bde/nk20 into import_nk15 2020-02-23 13:54:19 +01:00
Pierre-antoine Comby
8feb2ec52a Merge branch 'patch_passwords' into 'import_nk15'
Import NK15 passwords

See merge request bde/nk20!12
2020-02-23 13:54:02 +01:00
Pierre-antoine Comby
f47d803a2c import comptes table 2020-02-23 13:47:12 +01:00
Pierre-antoine Comby
5af0058858 Merge branch 'master' into import_nk15 2020-02-22 22:15:51 +01:00
Pierre-antoine Comby
c8dd41c1d7 Merge branch 'initial_fixtures' into 'master'
Initial fixtures

See merge request bde/nk20!13
2020-02-22 22:00:36 +01:00
Pierre-antoine Comby
f1b442932f Use membership parameters according to BDE status 2020-02-22 21:56:02 +01:00
Pierre-antoine Comby
0db2881468 Merge branch 'master' into import_nk15 2020-02-22 16:34:17 +01:00
Yohann D'ANELLO
3fd99ebac7 Ability to disable cache storage 2020-02-21 18:28:21 +01:00
Alexandre Iooss
b395d3a633
Overflow on collapsing tables and Bootstrap4 style 2020-02-21 12:29:11 +01:00
Alexandre Iooss
45ce2eab9e
Two colomn profile page 2020-02-21 11:53:37 +01:00
Alexandre Iooss
43fd765a34
Title on profile update page 2020-02-21 11:17:14 +01:00
Alexandre Iooss
a304f6a97d
Some initial data 2020-02-20 22:10:10 +01:00
Yohann D'ANELLO
e28b19b353 Import NK15 passwords 2020-02-20 10:26:00 +01:00
Pierre-antoine Comby
4fe61fdc5f fix json file format
test struct of json

json file finish
2020-02-19 19:23:10 +01:00
Alexandre Iooss
204fe53047
Remove broken code 2020-02-18 21:47:03 +01:00
Alexandre Iooss
4bbd464f9c
Unify file headers 2020-02-18 21:30:26 +01:00
Alexandre Iooss
e679a4b629
Fix formatting issues 2020-02-18 21:14:29 +01:00
Alexandre Iooss
f89d91e524
Format code 2020-02-18 12:31:15 +01:00
Alexandre Iooss
55722b801a
Split API in each app 2020-02-18 11:58:42 +01:00
Yohann D'ANELLO
987b898a33 Auth token is hidden 2020-02-17 23:30:55 +01:00
Yohann D'ANELLO
b7383b35f7 Manage auth token 2020-02-17 21:32:08 +01:00
Yohann D'ANELLO
559445c8b4 Add some decoration 2020-02-17 19:44:56 +01:00
Yohann D'ANELLO
55977bcbe7 Token authentication 2020-02-17 19:25:33 +01:00
Yohann D'ANELLO
c884cbb0ad Add some comments 2020-02-17 11:36:46 +01:00
Yohann D'ANELLO
3ce5f31411 Cannot set username that is similar to an alias we don't own 2020-02-17 11:21:05 +01:00
Yohann D'ANELLO
00d560c20e Merge branch 'master' into api
# Conflicts:
#	apps/note/forms.py
#	apps/note/urls.py
#	apps/note/views.py
2020-02-16 22:25:00 +01:00
Pierre-antoine Comby
9cc0731ded Merge branch 'consos' into 'master'
Consos

See merge request bde/nk20!7
2020-02-09 15:47:19 +01:00
Yohann D'ANELLO
732f8bc3d8 Préparation du code pour le système de droits & filtrage par type de note pour l'auto-complétion 2020-02-08 23:24:49 +01:00
Yohann D'ANELLO
142b3359e3 Comment some code 2020-02-08 21:40:32 +01:00
Yohann D'ANELLO
ce012400e1 Club members autocomplete 2020-02-08 20:39:37 +01:00
Pierre-antoine Comby
71a88e84f7 initiate import command 2020-02-07 22:23:37 +01:00
Yohann D'ANELLO
5633f0123d Clean code 2020-02-07 17:02:07 +01:00
Yohann D'ANELLO
c28884114c Add some doc 2020-02-07 00:29:04 +01:00
Yohann D'ANELLO
8e2b0688b5 Add member models in API 2020-02-06 23:44:59 +01:00
Yohann D'ANELLO
edc428a05e Add member models in API 2020-02-06 23:43:56 +01:00
Yohann D'ANELLO
c4a60633f8 Consos 2020-02-04 01:18:03 +01:00
Pierre-antoine Comby
b9c3ab5ea8 add a profile_update view 2020-02-03 19:28:51 +01:00
Pierre-antoine Comby
e80163ce4d fix signup 2020-02-03 19:24:23 +01:00
Pierre-antoine Comby
37a5b578a4 Create user and profile with all field needed 2020-02-02 15:42:39 +01:00
Pierre-antoine Comby
5a7d779a90 Add/ Complete docstring for every models. 2020-01-21 22:06:06 +01:00
Pierre-antoine Comby
e2d32b11e2 remove trailing whitespace and add docstrings 2019-09-23 12:54:08 +02:00
Pierre-antoine Comby
07d1cd225b [member] add user list and filter 2019-09-23 12:50:14 +02:00
Benjamin Graillot
1ac63cbed1 [member] Handle unlimited memberships 2019-09-18 16:41:01 +02:00
Benjamin Graillot
5a831136ae Merge branch 'master' into rights 2019-09-18 14:50:36 +02:00
Benjamin Graillot
67d1d9f7b7 Added permission app 2019-09-18 14:26:42 +02:00
Pierre-antoine Comby
7a7cc2bfef minor fixes 2019-08-15 23:12:27 +02:00
Pierre-antoine Comby
3bda5576dd use history table for club detail view 2019-08-15 23:11:52 +02:00
Pierre-antoine Comby
be8f2dc35b use accordion + history table for profil view 2019-08-15 23:11:16 +02:00
Pierre-antoine Comby
cc41409f5e Merge branch 'master' into 'app_member'
# Conflicts:
#   apps/member/views.py
2019-08-15 19:53:40 +00:00
Pierre-antoine Comby
10f7ef4045 Club list is now clickable 2019-08-15 21:52:10 +02:00
Pierre-antoine Comby
9fe47229fd Detail view of club: member list and history 2019-08-15 21:49:59 +02:00
Pierre-antoine Comby
e1431870d4 Club list is now clickable 2019-08-15 21:49:32 +02:00
Pierre-antoine Comby
40c697e57f interface pour ajouter des membres à un club 2019-08-14 18:47:46 +02:00
PA
66b70e69f3 Add transaction history list on the user 2019-08-14 16:42:05 +02:00
Alexandre Iooss
8f592ea239
Move locales to project root 2019-08-14 15:15:02 +02:00
Pierre-antoine Comby
a0c32890a9 add basic profile page 2019-08-12 00:30:29 +02:00
Pierre-antoine Comby
3cce57695d add basic club management 2019-08-11 23:25:27 +02:00
Pierre-antoine Comby
13d67c26bf add simple docstrings 2019-08-11 17:52:41 +02:00
Pierre-antoine Comby
4a52272558 fix sign up forms 2019-08-11 17:39:05 +02:00
Pierre-antoine Comby
633663f95d add signup view 2019-08-11 16:22:52 +02:00
Pierre-antoine Comby
fd9b9c34c7 move apps to own dir 2019-08-11 14:47:44 +02:00