203 Commits
Author SHA1 Message Date
Monique 18b363af71 dubbeltellingen fonfin + tijdelijk verbergen totalen 2023-09-25 17:02:15 +02:00
Monique b1bcf7220a Merge branch 'feature/labels' into develop 2023-07-03 13:10:34 +02:00
Monique d3a369cb8e zo beter 2023-07-03 13:10:11 +02:00
Monique b2d015dab8 Merge branch 'feature/labels' into develop 2023-07-03 12:19:39 +02:00
Monique d76bf98cf2 Merge branch 'feature/budgetmonfin' into feature/labels 2023-07-03 12:16:41 +02:00
Monique 4c1536e8b3 stappenplanBAO 2023-07-03 12:08:17 +02:00
Monique 89843a9f6c hoger kalenderjaar ivm budgettering 2023-06-30 13:43:06 +02:00
Monique 1480cd5a2f als restant 0 is leeg veld 2023-06-26 13:32:47 +02:00
Monique c26d3b2507 nog een test 2023-06-26 12:51:51 +02:00
Monique e0b2b12483 werkt dit beter 2023-06-26 12:36:02 +02:00
Monique 440bd9ae06 Merge branch 'feature/budgetmonfin' into develop 2023-06-23 09:40:17 +02:00
Monique b9acce3072 totaalbudget verdelen 2023-06-22 16:25:31 +02:00
Monique 0afb3a9263 tussenstand 2023-06-19 17:38:26 +02:00
Monique f7adcfcc93 tussenopslag 2023-06-14 12:44:03 +02:00
Monique ac46447bea tussenopslag 2023-06-09 15:50:11 +02:00
Monique 8d46c0f2bc Merge branch 'feature/budgetmonfin' into develop 2023-04-28 13:59:48 +02:00
Monique 702c565674 wijziging toelichting 2023-04-28 13:57:50 +02:00
Monique b046e57e09 procent teruggezet 2023-04-25 19:29:37 +02:00
Monique 714390aa67 precent in js teruggezet 2023-04-25 19:28:44 +02:00
Monique 857b43f236 Merge branch 'feature/budgetmonfin' into develop 2023-04-25 19:23:38 +02:00
Monique 747142a441 2 percentages verwijderd 2023-04-25 19:23:20 +02:00
Monique 60b577f279 Merge branch 'feature/budgetmonfin' into develop 2023-04-05 21:53:37 +02:00
Monique 236c949fc9 monfin 2023-04-05 21:53:21 +02:00
Monique d87652bff7 Merge branch 'feature/budgetmonfin' into develop 2023-03-24 15:01:12 +01:00
Monique 4173dd2dc5 budgetteren in monfin 2023-03-24 15:00:04 +01:00
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 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