Commit Graph
255 Commits
Author SHA1 Message Date
Monique fb6ef95d39 Merge branch 'fouten/kamerversiesbijambities' into develop 2022-12-09 16:31:57 +01:00
Monique 600de45445 orgversie swv 2022-12-09 16:31:45 +01:00
Monique dfb4d3579f Merge branch 'fouten/kamerversiesbijambities' into develop 2022-12-08 16:41:14 +01:00
Monique 0a9bf59d51 conrole op ambitie groter dan 0 verwijderd 2022-12-08 16:40:53 +01:00
Monique 05d22502d5 Merge branch 'fouten/kamerversiesbijambities' into develop
# Conflicts:
#	application/controllers/monpas/Streefcijfers.php
2022-12-06 22:03:57 +01:00
Monique d03944c77b iets mis gegaan met overzetten 2022-12-06 22:01:40 +01:00
Monique 77bfe72e1a fout met array in array 2022-12-06 08:41:36 +01:00
Monique ada9b88b98 streefcijfers 2022-12-05 17:11:59 +01:00
Monique 27d03b22ea Merge branch 'fouten/kamerversiesbijambities' into develop 2022-12-05 17:10:02 +01:00
Monique ab41e2d975 helpt dit 2022-12-05 17:09:50 +01:00
Monique 1c6fbb0aa8 Merge branch 'fouten/kamerversiesbijambities' into develop
# Conflicts:
#	application/controllers/monpas/Streefcijfers.php
2022-12-05 17:02:08 +01:00
Monique ab7ab4ae32 kamers apart 2022-12-05 17:01:14 +01:00
Monique 4b1060251b teveel ijkpunten geteld 2022-12-05 14:13:43 +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 632eb268b0 Merge branch 'fouten/toegangdivinsop' into develop
# Conflicts:
#	application/core/MY_Controller.php
2022-11-29 14:06:33 +01:00
Monique 8f5449e80d compact div met opg ipv globorg 2022-11-29 14:05:51 +01:00
Monique 98e25650b5 Merge branch 'feature/streefcijfersperorg' 2022-11-28 23:52:23 +01:00
Monique 169c50dc69 Merge branch 'feature/streefcijfersperorg' into develop
# Conflicts:
#	application/core/MY_Controller.php
#	application/views/monpas/pages/streefcijfers.php
2022-11-28 23:51:46 +01:00
Monique ec74532c9d niet meer dan 100 procent 2022-11-28 23:50:57 +01:00
Monique 9e11660f36 Merge branch 'feature/streefcijfersperorg'
# Conflicts:
#	application/core/MY_Controller.php
2022-11-28 23:35:04 +01:00
Monique cee7fb8a64 streefcijfers def 2022-11-28 23:29:26 +01:00
Monique adfab435bd Merge branch 'feature/streefcijfersperorg' into develop 2022-11-22 20:23:11 +01:00
Monique 18e0f0632b classnaam gewijzigd in bestaande 2022-11-22 20:22:59 +01:00
Monique 390407fde4 hoofdletter 2022-11-22 18:06:19 +01:00
Monique 75c9f22a1a hoofdletter 2022-11-22 18:05:34 +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 9b70817ec1 verise 2022-11-22 17:13:23 +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 37cc90be4c Merge branch 'archief/feature/swvMaaktSopSchool' into develop
# Conflicts:
#	application/core/MY_Controller.php
2022-11-08 12:37:03 +01:00
Monique 9a89ce7b5a downloadbutton 2022-11-08 12:34:05 +01:00
Monique 8d3553318b tussenopslag 2022-11-08 10:10:41 +01:00
Monique 9ba6f7c857 insert schooldetails als ze nog niet bestaan 2022-11-07 15:06:54 +01:00
Monique c00017d36e insertschooldetails als ze nog niet bestaan 2022-11-07 15:04:41 +01:00
Monique bbb934ed61 Merge branch 'feature/swvMaaktSopSchool' into develop 2022-11-07 14:29:59 +01:00
Monique 3a7f183fc3 chmod bij upload 2022-11-07 14:29:46 +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 6d52d23aca tussenopslag 2022-11-02 19:26:56 +01:00
Monique a44e4c5611 tussenopslag 2022-11-02 16:26:19 +01:00
Monique 8f7e651e25 Merge branch 'feature/swvMaaktSopSchool' into develop 2022-11-02 15:46:04 +01:00
Monique b6f68be4b3 headerinfo 2022-11-02 15:19:47 +01:00
Monique bb87dbc72d spelfout 2022-11-02 13:52:26 +01:00
Monique 4ed0c29812 Merge branch 'feature/swvMaaktSopSchool' into develop 2022-11-02 13:43:21 +01:00
Monique 308f13d9ec versie 2022-11-02 13:43:08 +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