 Monique
|
570bfc2f21
|
nieuwe handleidingen
|
2022-04-01 10:15:57 +02:00 |
|
|
Monique
|
c3556fab2d
|
omvang
|
2022-03-28 15:10:30 +02:00 |
|
|
Monique
|
41573315e4
|
Merge branch 'fouten/chartomvang&layoutlijst&flexibel' into develop
# Conflicts:
# application/core/MY_Controller.php
|
2022-03-28 15:06:36 +02:00 |
|
|
Monique
|
bf0b652caa
|
aanpassing legenda omvang
|
2022-03-28 15:05:58 +02:00 |
|
|
Monique
|
b80ceeb342
|
versie
|
2022-03-28 13:50:11 +02:00 |
|
|
Monique
|
263cb088a1
|
versie
|
2022-03-28 13:45:19 +02:00 |
|
|
Monique
|
c2aff06df6
|
Merge branch 'fouten/chartomvang&layoutlijst&flexibel' into develop
# Conflicts:
# application/core/MY_Controller.php
|
2022-03-28 13:43:05 +02:00 |
|
|
Monique
|
4a4275f485
|
fouten grafieken omvang + ruimere layout lijst
|
2022-03-28 13:42:36 +02:00 |
|
|
Monique
|
326b3f70dd
|
versie
|
2022-03-15 12:12:15 +01:00 |
|
|
Monique
|
e104faa9a0
|
Merge branch 'feature/compact9en10'
# Conflicts:
# application/core/MY_Controller.php
|
2022-03-15 12:10:24 +01:00 |
|
|
Monique
|
54b90d23eb
|
version
|
2022-03-10 16:21:06 +01:00 |
|
|
Monique
|
8282498e78
|
version
|
2022-03-10 15:38:23 +01:00 |
|
|
Monique
|
c00ffa6600
|
Verbetraanpak $ Scan Zorg in compacsop
|
2022-03-10 15:36:54 +01:00 |
|
|
Monique
|
4aac5f8c25
|
Merge branch 'feature/yasgrafiekdivmeter' into develop
# Conflicts:
# application/core/MY_Controller.php
|
2022-03-01 17:31:12 +01:00 |
|
|
Monique
|
a2561eb081
|
3dgrafieken
|
2022-03-01 17:26:51 +01:00 |
|
|
Monique
|
0aecc25074
|
3d-grafieken
|
2022-03-01 14:43:16 +01:00 |
|
|
Monique
|
19e5ed3e04
|
Merge branch 'feature/sopOverzichtPerCriterium'
|
2022-02-10 09:17:08 +01:00 |
|
|
Monique
|
3a79ee0bd2
|
verisie
|
2022-02-08 12:16:01 +01:00 |
|
|
Monique
|
e01b48560a
|
Merge branch 'feature/sopOverzichtPerCriterium' into develop
|
2022-02-08 12:07:36 +01:00 |
|
|
Monique
|
1e88478891
|
sops per criterium bors,robs en swop niet
|
2022-02-08 12:07:21 +01:00 |
|
|
Monique
|
ea1cc7e1da
|
versie verhogen
|
2022-02-07 09:02:07 +01:00 |
|
|
Monique
|
895cff553f
|
versie
|
2022-02-02 11:17:57 +01:00 |
|
|
Monique
|
dc01a4b777
|
Merge branch 'feature/printInvullijst' into develop
# Conflicts:
# application/core/MY_Controller.php
# application/libraries/monpas/compactsop/Compactepaginas.php
|
2022-02-02 11:16:13 +01:00 |
|
|
Monique
|
de3375bf72
|
pdf van invullijst
|
2022-02-02 11:12:25 +01:00 |
|
|
Monique
|
89baf9bfd9
|
tussenopslag
|
2022-01-31 15:55:14 +01:00 |
|
|
Monique
|
1f6d7e6465
|
tussenopslag
|
2022-01-31 15:55:04 +01:00 |
|
|
Monique
|
372d032536
|
paginacompact
|
2022-01-25 10:34:04 +01:00 |
|
|
Monique
|
20f773bc74
|
titel
|
2022-01-25 10:29:53 +01:00 |
|
|
Monique
|
0940c16dfd
|
blokjescompact
|
2022-01-25 10:28:15 +01:00 |
|
|
Monique
|
6686431d6f
|
test
|
2022-01-25 10:26:51 +01:00 |
|
|
Monique
|
db58248259
|
Comacteonderdelen
|
2022-01-25 10:23:10 +01:00 |
|
|
Monique
|
9fd2eac8ee
|
pdfmaker
|
2022-01-25 10:21:13 +01:00 |
|
|
Monique
|
3ae6d69187
|
nieuwe poging
|
2022-01-25 09:28:50 +01:00 |
|
|
Monique
|
273305be2c
|
Merge branch 'zarchief/headersop'
# Conflicts:
# application/controllers/monpas/Pdfmaker.php
|
2022-01-25 09:28:06 +01:00 |
|
|
Monique
|
0c1dd2942b
|
header sop
|
2022-01-25 09:25:06 +01:00 |
|
|
Monique
|
461f933bc2
|
Merge branch 'feature/passendOndCompactsop'
# Conflicts:
# application/core/MY_Controller.php
# application/libraries/monpas/compactsop/Compactepaginas.php
|
2022-01-24 20:10:26 +01:00 |
|
|
Monique
|
cf88f2eace
|
Merge branch 'feature/eigenOrdeningOrgs' into develop
|
2022-01-24 14:31:43 +01:00 |
|
|
Monique
|
22fbe6e2fd
|
ordening resultaatmatrix
|
2022-01-24 14:31:29 +01:00 |
|
|
Monique
|
f1b85158ee
|
Merge branch 'fouten/sop' into develop
|
2022-01-24 13:48:18 +01:00 |
|
|
Monique
|
0b969b4841
|
sopversie functies alleen doorlopen met licentie
|
2022-01-24 13:47:53 +01:00 |
|
|
Monique
|
c1bb148e98
|
Merge branch 'fouten/sop' into develop
# Conflicts:
# application/core/MY_Controller.php
|
2022-01-24 13:21:28 +01:00 |
|
|
Monique
|
b12ca62443
|
fout als aanta lln 0 is
|
2022-01-24 13:20:44 +01:00 |
|
|
Monique
|
ef3fe83b6e
|
Merge branch 'fouten/printknop' into develop
# Conflicts:
# application/core/MY_Controller.php
|
2022-01-24 12:14:52 +01:00 |
|
|
Monique
|
b8b071f338
|
printknop tijdelijk uit
|
2022-01-24 12:14:00 +01:00 |
|
|
Monique
|
58707c730a
|
Merge branch 'feature/passendOndCompactsop' into develop
# Conflicts:
# application/core/MY_Controller.php
# application/libraries/monpas/compactsop/Compactepaginas.php
|
2022-01-24 10:58:33 +01:00 |
|
|
Monique
|
f85b2632b5
|
Scan passend onderwijs in compact sop
|
2022-01-24 10:56:09 +01:00 |
|
|
Monique
|
5df408abd2
|
Merge branch 'fouten/compactsopdivmeters'
|
2022-01-04 12:41:52 +01:00 |
|
|
Monique
|
2ac4d42a55
|
Merge branch 'fouten/compactsopdivmeters' of https://bitbucket.org/pensare/monpas into develop
|
2022-01-04 12:41:22 +01:00 |
|
|
Monique
|
e2bf58f626
|
divblokje
|
2022-01-04 12:40:35 +01:00 |
|
|
Monique
|
b889f521c2
|
versie
|
2022-01-04 12:03:39 +01:00 |
|
|
Monique
|
a479aa6e65
|
titel en header sop
|
2022-01-04 11:53:53 +01:00 |
|
|
Monique
|
19d3b7154e
|
titel en header sops
|
2022-01-04 11:50:14 +01:00 |
|
|
Monique
|
120784e169
|
versie
|
2022-01-03 18:31:02 +01:00 |
|
|
Monique
|
15d48f0699
|
Merge branch 'fouten/compactsopdivmeters' into develop
|
2022-01-03 18:28:45 +01:00 |
|
|
Monique
|
aebac20e0a
|
blokje in goed formaat
|
2022-01-03 18:28:12 +01:00 |
|
|
Monique
|
de698f3c60
|
tussenopslag
|
2022-01-03 14:27:39 +01:00 |
|
|
Monique
|
bef604a03e
|
versie
|
2022-01-03 12:17:50 +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
|
e445e56365
|
vermelding overzicht
|
2021-12-20 17:14:52 +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
|
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
|
fbe63d1528
|
Merge branch 'toelichtinghomescan' into develop
|
2021-12-14 13:18:08 +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
|
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
|
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
|
581f44b520
|
Merge branch 'feature/yasgrafiekdivmeter' into develop
|
2021-12-09 16:47:51 +01:00 |
|
|
Monique
|
9272459c9f
|
2 varianten grafiek met variabele yas
|
2021-12-09 16:47:36 +01:00 |
|
|
Monique
|
687538d236
|
Merge branch 'feature/clusterScans' into develop
# Conflicts:
# application/core/MY_Controller.php
|
2021-12-09 10:26:38 +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
|
9773fe94d5
|
Merge branch 'feature/disable3' into develop
# Conflicts:
# application/core/MY_Controller.php
|
2021-11-23 17:36:51 +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 |
|