1
0
mirror of https://gitlab.crans.org/bde/nk20 synced 2025-06-20 17:41:55 +02:00
Commit Graph

375 Commits

Author SHA1 Message Date
d5b010980b Full membership support 2020-04-01 03:42:19 +02:00
dd3b7bd7e5 Remove note activities 2020-03-31 14:57:44 +02:00
12945945bc Update translations 2020-03-31 14:10:30 +02:00
1aae18e6a6 Improved permissions, 404 and 403 errors will be more frequent (when we type an invalid URL) 2020-03-31 04:16:30 +02:00
c384ee02eb Implement a new type of note (see #45) 2020-03-31 01:03:30 +02:00
b0b3aa35a9 Guests can't be invited if the activity is not validated 2020-03-30 17:35:47 +02:00
fcb4da2db3 Guests can't be invited since the activity is started 2020-03-30 17:27:02 +02:00
fb5796d35e Guests can't be invited more than 5 times a year and a member can't invite more than 3 people per activity. 2020-03-30 00:42:32 +02:00
6ea59a4603 Merge branch 'master' into tranfer_front 2020-03-28 17:47:20 +01:00
d8949a993a get alias and note infos together 2020-03-28 17:42:29 +01:00
c8b72cf1ff Guests can pay with CB or coins, lot of other improvements 2020-03-28 16:52:58 +01:00
8c1d902c30 Open and validate activities 2020-03-27 22:48:20 +01:00
ceb5690838 Invite people 2020-03-27 18:02:22 +01:00
4f4bbf6d0e Fix server starting 2020-03-27 16:32:46 +01:00
f09364d3d8 Custom auto-complete fields, remove DAL requirement 2020-03-27 16:19:33 +01:00
823bcfe781 Fix CI 2020-03-27 14:19:55 +01:00
dadd840645 Merge remote-tracking branch 'origin/master' into activity 2020-03-27 14:16:10 +01:00
09fb0e1470 Merge branch 'master' into front_club 2020-03-27 14:07:22 +01:00
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
f81e2b5b5b Use custom inputs for date picker and amounts 2020-03-27 13:50:02 +01:00
a3a8fd601c revert to ReadProtectedViewset 2020-03-27 13:26:47 +01:00
c50e17c555 error handling up to client 2020-03-26 23:05:37 +01:00
61b6aceb36 crappy name -> crappy behavior 2020-03-26 23:04:14 +01:00
a00e43bc26 Fix alias deletion 2020-03-26 21:04:32 +01:00
92ca835d0e switch to template column 2020-03-26 17:47:49 +01:00
271fab3b75 use small btn in table 2020-03-26 17:46:38 +01:00
757dfdd914 serializer config 2020-03-26 17:45:24 +01:00
d9cdb01350 remove alias handling backend, gonna use DRF 2020-03-26 17:44:01 +01:00
7568abb681 some minor cleaning 2020-03-26 17:41:11 +01:00
01410d2b23 Store used aliases in transactions 2020-03-26 15:59:51 +01:00
41aa6964d2 Store used aliases in transactions 2020-03-26 14:45:48 +01:00
1b26df6481 move template_category to own fixture
TemplateCategory are not essential for running a base instance.
2020-03-26 14:08:18 +01:00
c41999422f Merge branch 'front_club' into 'master'
Front club

See merge request bde/nk20!68
2020-03-25 17:02:55 +01:00
2d18cb983f fee in cents for fixture and initial picture 2020-03-25 16:12:57 +01:00
bc3fdbe7a7 Add docstring 2020-03-25 14:54:26 +01:00
e5ab391236 Better user interface 2020-03-25 14:50:21 +01:00
23db42e448 Give a reason when a transaction is invalidated 2020-03-25 13:13:01 +01:00
57a01c48a8 Merge branch 'master' into 'tresorerie'
# Conflicts:
#   apps/note/fixtures/initial.json
#   templates/base.html
2020-03-25 00:30:14 +01:00
f85f292d5b linter compliance 2020-03-25 00:12:56 +01:00
0411646ae6 make the CI pass and nicer front 2020-03-25 00:03:48 +01:00
20ea017e96 row color to show if display 2020-03-24 23:32:48 +01:00
9be93db9af les boeufs avant la charrue, a faire sur une autre branche 2020-03-24 23:14:13 +01:00
9f53bda1cd clean code 2020-03-24 23:02:12 +01:00
41568916b8 error fixes 2020-03-24 22:28:03 +01:00
ba04a6555f dynamically delete buttons 2020-03-24 22:12:59 +01:00
33139bdbde Dynamic search of buttons 2020-03-24 00:07:25 +01:00
884a7d0f08 Use a proxy for special transactions in treasury app for modularity (not a clean way, but without any other solution...) 2020-03-23 21:15:59 +01:00
7cd8a37aec non dynamic search for button 2020-03-23 20:21:25 +01:00
41a0529d0c fixin the merge... 2020-03-23 15:35:24 +01:00
bbda99a3ac Merge branch 'master' into manage_button 2020-03-23 15:31:39 +01:00