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

225 Commits

Author SHA1 Message Date
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 c5ebd0297c Make disctinction between club/user/special 2020-02-22 16:33:35 +01:00
Pierre-antoine Comby cfd881887d add description field to transactionTemplates 2020-02-22 16:33:23 +01:00
erdnaxe 8c364c769e Merge branch 'turbolinks' into 'master' 
Turbolinks

See merge request bde/nk20!15
 2020-02-22 11:18:12 +01:00
erdnaxe ae90a957ce Merge branch 'master' into 'turbolinks' 
# Conflicts:
#   apps/note/views.py
 2020-02-22 11:09:45 +01:00
erdnaxe 9ef2bc8bc3 Merge branch 'fix_overflow' into 'master' 
Fix y-overflow on accordion showing during transition

See merge request bde/nk20!16
 2020-02-22 11:08:13 +01:00
erdnaxe f68523cd33 Merge branch 'page_conso' into 'master' 
Dynamic tabs on conso view

See merge request bde/nk20!17
 2020-02-22 11:08:07 +01:00
Alexandre Iooss a39bbea2d4
Add shadow and fix jquery hack 2020-02-22 10:17:24 +01:00
Alexandre Iooss 3597e79dc1
Dynamic tabs on conso view 2020-02-21 22:40:58 +01:00
Alexandre Iooss 24c994f2a5
Fix y-overflow on accordion showing during transition 2020-02-21 21:33:49 +01:00
Alexandre Iooss 82355135b0
Remove SmoothNavigation Middleware 2020-02-21 21:15:49 +01:00
Yohann D'ANELLO 9a0d74c18b Fix no cache in ConsoView 2020-02-21 19:46:56 +01:00
Yohann D'ANELLO d8b510a0be Use django-material's middleware 2020-02-21 18:54:05 +01:00
Yohann D'ANELLO db1e3eb98d Remove django-turbolinks dependency 2020-02-21 18:45:18 +01:00
Yohann D'ANELLO 3fd99ebac7 Ability to disable cache storage 2020-02-21 18:28:21 +01:00
Yohann D'ANELLO c64347def7 Don't use slim version of jQuery (select2 requires AjaX) 2020-02-21 17:59:20 +01:00
Yohann D'ANELLO 886abd8188 Update django-light-admin, fix conflict between jQuery, select2 and turbolinks 2020-02-21 17:51:00 +01:00
Yohann D'ANELLO 0728ba4a5c Reduce autoloaded libraries 2020-02-21 17:20:42 +01:00
Yohann D'ANELLO 52663d75fa Move scripts location 2020-02-21 17:07:28 +01:00
Yohann D'ANELLO d5bb1ee310 Don't use local static JS file 2020-02-21 15:43:01 +01:00
Yohann D'ANELLO 5977d88ed6 Test turbolinks 2020-02-21 15:24:29 +01:00
erdnaxe 12d7ddfa30 Merge branch 'update_translations' into 'master' 
Update translations and Bootstrap

See merge request bde/nk20!14
 2020-02-21 13:59:48 +01:00
Alexandre Iooss 6c017b1993
Remove sidebar and drop shadows 2020-02-21 13:50:35 +01:00
Alexandre Iooss b395d3a633
Overflow on collapsing tables and Bootstrap4 style 2020-02-21 12:29:11 +01:00
Alexandre Iooss 8d87b2b8f5
More style in profile page 2020-02-21 12:08:36 +01:00
Alexandre Iooss 6caad0b369
Do not forget responsible grid on second profile page column 2020-02-21 11:55:47 +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 2e7bf4964b
Upgrade bootstrap and flex footer 2020-02-21 11:02:29 +01:00
Alexandre Iooss 4af37b7990
Update fr locale 2020-02-21 10:52:39 +01:00
Alexandre Iooss d2ec7f6e0d
Do not justify everything 2020-02-21 10:52:07 +01:00
Alexandre Iooss 20953ff214
Change default site name with project fixture 2020-02-20 22:15:28 +01:00
Alexandre Iooss 362880511d
[readme] How to load initial data 2020-02-20 22:10:37 +01:00
Alexandre Iooss a304f6a97d
Some initial data 2020-02-20 22:10:10 +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
erdnaxe 7a418be2c4 Merge branch 'favicon' into 'master' 
Serperlistpopette! I forgot the favicon

See merge request bde/nk20!11
 2020-02-18 22:59:02 +01:00
erdnaxe 8f7a4b8b35 Merge branch 'code_format' into 'master' 
Format code

See merge request bde/nk20!9
 2020-02-18 22:58:44 +01:00
Alexandre Iooss 91ccff1d1b
Serperlistpopette! I forgot the favicon 2020-02-18 22:54: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 cd98f96cd0
Ignore VSCode project settings 2020-02-18 21:14:10 +01:00
Alexandre Iooss fb9af1c4c6
Just target Django 2.2 2020-02-18 20:58:45 +01:00
Alexandre Iooss ec3b445dcf
Code quality check with tox 2020-02-18 20:58:01 +01:00
Yohann D'ANELLO 62bfd9a044 Remove redundant ; and import local settings 2020-02-18 13:03:58 +01:00
Alexandre Iooss f89d91e524
Format code 2020-02-18 12:31:15 +01:00
erdnaxe 0d7db68372 Merge branch 'api' into 'master' 
API & autocomplétion

See merge request bde/nk20!8
 2020-02-18 12:06:53 +01:00