ynerant/nk20
1
0
Fork 0
mirror of https://gitlab.crans.org/bde/nk20 synced 2025-10-30 23:39:54 +01:00
Code Issues Releases Wiki Activity
2,311 Commits 45 Branches 4 Tags
03c1bb41b60966877684b9dd87b4173c3f32fdfa
Commit Graph

2311 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yohann D'ANELLO
fb5e2578af Merge Role and RolePermissions 2020-07-25 19:40:30 +02:00
Yohann D'ANELLO
0b6cb4ef19 Production is not debug 2020-07-25 19:14:27 +02:00
Yohann D'ANELLO
18bdc8044b 🐛 Minor fixes 2020-07-25 18:26:18 +02:00
Yohann D'ANELLO
f0bca69825 🐛 Minor fixes 2020-07-25 18:18:53 +02:00
Yohann D'ANELLO
b2e1777fe0 Update Django CAS Server 2020-07-25 17:44:38 +02:00
Yohann D'ANELLO
afb35d7ae0 Fix linters 2020-07-25 17:42:44 +02:00
Yohann D'ANELLO
b212bf4093 Fix linters 2020-07-25 17:42:32 +02:00
Yohann D'ANELLO
3fea17c555 🐛 Fix Ansible script 2020-07-25 17:36:37 +02:00
Yohann D'ANELLO
2eb601bd66 💥 Improve performances 2020-07-25 17:25:57 +02:00
Yohann D'ANELLO
50024dc03d 🐛 Fix NK15 import 2020-07-23 07:21:49 +02:00
Yohann D'ANELLO
e3045522d1 Bind GuestTransaction to entry rather than guest (fix OneToOneField) 2020-07-22 21:05:25 +02:00
Yohann D'ANELLO
a098f70424 Better import 2020-07-22 01:46:31 +02:00
ynerant
1735ba25a8 Merge branch 'beta-soon' into 'master' 
Beta soon

See merge request bde/nk20!85
 2020-07-21 22:47:50 +02:00
Yohann D'ANELLO
5d70a809c2 🔧 Better Ansible script 2020-07-21 22:36:37 +02:00
Yohann D'ANELLO
4761d46696 🎨 Apply Django migrations 2020-07-15 11:32:08 +02:00
Yohann D'ANELLO
084d22d33f Install PSQL and init DB 2020-07-15 10:09:28 +02:00
Yohann D'ANELLO
3f0208a664 🐛 First fix Ansible installation 2020-07-15 09:27:11 +02:00
Yohann D'ANELLO
3dfed70eb1 💩 Use HTTPS rather than SSH to clone nk20-scripts (may be reverted later) 2020-07-15 08:25:52 +02:00
Yohann D'ANELLO
cdc053718f 🚀 Adding Ansible configuration (not tested) 2020-07-15 07:46:42 +02:00
Yohann D'ANELLO
71f6daf0e8 Add permission for treasurers to update the validation status of a transaction 2020-07-13 12:10:01 +02:00
Yohann D'ANELLO
2c7995a79e A transaction can only be created between active notes 2020-06-21 22:47:05 +02:00
Yohann D'ANELLO
ac5041f3ec Better club search bar 2020-06-21 22:27:32 +02:00
Yohann D'ANELLO
b46854e479 Rework on Docker image 2020-06-21 20:27:42 +02:00
Pierre-antoine Comby
a90eb2a6eb Merge branch 'order_table' into 'master' 
order table of club for Pollion

See merge request bde/nk20!84
 2020-06-02 09:43:12 +02:00
Pierre-antoine Comby
f2ac0cd8cf order table of club for Pollion 2020-06-02 09:37:25 +02:00
ynerant
8d9e05929b Merge branch 'beta-soon' into 'master' 
Beta soon

See merge request bde/nk20!83
 2020-05-30 16:23:51 +02:00
Yohann D'ANELLO
518de596bb Update one translation 2020-05-30 16:16:31 +02:00
Yohann D'ANELLO
c8fe3435de Some lines of the base.js file mysteriously disappeared... 2020-05-30 16:14:37 +02:00
Yohann D'ANELLO
8751b3936e One button should not be displayed 2020-05-30 15:48:43 +02:00
Yohann D'ANELLO
302f9e752c Create a test to check that permission queries are well formed 2020-05-30 15:46:09 +02:00
Yohann D'ANELLO
7bda0bb31f Fix JS 2020-05-30 15:45:44 +02:00
ynerant
8d704d0730 Merge branch 'beta-soon' into 'master' 
Beta soon

See merge request bde/nk20!82
 2020-05-29 21:47:57 +02:00
Yohann D'ANELLO
a9ccf46010 Linters 2020-05-29 21:43:24 +02:00
Yohann D'ANELLO
f567b1a343 Activity list is displayed in the right order 2020-05-29 21:37:44 +02:00
Yohann D'ANELLO
155b2df330 Fix some permissions, users can log in 2020-05-29 21:26:05 +02:00
Yohann D'ANELLO
716232e27f With distinct permissions, we don't need to check ~ 100 000 permissions to check if someone can log in 2020-05-29 21:11:51 +02:00
Yohann D'ANELLO
c62b5f935a Merge remote-tracking branch 'origin/master' into beta-soon 
# Conflicts:
#	apps/scripts
 2020-05-29 21:11:14 +02:00
Pierre-antoine Comby
f468c2f939 Merge branch 'import_nk15' into 'master' 
Import nk15

See merge request bde/nk20!81
 2020-05-25 22:09:52 +02:00
Pierre-antoine Comby
7597ad859a Merge branch 'scripts' into 'master' 
Scripts

See merge request bde/nk20!80
 2020-05-25 12:31:46 +02:00
Pierre-antoine Comby
640d31d200 fix install for python 3.8 2020-05-25 12:27:05 +02:00
Pierre-antoine Comby
79fbe96fe1 updates scripts 2020-05-25 12:26:33 +02:00
Pierre-antoine Comby
424646054f Merge branch 'move_wei' into 'master' 
move wei script to wei app

See merge request bde/nk20!79
 2020-05-14 15:22:06 +02:00
Pierre-antoine Comby
110ef79951 move wei script to wei app 2020-05-14 15:16:10 +02:00
Yohann D'ANELLO
f7b68678d8 Prepare production, we will send mails 2020-05-08 15:59:31 +02:00
Yohann D'ANELLO
b0efe08a13 Why coding something custom when Django implements it natively? 2020-05-08 15:59:03 +02:00
Yohann D'ANELLO
4108babdb4 Permissions can be permanent 2020-05-07 21:14:36 +02:00
Yohann D'ANELLO
fdf373d1d5 Merge remote-tracking branch 'origin/master' into import_nk15 
# Conflicts:
#	apps/treasury/signals.py
 2020-05-07 19:01:23 +02:00
ynerant
0776ed416c Merge branch 'tranfer_front' into 'master' 
Transfer front

See merge request bde/nk20!76
 2020-05-07 18:54:51 +02:00
ynerant
395c52220f Merge branch 'master' into 'tranfer_front' 
# Conflicts:
#   apps/activity/views.py
#   apps/permission/backends.py
#   locale/de/LC_MESSAGES/django.po
#   locale/fr/LC_MESSAGES/django.po
#   static/js/base.js
#   templates/base.html
#   templates/member/user_list.html
 2020-05-07 18:48:35 +02:00
ynerant
138bdbd444 Merge branch 'wei' into 'master' 
WEI

Closes #32 and #33

See merge request bde/nk20!78
 2020-05-07 18:46:00 +02:00