 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
|
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
|
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
|
fac8099373
|
Merge branch 'feature/budgetmonfin' into develop
|
2023-04-25 19:38:33 +02:00 |
|
|
Monique
|
1c22660e2e
|
nog een
|
2023-04-25 19:38:21 +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
|
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
|
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
|
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
|
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
|
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
|
a44e4c5611
|
tussenopslag
|
2022-11-02 16:26:19 +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
|
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
|
09affb644a
|
kleurenfout
|
2022-10-07 09:03:49 +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 |
|