 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
|
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
|
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
|
50459e9ffd
|
tussenstand
|
2022-11-18 15:47:13 +01:00 |
|
|
Monique
|
a7bc12a254
|
tussenopslag
|
2022-11-17 11:34:44 +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
|
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
|
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
|
dd95f19047
|
Merge branch 'fouten/kleuren' into develop
# Conflicts:
# .gitignore
# application/core/MY_Controller.php
|
2022-10-07 09:07:27 +02:00 |
|
|
Monique
|
cc4ead0867
|
tussenopslag
|
2022-10-03 12:46:50 +02:00 |
|
|
Monique
|
931993d3c1
|
gewenst 0 bij ontbreken wensids
|
2022-09-29 11:54:56 +02:00 |
|
|
Monique
|
b4d53f12dc
|
poging2
|
2022-09-29 11:30:30 +02:00 |
|
|
Monique
|
6ecd5f8af9
|
poging2
|
2022-09-29 11:29:42 +02:00 |
|
|
Monique
|
6efef82182
|
foutmelding offset
|
2022-09-29 11:25:03 +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
|
2c43f85c81
|
drag and drop gewenst bij Route
|
2022-09-27 16:02:13 +02:00 |
|
|
Monique
|
1cccd025d6
|
chmod
|
2022-09-09 17:29:08 +02:00 |
|
|
Monique
|
a663f21b7e
|
tussenopslag
|
2022-09-09 16:44:27 +02:00 |
|
|
Monique
|
946af1cbc0
|
logo en schoolgegevens in sop
|
2022-09-09 10:31:41 +02:00 |
|
|
Monique
|
76ebdfd7f3
|
declaratie model
|
2022-09-08 13:20:14 +02:00 |
|
|
Monique
|
9cb045b89e
|
tussenopslag
|
2022-09-08 13:18:52 +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
|
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
|
9545473157
|
status wat betreft invullen lijsten
|
2022-06-24 14:35:50 +02:00 |
|
|
Monique
|
e8a6bf85b7
|
kleuren werden niet goed opgehaald bij resultaat matrix
|
2022-06-10 10:35:52 +02:00 |
|