Overigen/monpas
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
243 Commits 3 Branches 0 Tags
bb87dbc72d21565705e91c1332989e989128ca34
Commit Graph
243 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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