 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
|
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 |
|
|
Monique
|
eaa736bf93
|
Merge branch 'fouten/koppelengebruikers' into develop
# Conflicts:
# application/core/MY_Controller.php
|
2022-10-17 21:16:18 +02:00 |
|
|
Monique
|
da5ed1afa8
|
versie
|
2022-10-17 21:15:49 +02:00 |
|
|
Monique
|
41023560d8
|
Wachter callback snellere queryfilter lege records
|
2022-10-17 21:14:09 +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
|
dd95f19047
|
Merge branch 'fouten/kleuren' into develop
# Conflicts:
# .gitignore
# application/core/MY_Controller.php
|
2022-10-07 09:07:27 +02:00 |
|
|
Monique
|
3d715f6b87
|
ignore
|
2022-10-07 09:05:23 +02:00 |
|
|
Monique
|
1fed24d27b
|
ignore
|
2022-10-07 09:05:15 +02:00 |
|
|
Monique
|
09affb644a
|
kleurenfout
|
2022-10-07 09:03:49 +02:00 |
|
|
Monique
|
509e10ecfb
|
nieuwe versie
|
2022-10-04 11:38:26 +02:00 |
|
|
Monique
|
ce97032974
|
deel2
|
2022-10-03 13:32:12 +02:00 |
|
|
Monique
|
03e2d875b6
|
versie
|
2022-10-03 13:32:01 +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
|
51f2ae654f
|
afbeeldingen ignore
|
2022-09-29 10:39:43 +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
|
609340fefd
|
die ook nog
|
2022-09-27 16:02:23 +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
|
ffd213d350
|
versie
|
2022-09-09 17:11:07 +02:00 |
|
|
Monique
|
2f848eb59a
|
vergeten
|
2022-09-09 16:44:39 +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
|
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
|
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
|
8c751d80fa
|
Merge branch 'feature/invulstatus' into develop
|
2022-06-24 14:36:07 +02:00 |
|
|
Monique
|
9545473157
|
status wat betreft invullen lijsten
|
2022-06-24 14:35:50 +02:00 |
|
|
Monique
|
7d48cca222
|
Merge branch 'fouten/resultaatmatrix' into develop
|
2022-06-10 12:14:49 +02:00 |
|
|
Monique
|
f7fe1ced6b
|
ijkpunten individule versies niet zichtbaar
|
2022-06-10 12:14:32 +02:00 |
|
|
Monique
|
0aacc8dd7d
|
Merge branch 'fouten/resultaatmatrix' into develop
# Conflicts:
# application/core/MY_Controller.php
|
2022-06-10 10:39:46 +02:00 |
|
|
Monique
|
e8a6bf85b7
|
kleuren werden niet goed opgehaald bij resultaat matrix
|
2022-06-10 10:35:52 +02:00 |
|
|
Monique
|
e4c852671b
|
versie
|
2022-05-27 20:33:28 +02:00 |
|
|
Monique
|
96fe9e4aa7
|
Merge branch 'feature/oudersinmonpas'
# Conflicts:
# application/core/MY_Controller.php
|
2022-05-27 20:31:57 +02:00 |
|
|
Monique
|
da1a0a9cc0
|
Merge branch 'feature/alleInstrumenteninCompactSop' into develop
|
2022-05-27 18:46:33 +02:00 |
|
|
Monique
|
c5eb1df6e9
|
info tekst financien en kleiner ijkpuntenblokje
|
2022-05-27 18:45:26 +02:00 |
|
|
Monique
|
e5ccf831ec
|
Merge branch 'feature/alleInstrumenteninCompactSop' into develop
# Conflicts:
# application/core/MY_Controller.php
|
2022-05-24 21:34:16 +02:00 |
|
|
Monique
|
a08028d5b6
|
versie
|
2022-05-24 21:33:32 +02:00 |
|
|
Monique
|
6536a53689
|
verbeteringen
|
2022-05-24 21:32:52 +02:00 |
|
|
Monique
|
8f54333a55
|
Merge branch 'feature/oudersinmonpas' into develop
|
2022-05-23 16:11:55 +02:00 |
|
|
Monique
|
cf8f7e8550
|
instrumenten ook voor leerlingen
|
2022-05-23 16:11:35 +02:00 |
|
|
Monique
|
f12ba5f67d
|
Merge branch 'feature/oudersinmonpas' into develop
# Conflicts:
# application/core/MY_Controller.php
|
2022-05-23 13:04:05 +02:00 |
|
|
Monique
|
bce246e1a3
|
ouders in monpas
|
2022-05-23 13:02:26 +02:00 |
|
|
Monique
|
73d4160105
|
kortere subtitel op sopblokjes
|
2022-05-11 12:44:08 +02:00 |
|
|
Monique
|
a399d8d8ff
|
end if fout
|
2022-05-03 16:50:56 +02:00 |
|
|
Monique
|
524a391ef4
|
hoofdletter in query
|
2022-05-03 16:33:25 +02:00 |
|
|
Monique
|
41f283e8f0
|
grafieken
|
2022-05-03 16:12:05 +02:00 |
|
|
Monique
|
a24d9b486f
|
tussenopslag
|
2022-04-29 10:31:51 +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 |
|
|
Monique
|
0f637c8d12
|
toon grafiek false en fout met aantal
|
2022-04-08 12:51:26 +02:00 |
|
|
Monique
|
e27dc57f75
|
pad naar handleidingen
|
2022-04-01 11:12:58 +02:00 |
|
|
Monique
|
570bfc2f21
|
nieuwe handleidingen
|
2022-04-01 10:15:57 +02:00 |
|
|
Monique
|
606dad7d77
|
tussenopslag
|
2022-03-29 10:23:56 +02:00 |
|
|
Monique
|
c3556fab2d
|
omvang
|
2022-03-28 15:10:30 +02:00 |
|
|
Monique
|
41573315e4
|
Merge branch 'fouten/chartomvang&layoutlijst&flexibel' into develop
# Conflicts:
# application/core/MY_Controller.php
|
2022-03-28 15:06:36 +02:00 |
|
|
Monique
|
bf0b652caa
|
aanpassing legenda omvang
|
2022-03-28 15:05:58 +02:00 |
|
|
Monique
|
8696bc32b6
|
russenopslag
|
2022-03-28 15:04:56 +02:00 |
|
|
Monique
|
7031844f7b
|
tussenopslag
|
2022-03-28 15:04:41 +02:00 |
|
|
Monique
|
b80ceeb342
|
versie
|
2022-03-28 13:50:11 +02:00 |
|
|
Monique
|
263cb088a1
|
versie
|
2022-03-28 13:45:19 +02:00 |
|
|
Monique
|
c2aff06df6
|
Merge branch 'fouten/chartomvang&layoutlijst&flexibel' into develop
# Conflicts:
# application/core/MY_Controller.php
|
2022-03-28 13:43:05 +02:00 |
|
|
Monique
|
4a4275f485
|
fouten grafieken omvang + ruimere layout lijst
|
2022-03-28 13:42:36 +02:00 |
|
|
Monique
|
326b3f70dd
|
versie
|
2022-03-15 12:12:15 +01:00 |
|
|
Monique
|
e104faa9a0
|
Merge branch 'feature/compact9en10'
# Conflicts:
# application/core/MY_Controller.php
|
2022-03-15 12:10:24 +01:00 |
|
|
Monique
|
54b90d23eb
|
version
|
2022-03-10 16:21:06 +01:00 |
|
|
Monique
|
8282498e78
|
version
|
2022-03-10 15:38:23 +01:00 |
|
|
Monique
|
c00ffa6600
|
Verbetraanpak $ Scan Zorg in compacsop
|
2022-03-10 15:36:54 +01:00 |
|
|
Monique
|
4aac5f8c25
|
Merge branch 'feature/yasgrafiekdivmeter' into develop
# Conflicts:
# application/core/MY_Controller.php
|
2022-03-01 17:31:12 +01:00 |
|
|
Monique
|
a2561eb081
|
3dgrafieken
|
2022-03-01 17:26:51 +01:00 |
|
|
Monique
|
0aecc25074
|
3d-grafieken
|
2022-03-01 14:43:16 +01:00 |
|
|
Monique
|
19e5ed3e04
|
Merge branch 'feature/sopOverzichtPerCriterium'
|
2022-02-10 09:17:08 +01:00 |
|
|
Monique
|
3a79ee0bd2
|
verisie
|
2022-02-08 12:16:01 +01:00 |
|
|
Monique
|
e01b48560a
|
Merge branch 'feature/sopOverzichtPerCriterium' into develop
|
2022-02-08 12:07:36 +01:00 |
|
|
Monique
|
1e88478891
|
sops per criterium bors,robs en swop niet
|
2022-02-08 12:07:21 +01:00 |
|
|
Monique
|
ea1cc7e1da
|
versie verhogen
|
2022-02-07 09:02:07 +01:00 |
|
|
Monique
|
895cff553f
|
versie
|
2022-02-02 11:17:57 +01:00 |
|
|
Monique
|
dc01a4b777
|
Merge branch 'feature/printInvullijst' into develop
# Conflicts:
# application/core/MY_Controller.php
# application/libraries/monpas/compactsop/Compactepaginas.php
|
2022-02-02 11:16:13 +01:00 |
|
|
Monique
|
de3375bf72
|
pdf van invullijst
|
2022-02-02 11:12:25 +01:00 |
|
|
Monique
|
89baf9bfd9
|
tussenopslag
|
2022-01-31 15:55:14 +01:00 |
|