Commit Graph
201 Commits
Author SHA1 Message Date
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
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
Liesbeth ter Schure c7d3b41480 send attachment ook bij new ww 2022-03-22 10:04:45 +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 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