Yohann D'ANELLO
|
8c1d902c30
|
Open and validate activities
|
2020-03-27 22:48:20 +01:00 |
|
Yohann D'ANELLO
|
d6e202a26f
|
Display guests list
|
2020-03-27 21:18:27 +01:00 |
|
Yohann D'ANELLO
|
0d43d74c60
|
Display activity details
|
2020-03-27 19:47:43 +01:00 |
|
Yohann D'ANELLO
|
34949f0859
|
Fix activity in Guest model
|
2020-03-27 19:16:38 +01:00 |
|
Yohann D'ANELLO
|
ceb5690838
|
Invite people
|
2020-03-27 18:02:22 +01:00 |
|
Yohann D'ANELLO
|
4f4bbf6d0e
|
Fix server starting
|
2020-03-27 16:32:46 +01:00 |
|
Yohann D'ANELLO
|
f09364d3d8
|
Custom auto-complete fields, remove DAL requirement
|
2020-03-27 16:19:33 +01:00 |
|
Yohann D'ANELLO
|
823bcfe781
|
Fix CI
|
2020-03-27 14:19:55 +01:00 |
|
Yohann D'ANELLO
|
dadd840645
|
Merge remote-tracking branch 'origin/master' into activity
|
2020-03-27 14:16:10 +01:00 |
|
Pierre-antoine Comby
|
09fb0e1470
|
Merge branch 'master' into front_club
|
2020-03-27 14:07:22 +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 |
|
Yohann D'ANELLO
|
f81e2b5b5b
|
Use custom inputs for date picker and amounts
|
2020-03-27 13:50:02 +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 |
|
Yohann D'ANELLO
|
45b14ed1bd
|
Create activities
|
2020-03-27 01:31:54 +01:00 |
|
Yohann D'ANELLO
|
213e5a8369
|
Fix CI
|
2020-03-27 00:40:35 +01:00 |
|
Yohann D'ANELLO
|
841d56d5b3
|
Merge remote-tracking branch 'origin/master' into activity
# Conflicts:
# note_kfet/urls.py
# templates/base.html
|
2020-03-27 00:32:22 +01:00 |
|
Pierre-antoine Comby
|
c50e17c555
|
error handling up to client
|
2020-03-26 23:05:37 +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
|
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
|
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 |
|
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
|
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
|
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
|
9be93db9af
|
les boeufs avant la charrue, a faire sur une autre branche
|
2020-03-24 23:14:13 +01:00 |
|
Pierre-antoine Comby
|
9f53bda1cd
|
clean code
|
2020-03-24 23:02:12 +01:00 |
|
Pierre-antoine Comby
|
41568916b8
|
error fixes
|
2020-03-24 22:28:03 +01:00 |
|