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
|
7303fb9943
|
Merge branch 'alias' into 'master'
Alias
See merge request bde/nk20!31
|
2020-03-06 21:53:52 +01:00 |
Pierre-antoine Comby
|
ab8888a085
|
Merge branch 'master' into 'alias'
# Conflicts:
# note_kfet/settings/base.py
# note_kfet/urls.py
|
2020-03-06 21:49:46 +01:00 |
ynerant
|
0193a4d898
|
Merge branch 'cas' into 'master'
CAS
See merge request bde/nk20!29
|
2020-03-06 21:38:57 +01:00 |
Pierre-antoine Comby
|
deb19e45c1
|
center form
|
2020-03-06 20:16:44 +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
|
13055c393a
|
Merge branch 'master' into alias
|
2020-03-05 21:43:06 +01:00 |
Pierre-antoine Comby
|
3c22d3b8a5
|
Merge branch 'static_files' into 'master'
Static files
See merge request bde/nk20!24
|
2020-03-05 21:41:44 +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
|
b3d45ba64b
|
alias page inherit from profile template
|
2020-03-01 17:36:49 +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
|
f1cedc902e
|
Merge branch 'fix_profile' into 'master'
fix #27
Closes #27
See merge request bde/nk20!30
|
2020-02-27 21:00:55 +01:00 |
Pierre-antoine Comby
|
0ea0d77707
|
fix #27
|
2020-02-27 20:56:06 +01:00 |
Pierre-antoine Comby
|
c372b6587e
|
Merge branch 'no_money_created' into 'master'
Fix #25
Closes #25
See merge request bde/nk20!27
|
2020-02-27 19:52:30 +01:00 |
Yohann D'ANELLO
|
ea9cda0d41
|
Update translations
|
2020-02-27 17:49:57 +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
|
c22e73a86e
|
Don't create automatically a new user on login
|
2020-02-27 14:11:00 +01:00 |
Yohann D'ANELLO
|
202fc655eb
|
Merge remote-tracking branch 'origin/cas' into cas
|
2020-02-27 14:01:20 +01:00 |
Yohann D'ANELLO
|
8503bf9d57
|
Add default initial fixture for CAS server
|
2020-02-27 14:00:20 +01:00 |
Yohann D'ANELLO
|
94d327821a
|
Merge remote-tracking branch 'origin/master' into cas
|
2020-02-27 13:59:52 +01:00 |
Yohann D'ANELLO
|
f319c217b0
|
Add default initial fixture for CAS server
|
2020-02-27 13:52:39 +01:00 |
Yohann D'ANELLO
|
04e40e9a91
|
Merge branch 'master' into cas
|
2020-02-27 13:39:22 +01:00 |
Yohann D'ANELLO
|
1c762e5444
|
Trying to get IP
|
2020-02-27 13:34:38 +01:00 |
Pierre-antoine Comby
|
94c0971abf
|
Merge branch '26-menu-principal-ne-s-ouvre-pas-sur-telephone' into 'master'
Resolve "Menu principal ne s'ouvre pas sur téléphone"
Closes #26
See merge request bde/nk20!26
|
2020-02-27 12:06:16 +01:00 |
Pierre-antoine Comby
|
a348178d13
|
Fix id name
|
2020-02-27 12:00:02 +01:00 |