Commit Graph
185 Commits
Author SHA1 Message Date
theo 575ef4e861 fix for download 2026-02-06 16:11:09 +01:00
theo 732d6634a5 fix 1 otp 2026-02-06 12:10:31 +01:00
Monique ceb64473a5 Merge branch 'feature/archiefoptie-ondersteuningsvorm' into develop 2026-02-05 18:53:09 +01:00
Monique 48f3a9a7ff sommen parseInt, groepen filteren op schooljaar 2026-02-05 18:52:58 +01:00
Monique bf34f295a5 Merge branch 'feature/archiefoptie-ondersteuningsvorm' into develop 2026-02-03 14:33:50 +01:00
Monique c35552cc66 optie om ondersteuningsvorm per groep te archiveren
+ dearchiveren
2026-02-03 14:33:32 +01:00
Monique c4f2b0097b Merge branch 'mon-fin-rodekleurverw' into develop 2025-03-10 13:57:50 +01:00
Monique 89b9891033 geen rode tekst bij budgetoverschrijding 2025-03-10 13:57:21 +01:00
Monique 6ea531473c Merge branch 'terugdraaienDatumbeperkingCS' into develop 2025-01-27 11:45:35 +01:00
Monique 018b99ab69 tabelmarge 0 2025-01-10 16:09:08 +01:00
Monique a5352df23e Merge branch 'feature/SWVsop' into develop 2025-01-06 14:43:29 +01:00
Monique 0b6fbaaf3a namen compact sop + layoutverbeteringen 2025-01-06 14:39:02 +01:00
Liesbeth ter Schure 12a984257b uitleg 2factor 2024-08-26 12:13:13 +02:00
Liesbeth ter Schure f2c8449f48 Merge branch 'dubbele-authenticatie-IN-TEST' into develop 2024-08-22 09:57:29 +02:00
Liesbeth ter Schure e35926b594 Two factor authentication 2024-08-22 09:56:48 +02:00
Monique d66dadd11f Merge branch 'master' into develop 2024-03-04 18:12:43 +01:00
Monique ad37ca50f2 hopelijk laatste dingen 2024-03-04 18:12:05 +01:00
Monique 3ce1d360ba alweer een dingetje 2024-03-04 13:49:13 +01:00
Monique 6172a2932b totaalbudget overal meetellen, deelbudgetten niet 2024-03-04 13:31:09 +01:00
Monique 66ab033e6b foutje met rode kleur procenten 2024-03-04 10:30:03 +01:00
Monique e345399e03 Merge branch 'fouten/monfin' into develop 2024-03-04 09:32:20 +01:00
Monique ee398549b1 gebudgetteerde bedragen in overzicht monfin ipv budgetten 2024-03-04 09:31:15 +01:00
Monique 411f0374a8 verschil 2024-03-03 21:00:47 +01:00
Monique c3aa042801 tussenopslag 2024-03-03 20:02:18 +01:00
Monique 8b50a10e7b niet altijd optijd een jaarbudget in callback/afvangen 2024-02-26 19:39:11 +01:00
Monique 7132df83c5 gebudgeteerde bedragen 2024-02-22 15:12:14 +01:00
Monique 5d46c8f998 Merge branch 'feature/budgetmonfin' into develop 2024-02-22 14:02:14 +01:00
Monique fd30dbb827 gebudgeteerde percentage totaal ipv toegewezenbudget 2024-02-22 14:01:45 +01:00
Monique 0c1f892b36 Merge branch 'master' into develop
# Conflicts:
#	public/css/monpas/main.css
2024-02-13 23:10:05 +01:00
Monique d2cac0cac1 pdf 2024-01-25 17:47:59 +01:00
Monique 9f086fedd5 tussenstand 2024-01-25 13:49:39 +01:00
Monique eacf820fc9 tussenstand 2024-01-25 11:41:41 +01:00
Monique e46a239206 tussenstand 2024-01-25 11:03:38 +01:00
Monique e5df1aff04 Merge branch 'fouten/monfinprint' into develop 2024-01-15 08:12:47 +01:00
Monique c7f6bbf842 prints monfin, jaartal 2023 2024-01-15 08:12:11 +01:00
Monique 4934f35619 Merge branch 'feature/budgetmonfin' into develop
# Conflicts:
#	application/core/MY_Controller.php
2023-09-25 17:03:51 +02:00
Monique 18b363af71 dubbeltellingen fonfin + tijdelijk verbergen totalen 2023-09-25 17:02:15 +02:00
Monique b2d015dab8 Merge branch 'feature/labels' into develop 2023-07-03 12:19:39 +02:00
Monique d76bf98cf2 Merge branch 'feature/budgetmonfin' into feature/labels 2023-07-03 12:16:41 +02:00
Monique 4c1536e8b3 stappenplanBAO 2023-07-03 12:08:17 +02:00
Monique 440bd9ae06 Merge branch 'feature/budgetmonfin' into develop 2023-06-23 09:40:17 +02:00
Monique b9acce3072 totaalbudget verdelen 2023-06-22 16:25:31 +02:00
Monique 0afb3a9263 tussenstand 2023-06-19 17:38:26 +02:00
Monique ac46447bea tussenopslag 2023-06-09 15:50:11 +02:00
Monique 8d46c0f2bc Merge branch 'feature/budgetmonfin' into develop 2023-04-28 13:59:48 +02:00
Monique 702c565674 wijziging toelichting 2023-04-28 13:57:50 +02:00
Monique fac8099373 Merge branch 'feature/budgetmonfin' into develop 2023-04-25 19:38:33 +02:00
Monique 1c22660e2e nog een 2023-04-25 19:38:21 +02:00
Monique 857b43f236 Merge branch 'feature/budgetmonfin' into develop 2023-04-25 19:23:38 +02:00
Monique 747142a441 2 percentages verwijderd 2023-04-25 19:23:20 +02:00