Overigen/monpas
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
100 Commits 3 Branches 0 Tags
fcb17cc9322865d1549f1656c3c834e8d4c3ee46
Commit Graph
87 Commits
Author SHA1 Message Date
Monique fcb17cc932 Merge branch 'feature/sophome' into develop 2021-12-20 11:07:47 +01:00
Monique 9a6240f98b versie 2021-12-20 11:06:58 +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 45062bae32 Merge branch 'feature/yasgrafiekdivmeter' into develop 
# Conflicts:
#	application/core/MY_Controller.php
 2021-12-14 13:15:57 +01:00
Monique 1a52f3b018 versie 2021-12-14 13:14:16 +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 a15dd94a81 disabled 2021-12-09 22:19:28 +01:00
Monique ed6980443a foutje 2021-12-09 18:13:35 +01:00
Monique 002d448f02 versie 2021-12-09 18:10:25 +01:00
Monique dd77f82aa1 Merge branch 'feature/foumatrix' into develop 
# Conflicts:
#	application/core/MY_Controller.php
 2021-12-09 18:07:23 +01:00
Monique 9c56cc1784 verkeerde argument in functie 2021-12-09 18:04:19 +01:00
Monique 1187e35ce8 verkeerde variabele in functie 2021-12-09 17:54:59 +01:00
Monique 63d85ab257 foutje 2021-12-09 17:08:25 +01:00
Monique 17bd74650b versie 2021-12-09 16:59:08 +01:00
Monique 9272459c9f 2 varianten grafiek met variabele yas 2021-12-09 16:47:36 +01:00
Monique ba916e9ef1 cluster scans pssend onderwijs 2021-12-09 10:25:57 +01:00
Monique ab091c888e Merge branch 'feature/disable3' 2021-11-25 09:01:07 +01:00
Monique 7a9e36cbe1 volgorde orgs 2021-11-25 08:38:20 +01:00
Monique 033b960ab5 Merge branch 'feature/disable3' 
# Conflicts:
#	application/core/MY_Controller.php
 2021-11-24 21:47:54 +01:00
Monique ccc3ae6dfd resultaamatrix 2021-11-23 17:35:58 +01:00
Monique 0f53130309 Merge branch 'develop' 2021-11-22 11:44:02 +01:00
Monique 5b5edb1f6c versie 2021-11-22 11:04:41 +01:00
Monique b9b585f762 gemiddelde matrix 2021-11-22 10:27:52 +01:00
Liesbeth ter Schure 2b258c9a0c kwalOndersteuning 2021-11-21 21:12:26 +01:00
Monique 7ea12a20ed sops 2021-11-19 22:47:25 +01:00
Monique 39a120e214 flexibel sop 2021-11-19 19:59:34 +01:00
Monique b8177ade48 tussenstand 2021-11-19 10:31:31 +01:00
Monique ed0ca50d6d Compact Sop 2021-11-18 15:02:11 +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 0f5cea83db getdisabled 2021-11-16 21:57:20 +01:00
Monique af3d32b653 ijkpunten 2021-11-16 21:40:12 +01:00
Monique 2db90688a6 tussenopslag 2021-11-16 13:46:11 +01:00
Monique a9a63c2476 tussenstand 2021-11-16 13:16:15 +01:00
Monique 62d7a73c85 tussenopslag 2021-11-16 12:40:06 +01:00
Liesbeth ter Schure 774c6d94aa verwijzing naar folder voor handleidingen 2021-11-16 11:33:45 +01:00
Monique ff2ca0e5d1 update scoresmodel 2021-11-16 11:22:42 +01:00
Monique 939e7f69ac tussenopslag 2021-11-16 11:16:52 +01:00
Monique eb0bd12ac8 printfunctie bij invullen uitgezet 2021-10-29 15:51:19 +02: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