1
0
mirror of https://gitlab.crans.org/bde/nk20 synced 2024-11-26 18:37:12 +00:00
Commit Graph

1584 Commits

Author SHA1 Message Date
Alexandre Iooss
f3b44f3170
Bootstrap for conso page 2020-03-10 08:11:43 +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
Yohann D'ANELLO
83b1ad4751 Multi-connexions 2020-03-09 22:23:47 +01:00
Yohann D'ANELLO
462a9e0f2d Fix CAS settings 2020-03-09 22:13:11 +01:00
Pierre-antoine Comby
f4fe0c9866 use django_tables2 for transactionTemplate 2020-03-09 20:59:04 +01:00
Pierre-antoine Comby
62573a35df Merge branch 'minors_fix' into 'master'
Minors fix

Closes #39

See merge request bde/nk20!52
2020-03-09 20:46:20 +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
e1063fcaa2 translation in navbar and transfer tab 2020-03-09 18:35:11 +01:00
Pierre-antoine Comby
dad1889c8d move cas fixture to own file 2020-03-09 18:24:31 +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
Pierre-antoine Comby
3990009400 remove django guardian settings 2020-03-09 18:08:23 +01:00
Pierre-antoine Comby
6aa6a5499a Merge branch 'modular_settings' into 'master'
modular settings start

See merge request bde/nk20!47
2020-03-09 12:00:10 +01:00
Benjamin Graillot
d058d05cee Merge branch 'fix_conso' into 'master'
Fix template for TemplateTransaction in Conso form

See merge request bde/nk20!50
2020-03-09 11:56:08 +01:00
Benjamin Graillot
79b9131049 [note] Fix template for TemplateTransaction in Conso form 2020-03-09 11:51:20 +01:00
Pierre-antoine Comby
7d616eb1c9 api should stay mandatory 2020-03-09 11:48:39 +01:00
Pierre-antoine Comby
67c20fada9 Merge branch 'typo_readme' into 'master'
Typo in README.md

See merge request bde/nk20!40
2020-03-09 11:43:49 +01:00
Maxime Bombar
1e50c03be5 Merge branch 'fix_typo_in_logs' into 'master'
OTL

See merge request bde/nk20!48
2020-03-08 23:22:05 +01:00
Maxime Bombar
b7fc598837 OTL 2020-03-08 23:17:55 +01:00
Pierre-antoine Comby
30fb311b2e modular settings start 2020-03-08 23:03:35 +01:00
Benjamin Graillot
8cbf56b5a6 Merge branch 'requirements' into 'master'
Requirements

See merge request bde/nk20!46
2020-03-08 22:42:22 +01:00
Benjamin Graillot
c7ba0e470e Split requirements into files 2020-03-08 22:42:22 +01:00
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