 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 |
|
 Liesbeth ter Schure
|
87646b31db
|
jaartoewijzing direct uit db inlezen
|
2022-01-14 15:39:41 +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 |
|