 Monique
|
b1bcf7220a
|
Merge branch 'feature/labels' into develop
|
2023-07-03 13:10:34 +02:00 |
|
|
Monique
|
d3a369cb8e
|
zo beter
|
2023-07-03 13:10:11 +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
|
c26d3b2507
|
nog een test
|
2023-06-26 12:51:51 +02:00 |
|
|
Monique
|
a3564ff048
|
if uitgezet
|
2023-06-26 12:47:41 +02:00 |
|
|
Monique
|
e47f0a9a6c
|
last result
|
2023-06-26 12:42:44 +02:00 |
|
|
Monique
|
e0b2b12483
|
werkt dit beter
|
2023-06-26 12:36:02 +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
|
f7adcfcc93
|
tussenopslag
|
2023-06-14 12:44:03 +02:00 |
|
|
Monique
|
ac46447bea
|
tussenopslag
|
2023-06-09 15:50:11 +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
|
fe1f210dd8
|
Merge branch 'feature/schooljaardiv' into develop
|
2023-02-27 09:44:54 +01:00 |
|
|
Monique
|
d0b8914462
|
schooljaar erbij
|
2023-02-27 09:44:33 +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
|
05d22502d5
|
Merge branch 'fouten/kamerversiesbijambities' into develop
# Conflicts:
# application/controllers/monpas/Streefcijfers.php
|
2022-12-06 22:03:57 +01:00 |
|
|
Monique
|
d03944c77b
|
iets mis gegaan met overzetten
|
2022-12-06 22:01:40 +01:00 |
|
|
Monique
|
77bfe72e1a
|
fout met array in array
|
2022-12-06 08:41:36 +01:00 |
|
|
Monique
|
ada9b88b98
|
streefcijfers
|
2022-12-05 17:11:59 +01:00 |
|
|
Monique
|
1c6fbb0aa8
|
Merge branch 'fouten/kamerversiesbijambities' into develop
# Conflicts:
# application/controllers/monpas/Streefcijfers.php
|
2022-12-05 17:02:08 +01:00 |
|
|
Monique
|
ab7ab4ae32
|
kamers apart
|
2022-12-05 17:01:14 +01:00 |
|
|
Monique
|
4b1060251b
|
teveel ijkpunten geteld
|
2022-12-05 14:13:43 +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
|
9e11660f36
|
Merge branch 'feature/streefcijfersperorg'
# Conflicts:
# application/core/MY_Controller.php
|
2022-11-28 23:35:04 +01:00 |
|
|
Monique
|
2388ed6070
|
Merge branch 'feature/streefcijfersperorg' into develop
# Conflicts:
# application/core/MY_Controller.php
# application/libraries/monpas/Schoolafbeeldingen.php
|
2022-11-22 17:15:27 +01:00 |
|
|
Monique
|
a8ab42e27d
|
ambities per org
|
2022-11-22 17:13:14 +01:00 |
|
|
Monique
|
50459e9ffd
|
tussenstand
|
2022-11-18 15:47:13 +01:00 |
|
|
Monique
|
a7bc12a254
|
tussenopslag
|
2022-11-17 11:34:44 +01:00 |
|
|
Monique
|
9ba6f7c857
|
insert schooldetails als ze nog niet bestaan
|
2022-11-07 15:06:54 +01:00 |
|
|
Monique
|
c00017d36e
|
insertschooldetails als ze nog niet bestaan
|
2022-11-07 15:04:41 +01:00 |
|
|
Monique
|
bbb934ed61
|
Merge branch 'feature/swvMaaktSopSchool' into develop
|
2022-11-07 14:29:59 +01:00 |
|
|
Monique
|
3a7f183fc3
|
chmod bij upload
|
2022-11-07 14:29:46 +01:00 |
|
|
Monique
|
9ee3c86265
|
Merge branch 'feature/swvMaaktSopSchool' into develop
# Conflicts:
# application/views/monpas/modals/school_modal.php
|
2022-11-07 14:06:23 +01:00 |
|
|
Monique
|
e07c6555a5
|
uploaden logo in sop en orggegevens
|
2022-11-07 14:02:35 +01:00 |
|
|
Monique
|
6d52d23aca
|
tussenopslag
|
2022-11-02 19:26:56 +01:00 |
|
|
Monique
|
a44e4c5611
|
tussenopslag
|
2022-11-02 16:26:19 +01:00 |
|
|
Monique
|
8f7e651e25
|
Merge branch 'feature/swvMaaktSopSchool' into develop
|
2022-11-02 15:46:04 +01:00 |
|
|
Monique
|
b6f68be4b3
|
headerinfo
|
2022-11-02 15:19:47 +01:00 |
|
|
Monique
|
4ed0c29812
|
Merge branch 'feature/swvMaaktSopSchool' into develop
|
2022-11-02 13:43:21 +01:00 |
|
|
Monique
|
792b89c674
|
comactsops valtonderorgs
|
2022-11-02 13:42:56 +01:00 |
|
|
Monique
|
a4f2db9611
|
tussenopslag
|
2022-10-25 14:24:10 +02:00 |
|
|
Monique
|
5dfba96fc6
|
tussenopslag
|
2022-10-25 13:43:24 +02:00 |
|