ynerant
|
46e472ed6d
|
Merge branch 'master' into 'fix-what-i-broke'
# Conflicts:
# templates/base.html
|
2020-03-11 17:03:44 +01:00 |
|
Yohann D'ANELLO
|
6c2cdf0667
|
Remove warning when no user is detected while a modification is made
|
2020-03-11 16:10:26 +01:00 |
|
Yohann D'ANELLO
|
523e27694a
|
Remove useless code
|
2020-03-11 15:14:51 +01:00 |
|
Yohann D'ANELLO
|
58ea6abce4
|
Fix template tags to make tox happy
|
2020-03-11 15:13:34 +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
|
a128ed4803
|
Use environment rather than hardcoding strings, closes #36
|
2020-03-11 13:24:48 +01:00 |
|
Yohann D'ANELLO
|
06c97d75a0
|
Logs are decreasing ordered
|
2020-03-11 12:41:44 +01:00 |
|
Yohann D'ANELLO
|
f082f8523a
|
Update translations
|
2020-03-11 12:05:29 +01:00 |
|
Yohann D'ANELLO
|
b89028b3dc
|
Add models in the API
|
2020-03-11 11:37:47 +01:00 |
|
Yohann D'ANELLO
|
2c440062ce
|
Changelogs are read-only protected
|
2020-03-11 11:33:14 +01:00 |
|
Yohann D'ANELLO
|
1379759803
|
Changelogs are read-only protected
|
2020-03-11 11:25:40 +01:00 |
|
Yohann D'ANELLO
|
417cd5da04
|
Improve REST API with filters
|
2020-03-11 11:15:03 +01:00 |
|
Yohann D'ANELLO
|
bc97eb1eb4
|
Add logs to the API (this right should only be given to superusers)
|
2020-03-11 10:08:28 +01:00 |
|
Yohann D'ANELLO
|
38ad870939
|
Add one missing model to the API
|
2020-03-11 01:03:15 +01:00 |
|
Yohann D'ANELLO
|
0f1d662d25
|
Anonymous users don't have any access to the API (fix it later with rights...), fix CI
|
2020-03-11 00:47:43 +01:00 |
|
Yohann D'ANELLO
|
be877276f8
|
Fix JSON serialization
|
2020-03-11 00:41:37 +01:00 |
|
Pierre-antoine Comby
|
8abc789895
|
fix parameter name, works better.
|
2020-03-10 20:17:56 +01:00 |
|
Yohann D'ANELLO
|
aa731d1ae4
|
Regexp must begin with ^
|
2020-03-10 17:16:03 +01:00 |
|
Pierre-antoine Comby
|
77551162d5
|
Merge branch 'page_conso' into 'master'
Base conso page
See merge request bde/nk20!53
|
2020-03-10 09:32:44 +01:00 |
|
Pierre-antoine Comby
|
a54c0769bf
|
Merge branch 'add_script_submodule' into 'master'
initiate submodule for scripts
See merge request bde/nk20!51
|
2020-03-10 09:32:33 +01:00 |
|
Alexandre Iooss
|
94ab2c81f7
|
Use TableView for conso page
|
2020-03-10 08:07:09 +01:00 |
|
Yohann D'ANELLO
|
185f6ce4e3
|
Alias have to be exact
|
2020-03-10 01:07:37 +01:00 |
|
Yohann D'ANELLO
|
db69091d9f
|
When an update is made from the shell, the username of the user connected to the shell is queried
|
2020-03-10 01:04:00 +01:00 |
|
Yohann D'ANELLO
|
20e2d41563
|
Use a middleware rather than inspect the stack to get current user and IP
|
2020-03-10 00:01:40 +01:00 |
|
Yohann D'ANELLO
|
fffd674c44
|
Fix initial fixture hardcode
|
2020-03-09 22:29:14 +01:00 |
|
Pierre-antoine Comby
|
f4fe0c9866
|
use django_tables2 for transactionTemplate
|
2020-03-09 20:59:04 +01:00 |
|
Pierre-antoine Comby
|
46ec16d8c9
|
PEP8 compliance
|
2020-03-09 19:19:56 +01:00 |
|
Pierre-antoine Comby
|
205fd5c17a
|
initiate submodule for scripts
|
2020-03-09 19:03:36 +01:00 |
|
Pierre-antoine Comby
|
526744052e
|
pretty print in transaction tables
|
2020-03-09 18:53:13 +01:00 |
|
Pierre-antoine Comby
|
08d692c0da
|
fix #39
|
2020-03-09 18:10:24 +01:00 |
|
Pierre-antoine Comby
|
0de2c18bec
|
profile is first created via signal.
|
2020-03-09 18:08:37 +01:00 |
|
Benjamin Graillot
|
79b9131049
|
[note] Fix template for TemplateTransaction in Conso form
|
2020-03-09 11:51:20 +01:00 |
|
Maxime Bombar
|
b7fc598837
|
OTL
|
2020-03-08 23:17:55 +01:00 |
|
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
|
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 |
|