ynerant
/
nk20
mirror of https://gitlab.crans.org/bde/nk20
1
0
Fork 0
Code Issues Releases Wiki Activity
1,489 Commits 20 Branches 4 Tags 27 MiB
Commit Graph

918 Commits

Author SHA1 Message Date
Yohann D'ANELLO d0206fb790 Make erdnaxe be happy 2020-03-07 22:28:59 +01:00
Yohann D'ANELLO 21fd121ba7 Add signup link, customize templates 2020-03-07 18:55:18 +01:00
Pierre-antoine Comby 663ee072d4 always save to png 2020-03-07 17:58:41 +01:00
Yohann D'ANELLO 09137dd9d7 Fix anonymous users issue 2020-03-07 16:45:45 +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 7e29f1d482 Merge remote-tracking branch 'origin/rights' into rights 2020-03-07 10:48:42 +01:00
Benjamin Graillot 5df1f42f43 [permission] Syntax error 2020-03-07 10:48:38 +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
Benjamin Graillot 8a9ad0a6e5 [permission] Handle add rights 2020-03-07 09:30:22 +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 14ccc8da75 Add ImageForm 2020-03-03 14:26:31 +01:00
Pierre-antoine Comby f992c117f4 rename second_form to profile_form 2020-03-03 14:25:16 +01:00
Pierre-antoine Comby 211859e940 add default profile pic 2020-03-03 14:24:07 +01:00
Pierre-antoine Comby 901454f338 rename template for consistency 2020-03-03 11:05:02 +01:00
Pierre-antoine Comby d5f718fbba start activity view and urls 2020-03-01 17:55:48 +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 9133c84ef2 comment bug 2020-02-28 13:49:50 +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 3764bc44ff Fix money creation, closes #25 2020-02-27 17:22:59 +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 bcee5f8f2f Don't log when there is no modification, or only when a user is connected 2020-02-27 15:53:06 +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
Yohann D'ANELLO d316c3130c Logs are created post save 2020-02-27 15:35:38 +01:00
Yohann D'ANELLO aecd3fc86f Update excluded models list 2020-02-27 15:30:16 +01:00
Yohann D'ANELLO 12ddfad254 Update JSON 2020-02-27 14:59:01 +01:00
Yohann D'ANELLO 2f51057f4c Add IP address to migrations 2020-02-27 14:47:34 +01:00
Yohann D'ANELLO 079e423343 Merge branch 'master' into logging 2020-02-27 14:36:27 +01:00
Yohann D'ANELLO 5995969a67 Detect migrations 2020-02-27 14:35:50 +01:00
Yohann D'ANELLO 1c762e5444 Trying to get IP 2020-02-27 13:34:38 +01:00
Yohann D'ANELLO 10854eb334 Update some excluded models 2020-02-26 23:55:40 +01:00
Yohann D'ANELLO 1c0bf21cbe Content type stored in logs instead of model name 2020-02-26 23:34:27 +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 25fc35c857 Merge branch 'import_nk15' into 'master' 
Import nk15

See merge request bde/nk20!23
 2020-02-25 20:31:41 +01:00
Pierre-antoine Comby 0cd0b11fa5 remove `name` Field of TemplateTransaction 
Redundant with `reason` from Transaction
 2020-02-25 14:15:59 +01:00
Pierre-antoine Comby 33eba8a403 add last_negative field to note 2020-02-25 14:15:36 +01:00
Pierre-antoine Comby 4e5e80978b Merge branch 'import_nk15' into 'master' 
Import nk15: rm import_nk15

See merge request bde/nk20!22
 2020-02-24 18:48:17 +01:00
Pierre-antoine Comby 5421943fba Merge branch 'import_nk15' of gitlab.crans.org:bde/nk20 into import_nk15 2020-02-24 18:44:10 +01:00
Benjamin Graillot 640e48b5df [note] no transaction_type 2020-02-24 18:33:51 +01:00
Yohann D'ANELLO fd529a53c8 Logging support 2020-02-24 18:18:44 +01:00
Pierre-antoine Comby 6ad7974612 import script is move to new repository 2020-02-24 14:17:48 +01:00
Benjamin Graillot c2fbb1bcdf Polymorphic transaction 2020-02-24 10:36:04 +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 f5a80dd0a5 fix typo 2020-02-23 21:05:51 +01:00
Pierre-antoine Comby 4de817bd75 Merge branch 'import_nk15' of gitlab.crans.org:bde/nk20 into import_nk15 2020-02-23 18:56:58 +01:00
Pierre-antoine Comby 7230f9c535 transaction_type -> category 2020-02-23 18:56:03 +01:00
Pierre-antoine Comby b18e5b03a4 add boutons import 2020-02-23 18:45:21 +01:00
Benjamin Graillot 40a7d3b295 [note] TransactionCategory --> TemplateCategory 2020-02-23 17:27:55 +01:00
Pierre-antoine Comby 126686ab03 add a TransactionType model 2020-02-23 16:50:14 +01:00
Pierre-antoine Comby f3ec0836f8 add display field to TransactionTemplate 2020-02-23 16:48:35 +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 201c5f667c add error_code to Exceptions 2020-02-23 13:46:25 +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
Pierre-antoine Comby cfd881887d add description field to transactionTemplates 2020-02-22 16:33:23 +01:00
erdnaxe ae90a957ce Merge branch 'master' into 'turbolinks' 
# Conflicts:
#   apps/note/views.py
 2020-02-22 11:09:45 +01:00
Alexandre Iooss 3597e79dc1
Dynamic tabs on conso view 2020-02-21 22:40:58 +01:00
Yohann D'ANELLO 9a0d74c18b Fix no cache in ConsoView 2020-02-21 19:46:56 +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 f3f13c5153 Reformat code, add some missing lines at end of files 2020-02-17 14:08:40 +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 6a4e0de444 Show autocompleted aliases instead of note names 2020-02-17 11:19:16 +01:00
Yohann D'ANELLO 52514f58d6 Show matched aliases in the autocompletion list 2020-02-17 01:13:14 +01:00
Yohann D'ANELLO 4bc342c668 Request for autocompletion is normalized 2020-02-16 23:39:54 +01:00
Yohann D'ANELLO 2e4464e982 Autocomplete note aliases for consos 2020-02-16 23:27:59 +01:00
Yohann D'ANELLO 4d7e552681 One import was missing 2020-02-16 22:29:27 +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
Benjamin Graillot 982a5ae009 [permission] Add F object support 2020-02-13 15:59:19 +01:00
Benjamin Graillot 2b49effebb [permission] Update admin 2020-02-09 18:30:37 +01:00
Benjamin Graillot 72955ae2d6 [permission] Renamed Permission.permission and added description field 2020-02-09 18:14:36 +01:00
Benjamin Graillot 94c3a99447 [permission] Rewrite with comments 2020-02-09 17:35:15 +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 596686497d Aliases are case insensitive 2020-02-08 23:49:39 +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
Yohann D'ANELLO c053235996 Autocomplete 2020-02-08 20:23:17 +01:00
Yohann D'ANELLO db218a2783 Add __init__ files 2020-02-08 18:27:27 +01:00
Yohann D'ANELLO 2880b5b3c7 Useless to search a note by its id (already implemented) 2020-02-08 17:37:26 +01:00
Yohann D'ANELLO dc87a5d77b Filter notes and aliases by aliases (regexp) or note type 2020-02-08 17:17:00 +01:00
Yohann D'ANELLO f54e2ed145 Aliases were missing 2020-02-08 15:08:55 +01:00
Pierre-antoine Comby 71a88e84f7 initiate import command 2020-02-07 22:23:37 +01:00
Yohann D'ANELLO d22350faf8 /note/user, /note/club, /note/special => /note 2020-02-07 20:51:25 +01:00
Yohann D'ANELLO f52a89637c Polymorphic types 2020-02-07 20:47:49 +01:00
Yohann D'ANELLO e8e22541fa Small fix 2020-02-07 17:10:35 +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 92fc92ba40 Add note models in API 2020-02-07 00:12:00 +01:00
Yohann D'ANELLO 5de93066db Add activity models in API 2020-02-06 23:49:33 +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 f4a665cb7f API 2020-02-06 23:29:17 +01:00
Yohann D'ANELLO c4a60633f8 Consos 2020-02-04 01:18:03 +01:00
Pierre-antoine Comby f13ccf11aa Merge branch 'master' of gitlab.crans.org:bde/nk20 2020-02-03 19:30:15 +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
Yohann D'ANELLO f02d1ab41c Better pretty money. Closes #3 2020-02-03 15:20:37 +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 cbf0f59373 An activity entry transaction is not mandatory. 2020-01-21 22:16:07 +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 3766a1905d [permission] track migrations directory 2019-09-18 16:44:04 +02:00
Benjamin Graillot 1ac63cbed1 [member] Handle unlimited memberships 2019-09-18 16:41:01 +02:00
Benjamin Graillot d826dc9d20 [permission] Permission admin view 2019-09-18 16:40:21 +02:00
Benjamin Graillot 2a4ab09753 [permission] Use full names for permission types 2019-09-18 16:39:37 +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
Benjamin Graillot fedfcf27b5 [note] Update normalize algorithm 2019-09-02 16:09:11 +00: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 a84031405e create Custom history table 2019-08-15 23:08:15 +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
PA a456468a71 Pretty print feature 
Prints the money of each user perfectly
 2019-08-14 16:02:43 +02:00
Alexandre Iooss 8f592ea239
Move locales to project root 2019-08-14 15:15:02 +02:00
Pierre-antoine Comby f51db8d0c6 pas deux conso avec le meme nom 2019-08-13 18:23:15 +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 4dead7edf2 improve transaction template management 2019-08-11 23:24:54 +02:00
Pierre-antoine Comby 8b4125a25d add templates forms and tags 2019-08-11 19:55:04 +02:00
Pierre-antoine Comby edbcf9629c add basic transactiontemplate handling 2019-08-11 19:54:18 +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