ynerant/nk20
1
0
Fork 0
mirror of https://gitlab.crans.org/bde/nk20 synced 2024-12-20 14:32:22 +00:00
Code Issues Releases Wiki Activity
596 Commits 20 Branches 4 Tags 27 MiB
aaf49c9b99
Commit Graph

596 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pierre-antoine Comby
aaf49c9b99 balance on a second line 2020-03-28 21:30:55 +01:00
Pierre-antoine Comby
6ea59a4603 Merge branch 'master' into tranfer_front 2020-03-28 17:47:20 +01:00
Pierre-antoine Comby
948263a867 color codes from note balances 2020-03-28 17:44:22 +01:00
Pierre-antoine Comby
f3656f367c default picture is 200x200 2020-03-28 17:44:03 +01:00
Pierre-antoine Comby
d8949a993a get alias and note infos together 2020-03-28 17:42:29 +01:00
Pierre-antoine Comby
8b4c39269c Merge branch 'front_club' into 'master' 
Finitions sur l'interface club

See merge request bde/nk20!70
 2020-03-27 14:11:28 +01:00
Pierre-antoine Comby
09fb0e1470 Merge branch 'master' into front_club 2020-03-27 14:07:22 +01:00
Pierre-antoine Comby
ee3d441a56 add parent club link 2020-03-27 14:04:30 +01:00
Pierre-antoine Comby
ed746f39b2 Merge branch 'devalidation_reason' into 'master' 
Motif de dévalidation

See merge request bde/nk20!67
 2020-03-27 13:56:39 +01:00
ynerant
bef4958759 Merge branch 'master' into 'devalidation_reason' 
# Conflicts:
#   locale/de/LC_MESSAGES/django.po
#   locale/fr/LC_MESSAGES/django.po
 2020-03-27 13:52:48 +01:00
Pierre-antoine Comby
e27b456aea Merge branch 'parent-club' into 'master' 
Resolve "Club Parent"

Closes #42

See merge request bde/nk20!65
 2020-03-27 13:29:43 +01:00
Pierre-antoine Comby
a3a8fd601c revert to ReadProtectedViewset 2020-03-27 13:26:47 +01:00
Pierre-antoine Comby
c50e17c555 error handling up to client 2020-03-26 23:05:37 +01:00
Pierre-antoine Comby
f7a66920e0 move common script to alias.js 2020-03-26 23:05:08 +01:00
Pierre-antoine Comby
49dd88dbb7 add errMsg function 2020-03-26 23:04:51 +01:00
Pierre-antoine Comby
61b6aceb36 crappy name -> crappy behavior 2020-03-26 23:04:14 +01:00
Yohann D'ANELLO
a00e43bc26 Fix alias deletion 2020-03-26 21:04:32 +01:00
Pierre-antoine Comby
e125601f52 almost working javascript 2020-03-26 17:48:17 +01:00
Pierre-antoine Comby
92ca835d0e switch to template column 2020-03-26 17:47:49 +01:00
Pierre-antoine Comby
271fab3b75 use small btn in table 2020-03-26 17:46:38 +01:00
Pierre-antoine Comby
04b39f09af remove forms 2020-03-26 17:45:49 +01:00
Pierre-antoine Comby
757dfdd914 serializer config 2020-03-26 17:45:24 +01:00
Pierre-antoine Comby
d9cdb01350 remove alias handling backend, gonna use DRF 2020-03-26 17:44:01 +01:00
Pierre-antoine Comby
7568abb681 some minor cleaning 2020-03-26 17:41:11 +01:00
ynerant
e8cbd46374 Merge branch 'remove-noteuser-fixture' into 'master' 
Something is wrong in the fixtures

See merge request bde/nk20!69
 2020-03-26 16:04:09 +01:00
Yohann D'ANELLO
01410d2b23 Store used aliases in transactions 2020-03-26 15:59:51 +01:00
Yohann D'ANELLO
41aa6964d2 Store used aliases in transactions 2020-03-26 14:45:48 +01:00
Pierre-antoine Comby
1b26df6481 move template_category to own fixture 
TemplateCategory are not essential for running a base instance.
 2020-03-26 14:08:18 +01:00
Benjamin Graillot
59cd166b79 [member] tabs --> spaces 2020-03-25 18:05:46 +01:00
Pierre-antoine Comby
33e3657120 add aliases view to clubs 2020-03-25 18:00:40 +01:00
Benjamin Graillot
c86ddf17ad [member] Check membership of parent club 2020-03-25 17:54:28 +01:00
Pierre-antoine Comby
a41e51e23a add member get side information 2020-03-25 17:42:54 +01:00
Pierre-antoine Comby
26d70c4ef9 page title and edit buttons 2020-03-25 17:25:44 +01:00
Pierre-antoine Comby
c41999422f Merge branch 'front_club' into 'master' 
Front club

See merge request bde/nk20!68
 2020-03-25 17:02:55 +01:00
Pierre-antoine Comby
02ba4b6db6 Merge branch 'tresorerie' into 'master' 
Tresorerie

See merge request bde/nk20!61
 2020-03-25 16:59:51 +01:00
Pierre-antoine Comby
826573f553 whitespaces compliance 2020-03-25 16:58:15 +01:00
Pierre-antoine Comby
2d18cb983f fee in cents for fixture and initial picture 2020-03-25 16:12:57 +01:00
Pierre-antoine Comby
ff17f1e877 Club view should as good as profile ones 2020-03-25 16:11:44 +01:00
Yohann D'ANELLO
5cf75ebf9e When a transaction can't becreated because the user don't have the permission to take too much money, then we create an invalid transaction 2020-03-25 15:27:38 +01:00
Yohann D'ANELLO
bc3fdbe7a7 Add docstring 2020-03-25 14:54:26 +01:00
Yohann D'ANELLO
e5ab391236 Better user interface 2020-03-25 14:50:21 +01:00
Yohann D'ANELLO
23db42e448 Give a reason when a transaction is invalidated 2020-03-25 13:13:01 +01:00
Yohann D'ANELLO
9a7f1bba21 Fix CI (no idea of why this error happened) 2020-03-25 00:39:40 +01:00
ynerant
57a01c48a8 Merge branch 'master' into 'tresorerie' 
# Conflicts:
#   apps/note/fixtures/initial.json
#   templates/base.html
 2020-03-25 00:30:14 +01:00
Yohann D'ANELLO
075cb1b592 Transaction can't be attached to a closed remittance 2020-03-25 00:25:24 +01:00
Pierre-antoine Comby
0ac94547d1 Merge branch 'manage_button' into 'master' 
Meilleurs vues pour la gestion des boutons

See merge request bde/nk20!54
 2020-03-25 00:17:34 +01:00
Pierre-antoine Comby
f85f292d5b linter compliance 2020-03-25 00:12:56 +01:00
Pierre-antoine Comby
0411646ae6 make the CI pass and nicer front 2020-03-25 00:03:48 +01:00
Pierre-antoine Comby
20ea017e96 row color to show if display 2020-03-24 23:32:48 +01:00
Pierre-antoine Comby
b3c1032f4f wrap in function for correct behavior 2020-03-24 23:27:08 +01:00