Maxime Bombar
|
46a65a8f16
|
Merge branch 'explicit_is_better_than_implicit' into 'master'
Import used modules ...
See merge request bde/nk20!45
|
2020-03-08 00:30:11 +01:00 |
|
Maxime Bombar
|
aaa958d146
|
Import used modules ...
|
2020-03-07 18:24:33 -05:00 |
|
Maxime Bombar
|
6aab22c0ea
|
Merge branch 'get_rid_of_PAC_2' into 'master'
Delete comby.xyz from ALLOWED_HOSTS
See merge request bde/nk20!44
|
2020-03-08 00:04:42 +01:00 |
|
Maxime Bombar
|
f17104770b
|
Delete comby.xyz from ALLOWED_HOSTS
|
2020-03-07 23:55:35 +01:00 |
|
Benjamin Graillot
|
44020398e9
|
Merge branch 'remove-psycopg2' into 'master'
Remove psycopg2 from requirements
See merge request bde/nk20!43
|
2020-03-07 23:42:49 +01:00 |
|
Benjamin Graillot
|
931e41804d
|
Remove psycopg2 from requirements
|
2020-03-07 23:39:22 +01:00 |
|
ynerant
|
7f91f27753
|
Merge branch 'fix-ci' into 'master'
Rendre Erdnaxe heureux
See merge request bde/nk20!42
|
2020-03-07 22:37:37 +01:00 |
|
Yohann D'ANELLO
|
d0206fb790
|
Make erdnaxe be happy
|
2020-03-07 22:28:59 +01:00 |
|
Maxime Bombar
|
9f41f7c9a5
|
New typo in README.md
|
2020-03-07 22:20:42 +01:00 |
|
Maxime Bombar
|
d0667ad7cb
|
Typo in README.md
|
2020-03-07 21:29:45 +01:00 |
|
ynerant
|
3eb0c185f2
|
Merge branch 'fix-fixtures-polymorphic-types' into 'master'
Fix initial fixtures
See merge request bde/nk20!39
|
2020-03-07 18:59:58 +01:00 |
|
Yohann D'ANELLO
|
21fd121ba7
|
Add signup link, customize templates
|
2020-03-07 18:55:18 +01:00 |
|
ynerant
|
b21c63105e
|
Merge branch 'fix_signin' into 'master'
Fix signin page
See merge request bde/nk20!38
|
2020-03-07 18:27:25 +01:00 |
|
ynerant
|
099c761321
|
Merge branch 'master' into 'fix_signin'
# Conflicts:
# note_kfet/settings/development.py
|
2020-03-07 18:21:56 +01:00 |
|
Yohann D'ANELLO
|
8f1caddbe0
|
Add signup link, customize templates
|
2020-03-07 18:18:35 +01:00 |
|
Pierre-antoine Comby
|
b47a45e040
|
Merge branch 'fix_picture_upload' into 'master'
always save to png
See merge request bde/nk20!37
|
2020-03-07 18:03:05 +01:00 |
|
Pierre-antoine Comby
|
663ee072d4
|
always save to png
|
2020-03-07 17:58:41 +01:00 |
|
Pierre-antoine Comby
|
f6b58e8c86
|
Merge branch 'fix_static' into 'master'
fix static files config for development enviromnent
See merge request bde/nk20!36
|
2020-03-07 17:52:11 +01:00 |
|
Pierre-antoine Comby
|
762585134c
|
fix static files config for development enviromnent
|
2020-03-07 17:47:34 +01:00 |
|
Pierre-antoine Comby
|
448929b900
|
Merge branch 'get_rid_of_PAC' into 'master'
Use example.org in nginx_note.conf_example
See merge request bde/nk20!34
|
2020-03-07 17:37:14 +01:00 |
|
Pierre-antoine Comby
|
70c9c3254f
|
Merge branch 'fix_signin' into 'master'
Fix anonymous users issue
See merge request bde/nk20!35
|
2020-03-07 17:37:04 +01:00 |
|
Pierre-antoine Comby
|
55a7754277
|
use localhost in dev
|
2020-03-07 17:27:28 +01:00 |
|
Yohann D'ANELLO
|
09137dd9d7
|
Fix anonymous users issue
|
2020-03-07 16:45:45 +01:00 |
|
Maxime Bombar
|
b019c546cd
|
Use example.org in nginx_note.conf_example
|
2020-03-07 15:56:00 +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
|
5b995f16f1
|
Merge branch 'logging' into 'master'
Logs
See merge request bde/nk20!28
|
2020-03-07 10:36:28 +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
|
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
|
d5f718fbba
|
start activity view and urls
|
2020-03-01 17:55:48 +01:00 |
|
Pierre-antoine Comby
|
b3d45ba64b
|
alias page inherit from profile template
|
2020-03-01 17:36:49 +01:00 |
|