Commit Graph
124 Commits
Author SHA1 Message Date
Monique 4eae062550 Merge branch 'fouten/kamerversiesbijambities' into develop
# Conflicts:
#	public/js/monpas/models/streefcijfersmodel.js
2022-12-05 14:00:14 +01:00
Monique 2fc78b7265 score 0 opslaan 2022-12-05 13:58:57 +01:00
Monique 40e8e2b893 score 0 opslaan 2022-12-05 13:56:10 +01:00
Monique 89aad0a553 Merge branch 'fouten/kamerversiesbijambities' into develop 2022-12-05 12:52:19 +01:00
Monique 962d91cf71 kamerversies bij swv en scholen 2022-12-05 12:52:06 +01:00
Monique 9e11660f36 Merge branch 'feature/streefcijfersperorg'
# Conflicts:
#	application/core/MY_Controller.php
2022-11-28 23:35:04 +01:00
Monique 2388ed6070 Merge branch 'feature/streefcijfersperorg' into develop
# Conflicts:
#	application/core/MY_Controller.php
#	application/libraries/monpas/Schoolafbeeldingen.php
2022-11-22 17:15:27 +01:00
Monique a8ab42e27d ambities per org 2022-11-22 17:13:14 +01:00
Monique 761bf62686 tussenopslag 2022-11-21 09:30:42 +01:00
Monique 50459e9ffd tussenstand 2022-11-18 15:47:13 +01:00
Monique a7bc12a254 tussenopslag 2022-11-17 11:34:44 +01:00
Monique 8d3553318b tussenopslag 2022-11-08 10:10:41 +01:00
Monique 195f82e596 Merge branch 'feature/swvMaaktSopSchool' into develop 2022-11-07 21:14:27 +01:00
Monique 832384f067 consolelogs eruit 2022-11-07 21:14:09 +01:00
Monique 9ee3c86265 Merge branch 'feature/swvMaaktSopSchool' into develop
# Conflicts:
#	application/views/monpas/modals/school_modal.php
2022-11-07 14:06:23 +01:00
Monique e07c6555a5 uploaden logo in sop en orggegevens 2022-11-07 14:02:35 +01:00
Monique 8f7e651e25 Merge branch 'feature/swvMaaktSopSchool' into develop 2022-11-02 15:46:04 +01:00
Monique 520a4be5e0 meldig niet gevonden 2022-11-02 15:45:52 +01:00
Monique 4ed0c29812 Merge branch 'feature/swvMaaktSopSchool' into develop 2022-11-02 13:43:21 +01:00
Monique 792b89c674 comactsops valtonderorgs 2022-11-02 13:42:56 +01:00
Monique a4f2db9611 tussenopslag 2022-10-25 14:24:10 +02:00
Monique 5dfba96fc6 tussenopslag 2022-10-25 13:43:24 +02:00
Monique eaa736bf93 Merge branch 'fouten/koppelengebruikers' into develop
# Conflicts:
#	application/core/MY_Controller.php
2022-10-17 21:16:18 +02:00
Monique 41023560d8 Wachter callback snellere queryfilter lege records 2022-10-17 21:14:09 +02:00
Monique ab9a53542e tussenopslag 2022-10-17 12:13:04 +02:00
Monique 162093a6b7 Merge branch 'feature/draganddrop' into develop
# Conflicts:
#	application/core/MY_Controller.php
#	public/js/monpas/models/ontwikkelmodel.js
2022-10-09 12:01:17 +02:00
Monique 58d2afaf9a drag en drop zichtbaar na switchen paginas 2022-10-09 11:58:13 +02:00
Monique ce97032974 deel2 2022-10-03 13:32:12 +02:00
Monique cc4ead0867 tussenopslag 2022-10-03 12:46:50 +02:00
Monique e8fd10435f Merge branch 'feature/draganddrop' into develop
# Conflicts:
#	application/core/MY_Controller.php
2022-09-29 10:40:21 +02:00
Monique 56013513b1 disabled ijkpunten, consolelogs, versie 2022-09-29 10:38:13 +02:00
Monique 44d614d72e vergeten 2022-09-27 16:02:36 +02:00
Monique 2f848eb59a vergeten 2022-09-09 16:44:39 +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 9545473157 status wat betreft invullen lijsten 2022-06-24 14:35:50 +02:00
Monique f7fe1ced6b ijkpunten individule versies niet zichtbaar 2022-06-10 12:14:32 +02:00
Monique e8a6bf85b7 kleuren werden niet goed opgehaald bij resultaat matrix 2022-06-10 10:35:52 +02:00
Monique 96fe9e4aa7 Merge branch 'feature/oudersinmonpas'
# Conflicts:
#	application/core/MY_Controller.php
2022-05-27 20:31:57 +02:00
Monique c5eb1df6e9 info tekst financien en kleiner ijkpuntenblokje 2022-05-27 18:45:26 +02:00
Monique cf8f7e8550 instrumenten ook voor leerlingen 2022-05-23 16:11:35 +02:00
Monique bce246e1a3 ouders in monpas 2022-05-23 13:02:26 +02:00
Monique 41f283e8f0 grafieken 2022-05-03 16:12:05 +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