Commit Graph
164 Commits
Author SHA1 Message Date
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 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 4a4275f485 fouten grafieken omvang + ruimere layout lijst 2022-03-28 13:42:36 +02:00
theo 8140d01a53 fix for adding attachment 2022-03-23 20:04:02 +01:00
Liesbeth ter Schure 464fe0426a versie 2022-03-22 10:21:31 +01:00
Liesbeth ter Schure a7ca14bdc1 send bijlage ook bij new ww 2022-03-22 10:05:04 +01: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 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