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

350 Commits

Author SHA1 Message Date
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