 Monique
|
2c43f85c81
|
drag and drop gewenst bij Route
|
2022-09-27 16:02:13 +02:00 |
|
|
Monique
|
9cb045b89e
|
tussenopslag
|
2022-09-08 13:18:52 +02:00 |
|
|
Monique
|
5f1f6c8690
|
1e array
|
2022-08-30 17:01:49 +02:00 |
|
|
Monique
|
653b59c7ec
|
laatste dingen
|
2022-07-07 13:37:06 +02:00 |
|
|
Monique
|
90415b8bcc
|
deactiveren swv,kamer,bestuur
|
2022-07-07 12:27:04 +02:00 |
|
|
Monique
|
31b4df1d2c
|
dearchiveren orgd=s
|
2022-07-07 09:13:28 +02:00 |
|
|
Monique
|
2c34210d5f
|
textvak met emailasressen verwijderd
|
2022-07-04 11:57:47 +02:00 |
|
|
Monique
|
e208fbbde1
|
Merge branch 'fouten/flexibelsop' into develop
|
2022-07-04 10:55:04 +02:00 |
|
|
Monique
|
66d9832932
|
verwijzing naar scorekleuren_model toegevoegd
|
2022-07-04 10:54:36 +02:00 |
|
|
Monique
|
8c751d80fa
|
Merge branch 'feature/invulstatus' into develop
|
2022-06-24 14:36:07 +02:00 |
|
|
Monique
|
9545473157
|
status wat betreft invullen lijsten
|
2022-06-24 14:35:50 +02:00 |
|
|
Monique
|
7d48cca222
|
Merge branch 'fouten/resultaatmatrix' into develop
|
2022-06-10 12:14:49 +02:00 |
|
|
Monique
|
f7fe1ced6b
|
ijkpunten individule versies niet zichtbaar
|
2022-06-10 12:14:32 +02:00 |
|
|
Monique
|
0aacc8dd7d
|
Merge branch 'fouten/resultaatmatrix' into develop
# Conflicts:
# application/core/MY_Controller.php
|
2022-06-10 10:39:46 +02:00 |
|
|
Monique
|
e8a6bf85b7
|
kleuren werden niet goed opgehaald bij resultaat matrix
|
2022-06-10 10:35:52 +02:00 |
|
|
Monique
|
e4c852671b
|
versie
|
2022-05-27 20:33:28 +02:00 |
|
|
Monique
|
96fe9e4aa7
|
Merge branch 'feature/oudersinmonpas'
# Conflicts:
# application/core/MY_Controller.php
|
2022-05-27 20:31:57 +02:00 |
|
|
Monique
|
da1a0a9cc0
|
Merge branch 'feature/alleInstrumenteninCompactSop' into develop
|
2022-05-27 18:46:33 +02:00 |
|
|
Monique
|
c5eb1df6e9
|
info tekst financien en kleiner ijkpuntenblokje
|
2022-05-27 18:45:26 +02:00 |
|
|
Monique
|
e5ccf831ec
|
Merge branch 'feature/alleInstrumenteninCompactSop' into develop
# Conflicts:
# application/core/MY_Controller.php
|
2022-05-24 21:34:16 +02:00 |
|
|
Monique
|
a08028d5b6
|
versie
|
2022-05-24 21:33:32 +02:00 |
|
|
Monique
|
6536a53689
|
verbeteringen
|
2022-05-24 21:32:52 +02:00 |
|
|
Monique
|
8f54333a55
|
Merge branch 'feature/oudersinmonpas' into develop
|
2022-05-23 16:11:55 +02:00 |
|
|
Monique
|
cf8f7e8550
|
instrumenten ook voor leerlingen
|
2022-05-23 16:11:35 +02:00 |
|
|
Monique
|
f12ba5f67d
|
Merge branch 'feature/oudersinmonpas' into develop
# Conflicts:
# application/core/MY_Controller.php
|
2022-05-23 13:04:05 +02:00 |
|
|
Monique
|
bce246e1a3
|
ouders in monpas
|
2022-05-23 13:02:26 +02:00 |
|
|
Monique
|
73d4160105
|
kortere subtitel op sopblokjes
|
2022-05-11 12:44:08 +02:00 |
|
|
Monique
|
a399d8d8ff
|
end if fout
|
2022-05-03 16:50:56 +02:00 |
|
|
Monique
|
524a391ef4
|
hoofdletter in query
|
2022-05-03 16:33:25 +02:00 |
|
|
Monique
|
41f283e8f0
|
grafieken
|
2022-05-03 16:12:05 +02:00 |
|
|
Monique
|
a24d9b486f
|
tussenopslag
|
2022-04-29 10:31:51 +02:00 |
|
|
Monique
|
573332e28a
|
tussenopslag
|
2022-04-28 20:47:54 +02:00 |
|
|
Monique
|
d26974e69f
|
instrumenten koppelen in beheer
|
2022-04-26 16:16:20 +02:00 |
|
|
Monique
|
4230646bd4
|
Merge branch 'fouten/omvanggrafiek' into feature/alleInstrumenteninCompactSop
|
2022-04-08 12:52:10 +02:00 |
|
|
Monique
|
0f637c8d12
|
toon grafiek false en fout met aantal
|
2022-04-08 12:51:26 +02:00 |
|
|
Monique
|
e27dc57f75
|
pad naar handleidingen
|
2022-04-01 11:12:58 +02:00 |
|
|
Monique
|
570bfc2f21
|
nieuwe handleidingen
|
2022-04-01 10:15:57 +02:00 |
|
|
Monique
|
606dad7d77
|
tussenopslag
|
2022-03-29 10:23:56 +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
|
8696bc32b6
|
russenopslag
|
2022-03-28 15:04:56 +02:00 |
|
|
Monique
|
7031844f7b
|
tussenopslag
|
2022-03-28 15:04:41 +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 |
|