 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 |
|
|
Monique
|
60b577f279
|
Merge branch 'feature/budgetmonfin' into develop
|
2023-04-05 21:53:37 +02:00 |
|
|
Monique
|
236c949fc9
|
monfin
|
2023-04-05 21:53:21 +02:00 |
|
|
Monique
|
d87652bff7
|
Merge branch 'feature/budgetmonfin' into develop
|
2023-03-24 15:01:12 +01:00 |
|
|
Monique
|
4173dd2dc5
|
budgetteren in monfin
|
2023-03-24 15:00:04 +01:00 |
|
 Monique
|
fb6ef95d39
|
Merge branch 'fouten/kamerversiesbijambities' into develop
|
2022-12-09 16:31:57 +01:00 |
|
|
Monique
|
600de45445
|
orgversie swv
|
2022-12-09 16:31:45 +01:00 |
|
|
Monique
|
89aad0a553
|
Merge branch 'fouten/kamerversiesbijambities' into develop
|
2022-12-05 12:52:19 +01:00 |
|
|
Monique
|
962d91cf71
|
kamerversies bij swv en scholen
|
2022-12-05 12:52:06 +01:00 |
|
|
Monique
|
98e25650b5
|
Merge branch 'feature/streefcijfersperorg'
|
2022-11-28 23:52:23 +01:00 |
|
|
Monique
|
169c50dc69
|
Merge branch 'feature/streefcijfersperorg' into develop
# Conflicts:
# application/core/MY_Controller.php
# application/views/monpas/pages/streefcijfers.php
|
2022-11-28 23:51:46 +01:00 |
|
|
Monique
|
ec74532c9d
|
niet meer dan 100 procent
|
2022-11-28 23:50:57 +01:00 |
|
|
Monique
|
9e11660f36
|
Merge branch 'feature/streefcijfersperorg'
# Conflicts:
# application/core/MY_Controller.php
|
2022-11-28 23:35:04 +01:00 |
|
|
Monique
|
cee7fb8a64
|
streefcijfers def
|
2022-11-28 23:29:26 +01:00 |
|