Commit Graph
426 Commits
Author SHA1 Message Date
Monique ceb64473a5 Merge branch 'feature/archiefoptie-ondersteuningsvorm' into develop 2026-02-05 18:53:09 +01:00
Monique 48f3a9a7ff sommen parseInt, groepen filteren op schooljaar 2026-02-05 18:52:58 +01:00
Monique 1e91e3b69d Merge branch 'feature/archiefoptie-ondersteuningsvorm' into develop 2026-02-03 18:41:13 +01:00
Monique e265e257b8 nieuwe onderst. vorm ook opslaan als aantal 0 is 2026-02-03 18:40:55 +01:00
Monique bf34f295a5 Merge branch 'feature/archiefoptie-ondersteuningsvorm' into develop 2026-02-03 14:33:50 +01:00
Monique c35552cc66 optie om ondersteuningsvorm per groep te archiveren
+ dearchiveren
2026-02-03 14:33:32 +01:00
Monique 18adc43311 Merge branch 'mon-fin-rodekleurverw' into develop 2025-03-11 13:08:52 +01:00
Monique 6e6d1af59b Merge branch 'mon-fin-rodekleurverw' 2025-03-11 13:06:27 +01:00
Monique c526c48446 overzicht mon fin 2025-03-11 13:04:54 +01:00
Monique c8fb85e2d1 verise 2025-03-10 16:22:16 +01:00
Monique c4f2b0097b Merge branch 'mon-fin-rodekleurverw' into develop 2025-03-10 13:57:50 +01:00
Monique 89b9891033 geen rode tekst bij budgetoverschrijding 2025-03-10 13:57:21 +01:00
Monique 4ec1aacded Merge branch 'hotfiix-monfin' into develop 2025-03-10 12:04:46 +01:00
Monique 96a794693b Merge branch 'hotfiix-monfin' 2025-03-10 12:04:11 +01:00
Monique 1a95ce2af5 bedrag 2maal geformatteerd 2025-03-10 12:03:34 +01:00
Monique 03e0043c77 afvangen als er geenjaar toewijzing is 2025-03-07 16:22:03 +01:00
Monique 6ea531473c Merge branch 'terugdraaienDatumbeperkingCS' into develop 2025-01-27 11:45:35 +01:00
Monique b834f841bf alle versies tonen van invullijst 2025-01-27 11:44:46 +01:00
Monique 018b99ab69 tabelmarge 0 2025-01-10 16:09:08 +01:00
Monique e31c562639 Merge branch 'feature/SWVsop' into develop 2025-01-09 10:21:27 +01:00
Monique ad6d39d8f1 Geenversies ophalen recenter dan gekozen schooljaar 2025-01-09 10:21:06 +01:00
Monique a5352df23e Merge branch 'feature/SWVsop' into develop 2025-01-06 14:43:29 +01:00
Monique 0b6fbaaf3a namen compact sop + layoutverbeteringen 2025-01-06 14:39:02 +01:00
Liesbeth ter Schure d0886d7275 attach uitgesterd 2024-09-24 12:55:18 +02:00
Liesbeth ter Schure f6df8d8d86 afzender mail aangepast 2024-09-24 12:41:30 +02:00
Liesbeth ter Schure 0fa5948a50 versie verhoogd 2024-09-24 11:23:32 +02:00
Liesbeth ter Schure 6345549a53 Merge branch 'master' of https://bitbucket.org/pensare/monpas 2024-09-24 10:14:57 +02:00
theo b02eae9515 fix for sending user credentials 2024-09-16 15:40:39 +02:00
Monique b02875543f versie bij 2 factor 2024-09-02 10:45:53 +02:00
Liesbeth ter Schure c75f567d7b ignore 2024-08-27 16:35:01 +02:00
Liesbeth ter Schure 16ddc27c71 gitignore 2024-08-26 12:32:54 +02:00
Liesbeth ter Schure 1fac2a71e3 Merge branch 'master' of https://bitbucket.org/pensare/monpas 2024-08-26 12:13:18 +02:00
Liesbeth ter Schure 12a984257b uitleg 2factor 2024-08-26 12:13:13 +02:00
theo 23531c04c5 fix for missing protocol 2024-08-25 21:02:08 +02:00
theo a2bf022e52 produktie mail naar postmark 2024-08-25 20:26:36 +02:00
Liesbeth ter Schure b600917bd3 test theo 2024-08-25 16:26:38 +02:00
Liesbeth ter Schure 43f3a489e2 Merge branch 'dubbele-authenticatie-IN-TEST' 2024-08-25 16:26:11 +02:00
Liesbeth ter Schure 1df1d51cb7 Merge branch 'develop' of https://bitbucket.org/pensare/monpas into develop 2024-08-25 16:24:42 +02:00
theo cb53785ae6 Refactor two-factor authentication logic
Updated two-factor authentication to streamline the time format handling using `time()` instead of `DateTime`, reducing code complexity. Also fixed a potential bug in `MY_Model.php` by checking the query object before accessing `num_rows()`.
2024-08-25 09:34:40 +02:00
Liesbeth ter Schure 3b9ed5f957 composer 2024-08-22 13:12:51 +02:00
Liesbeth ter Schure f2c8449f48 Merge branch 'dubbele-authenticatie-IN-TEST' into develop 2024-08-22 09:57:29 +02:00
Liesbeth ter Schure e35926b594 Two factor authentication 2024-08-22 09:56:48 +02:00
Liesbeth ter Schure d12890f575 TEST AAMNPASSING 2024-08-22 09:27:03 +02:00
Monique d66dadd11f Merge branch 'master' into develop 2024-03-04 18:12:43 +01:00
Monique ad37ca50f2 hopelijk laatste dingen 2024-03-04 18:12:05 +01:00
Monique 3ce1d360ba alweer een dingetje 2024-03-04 13:49:13 +01:00
Monique 6172a2932b totaalbudget overal meetellen, deelbudgetten niet 2024-03-04 13:31:09 +01:00
Monique 66ab033e6b foutje met rode kleur procenten 2024-03-04 10:30:03 +01:00
Monique e345399e03 Merge branch 'fouten/monfin' into develop 2024-03-04 09:32:20 +01:00
Monique ee398549b1 gebudgetteerde bedragen in overzicht monfin ipv budgetten 2024-03-04 09:31:15 +01:00