1
0
mirror of https://gitlab.crans.org/bde/nk20 synced 2024-12-24 00:12:23 +00:00
Commit Graph

1129 Commits

Author SHA1 Message Date
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
Pierre-antoine Comby
0296686ed3 use defaults if no secrets is provided 2020-01-28 09:16:08 +00:00
Pierre-antoine Comby
b44e930cdb update production config 2020-01-27 22:36:59 +01:00
Pierre-antoine Comby
0b8eee6da9 the password of pgsql is a secret 2020-01-27 21:23:40 +00:00
Pierre-antoine Comby
a39cb56e0d split settings config between development and production 2020-01-27 20:49:02 +00:00
Pierre-antoine Comby
cbf0f59373 An activity entry transaction is not mandatory. 2020-01-21 22:16:07 +01:00
Pierre-antoine Comby
bb38442641 add Django Guardian
commit 55d98443 was not a good idea on master.
2020-01-21 22:09:20 +01:00
Pierre-antoine Comby
5a7d779a90 Add/ Complete docstring for every models. 2020-01-21 22:06:06 +01:00
Pierre-antoine Comby
7764abc0c0 fix md and clarify local installation 2020-01-21 22:04:16 +01:00
Pierre-antoine Comby
e2d32b11e2 remove trailing whitespace and add docstrings 2019-09-23 12:54:08 +02:00
Pierre-antoine Comby
075995ce73 fixed footer (again ?) 2019-09-23 12:51:09 +02:00
Pierre-antoine Comby
07d1cd225b [member] add user list and filter 2019-09-23 12:50:14 +02:00
Benjamin Graillot
55d984435d Remove django-guardian 2019-09-18 16:46:26 +02:00
Benjamin Graillot
3766a1905d [permission] track migrations directory 2019-09-18 16:44:04 +02:00
Benjamin Graillot
1ac63cbed1 [member] Handle unlimited memberships 2019-09-18 16:41:01 +02:00
Benjamin Graillot
d826dc9d20 [permission] Permission admin view 2019-09-18 16:40:21 +02:00
Benjamin Graillot
2a4ab09753 [permission] Use full names for permission types 2019-09-18 16:39:37 +02:00
Benjamin Graillot
5a831136ae Merge branch 'master' into rights 2019-09-18 14:50:36 +02:00
Benjamin Graillot
9f11d5309e Added LICENSE file
The nk20 is under GPL v3
2019-09-18 14:46:10 +02:00
Benjamin Graillot
67d1d9f7b7 Added permission app 2019-09-18 14:26:42 +02:00
Benjamin Graillot
fedfcf27b5 [note] Update normalize algorithm 2019-09-02 16:09:11 +00:00
Pierre-antoine Comby
7a7cc2bfef minor fixes 2019-08-15 23:12:27 +02:00
Pierre-antoine Comby
3bda5576dd use history table for club detail view 2019-08-15 23:11:52 +02:00
Pierre-antoine Comby
be8f2dc35b use accordion + history table for profil view 2019-08-15 23:11:16 +02:00
Pierre-antoine Comby
a84031405e create Custom history table 2019-08-15 23:08:15 +02:00
Pierre-antoine Comby
6779b9dac2 Merge branch 'app_member' into 'master'
App member

See merge request bde/nk20!5
2019-08-15 19:58:32 +00:00
Pierre-antoine Comby
cc41409f5e Merge branch 'master' into 'app_member'
# Conflicts:
#   apps/member/views.py
2019-08-15 19:53:40 +00:00
Pierre-antoine Comby
10f7ef4045 Club list is now clickable 2019-08-15 21:52:10 +02:00
Pierre-antoine Comby
70c5bc06f3 place custom config of js in template 2019-08-15 21:50:53 +02:00
Pierre-antoine Comby
9fe47229fd Detail view of club: member list and history 2019-08-15 21:49:59 +02:00
Pierre-antoine Comby
e1431870d4 Club list is now clickable 2019-08-15 21:49:32 +02:00
Pierre-antoine Comby
b705976679 add instruction for local setup 2019-08-15 17:59:56 +02:00
Pierre-antoine Comby
40c697e57f interface pour ajouter des membres à un club 2019-08-14 18:47:46 +02:00
Pierre-antoine Comby
55884f013a Merge branch 'transaction_history' into 'master'
Transaction history

See merge request bde/nk20!4
2019-08-14 14:47:22 +00:00
PA
66b70e69f3 Add transaction history list on the user 2019-08-14 16:42:05 +02:00
PA
a456468a71 Pretty print feature
Prints the money of each user perfectly
2019-08-14 16:02:43 +02:00
Pierre-antoine Comby
2a2e78f83f Merge branch 'frontend_translation' into 'master'
Frontend translation

See merge request bde/nk20!3
2019-08-14 13:41:31 +00:00
Alexandre Iooss
6c62f121e4
Fix CI 2019-08-14 15:31:46 +02:00
Alexandre Iooss
0dfbf16755
Make continuous integration integrate well 2019-08-14 15:19:25 +02:00
Alexandre Iooss
b76d4d69e0
Remove custom CSS from base.html 2019-08-14 15:17:14 +02:00
Alexandre Iooss
c8a0882b31
Use detailed list on user profile 2019-08-14 15:16:03 +02:00
Alexandre Iooss
ac78d6a919
Make registration template look more Bootstrap 2019-08-14 15:15:38 +02:00
Alexandre Iooss
8f592ea239
Move locales to project root 2019-08-14 15:15:02 +02:00
Pierre-antoine Comby
4879af3f34 minor changes to base.html 2019-08-13 18:24:25 +02:00
Pierre-antoine Comby
f51db8d0c6 pas deux conso avec le meme nom 2019-08-13 18:23:15 +02:00