1
0
mirror of https://gitlab.crans.org/bde/nk20 synced 2024-12-18 13:32:28 +00:00
Commit Graph

1823 Commits

Author SHA1 Message Date
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
7bafc89713 Add form media to each page 2020-02-08 20:27:22 +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
Yohann D'ANELLO
f54e2ed145 Aliases were missing 2020-02-08 15:08:55 +01:00
Pierre-antoine Comby
71a88e84f7 initiate import command 2020-02-07 22:23:37 +01:00
Yohann D'ANELLO
d22350faf8 /note/user, /note/club, /note/special => /note 2020-02-07 20:51:25 +01:00
Yohann D'ANELLO
f52a89637c Polymorphic types 2020-02-07 20:47:49 +01:00
Yohann D'ANELLO
e8e22541fa Small fix 2020-02-07 17:10:35 +01:00
Yohann D'ANELLO
5633f0123d Clean code 2020-02-07 17:02:07 +01:00
Yohann D'ANELLO
c28884114c Add some doc 2020-02-07 00:29:04 +01:00
Yohann D'ANELLO
92fc92ba40 Add note models in API 2020-02-07 00:12:00 +01:00
Yohann D'ANELLO
5de93066db Add activity models in API 2020-02-06 23:49:33 +01:00
Yohann D'ANELLO
8e2b0688b5 Add member models in API 2020-02-06 23:44:59 +01:00
Yohann D'ANELLO
edc428a05e Add member models in API 2020-02-06 23:43:56 +01:00
Yohann D'ANELLO
f4a665cb7f API 2020-02-06 23:29:17 +01:00
Yohann D'ANELLO
318e81d149 German translation 2020-02-06 21:42:17 +01:00
Yohann D'ANELLO
c4a60633f8 Consos 2020-02-04 01:18:03 +01:00
Pierre-antoine Comby
f13ccf11aa Merge branch 'master' of gitlab.crans.org:bde/nk20 2020-02-03 19:30:15 +01:00
Pierre-antoine Comby
b9c3ab5ea8 add a profile_update view 2020-02-03 19:28:51 +01:00
Pierre-antoine Comby
e80163ce4d fix signup 2020-02-03 19:24:23 +01:00
Pierre-antoine Comby
af30a4cd16 shift central div to the left 2020-02-03 19:21:14 +01:00
Yohann D'ANELLO
f02d1ab41c Better pretty money. Closes #3 2020-02-03 15:20:37 +01:00
Pierre-antoine Comby
69dd8b50a5 Merge branch 'master' of gitlab.crans.org:bde/nk20 2020-02-03 13:58:29 +01:00
Pierre-antoine Comby
24017dafaf Merge branch 'docker' into 'master'
Docker

See merge request bde/nk20!6
2020-02-03 11:50:42 +01:00
ynerant
74189f1f4e Docker 2020-02-03 11:50:42 +01:00
Pierre-antoine Comby
a14d9cf38b default redirection after login 2020-02-02 15:43:34 +01:00
Pierre-antoine Comby
37a5b578a4 Create user and profile with all field needed 2020-02-02 15:42:39 +01:00
Pierre-antoine Comby
3ddc757e25 add ALLOWED_HOSTS to local variables 2020-02-02 13:41:43 +01:00
Pierre-antoine Comby
c4a5970ca3 Merge branch 'master' of gitlab.crans.org:bde/nk20 2020-02-02 13:32:28 +01:00
Pierre-antoine Comby
2197ca1066 c'est tout de même mieux un readme propre 2020-01-31 16:39:48 +01:00
Pierre-antoine Comby
46bf3162c0 use a example config files 2020-01-31 15:43:21 +01:00
Pierre-antoine Comby
b1e7a00758 Merge branch 'master' of gitlab.crans.org:bde/nk20 2020-01-29 17:22:10 +00:00
Pierre-antoine Comby
f6dfadd101 env variable are loaded from not-gitted .env file 2020-01-29 17:21:46 +00:00
Pierre-antoine Comby
f77d95bf70 plus d'excuse pour déployer en prod 2020-01-28 21:15:36 +01:00
Pierre-antoine Comby
14486074b4 the server is running 2020-01-28 19:56:04 +00:00
Pierre-antoine Comby
62c7e886e9 typo, making the CI breaks 2020-01-28 09:28:29 +00:00
Pierre-antoine Comby
59f5f7d1d5 Merge branch 'master' of gitlab.crans.org:bde/nk20 2020-01-28 09:16:14 +00:00