Commit Graph
51 Commits
Author SHA1 Message Date
Liesbeth ter Schure 87646b31db jaartoewijzing direct uit db inlezen 2022-01-14 15:39:41 +01:00
Monique 9aa92ea64a Merge branch 'feature/sophome' into develop 2022-01-03 12:15:30 +01:00
Monique 47bd7ac76d zichtbaarheid paginas 2022-01-03 12:15:03 +01:00
Monique b9407fb118 overzicht 2021-12-20 17:26:35 +01:00
Monique 0ce83d1578 haakje teveel 2021-12-20 17:10:10 +01:00
Monique b9b77d8384 Merge branch 'feature/sophome' into develop
# Conflicts:
#	application/core/MY_Controller.php
#	application/views/monpas/pages/sophome.php
#	public/js/monpas/models/sophomemodel.js
2021-12-20 17:08:40 +01:00
Monique 0d479218fe homebopropswop 2021-12-20 17:02:06 +01:00
Monique 2930478074 tussenstand 2021-12-20 16:56:17 +01:00
Monique e0c723db65 linkjes naar soponderdelen 2021-12-20 11:56:49 +01:00
Monique fcb17cc932 Merge branch 'feature/sophome' into develop 2021-12-20 11:07:47 +01:00
Monique b92fed96c0 homepage voor scholen 2021-12-20 11:06:27 +01:00
Monique a1d43b1ea5 Merge branch 'feature/sophome' into develop
# Conflicts:
#	application/core/MY_Controller.php
2021-12-14 21:50:55 +01:00
Monique 79a3e20dc5 homepage sop voor scholen 2021-12-14 21:49:35 +01:00
Monique fbe63d1528 Merge branch 'toelichtinghomescan' into develop 2021-12-14 13:18:08 +01:00
Monique 45902fc995 bijlage 2021-12-14 12:55:41 +01:00
Monique 74177cc809 Merge branch 'feature/yasgrafiekdivmeter' into develop 2021-12-14 12:14:28 +01:00
Monique e4e8e29254 tussenstand 2021-12-14 12:10:30 +01:00
Monique 26d73e1c6d Merge branch 'fouten/bestemmingennatoewijzing' into develop 2021-12-13 11:04:58 +01:00
Monique 016a1490a0 Bestemmingen alleen invullen als er een budget is
knockout was een object ipv een boolean
2021-12-13 11:03:52 +01:00
Monique ffa90c8dc6 Merge branch 'feature/foutmatrix' into develop
# Conflicts:
#	application/core/MY_Controller.php
2021-12-09 23:01:33 +01:00
Monique d8330d42a2 fouten matrix indiiduele scores 2021-12-09 23:00:44 +01:00
Monique 63d85ab257 foutje 2021-12-09 17:08:25 +01:00
Monique 9272459c9f 2 varianten grafiek met variabele yas 2021-12-09 16:47:36 +01:00
Monique b8177ade48 tussenstand 2021-11-19 10:31:31 +01:00
Monique bdf313ae64 ijkpunten & ontwikelagenda 2021-11-18 14:15:47 +01:00
Liesbeth ter Schure 6c82268ae5 kleuren voor matrix 2021-11-17 15:02:43 +01:00
Monique af3d32b653 ijkpunten 2021-11-16 21:40:12 +01:00
Monique 939e7f69ac tussenopslag 2021-11-16 11:16:52 +01:00
Monique 1a324bde5d knockoutmetingen 2021-10-15 13:55:43 +02:00
Monique de1ad17d0a queryfout 2021-10-15 13:02:59 +02:00
Monique 494ddc410d Merge branch 'feature/benamingDivpo22003' into develop 2021-10-12 14:26:49 +02:00
Monique 19ee286c71 benaming tabblad diversiteit 2021-10-12 14:26:29 +02:00
Monique be51b92f12 versie en consoles 2021-10-08 14:01:33 +02:00
Monique 880647f310 geenondersteuning so en sbo 2021-10-08 13:49:46 +02:00
Monique 057d721bd8 tussenopslag 2021-10-08 12:52:42 +02:00
Monique ea46900067 invullen 0 waarden aantal tlvs 2021-09-27 17:45:05 +02:00
Monique 5e64d80181 default 2021-09-24 12:41:45 +02:00
Monique 66c9d1305c spelfout + wijziging titel 2021-09-24 12:27:49 +02:00
Monique ec53a23220 Merge branch 'feature/robbobswop' into develop 2021-09-16 18:45:02 +02:00
Monique 598f4e5084 nav 1e test 2021-09-16 18:42:51 +02:00
Monique 8c1d92f99b tussenopslag 2021-09-16 10:17:57 +02:00
Monique 90faa2ec4f tonen swvoverzicht sop 2021-09-09 19:48:20 +02:00
Monique 1ed87d3d5f Merge branch 'feature/robbobswop' into develop 2021-09-07 10:29:38 +02:00
Monique 92175d82b2 mappen 2021-09-07 10:29:26 +02:00
Monique 4c9eb6a4fd sopBobRopSwop en divmeter voor po2203 in compact sop 2021-09-07 10:28:28 +02:00
Monique 29b45411b4 Merge branch 'master' into feature/robbobswop
# Conflicts:
#	application/libraries/monpas/compactsop/Compacteonderdelen.php
2021-09-03 21:30:11 +02:00
theo 9471263605 fi for switch sending mail 2021-08-24 20:27:30 +02:00
Monique 85a7c2a85c tussenstand 2021-07-15 23:58:09 +02:00
Monique 4db6e1bc4d overzetten naar nieuwe versie 2021-07-13 14:58:26 +02:00
Monique 444829340a nieuwe versie 2021-07-13 12:53:03 +02:00