From 5cbd84614a4840a1751bb4df876e00ea49f6e138 Mon Sep 17 00:00:00 2001
From: Özgür Kesim <oec@codeblau.de>
Date: Thu, 28 Nov 2024 22:37:08 +0100
Subject: udpate plans

---
 fefe.plan | 24 ++++++++++++----------
 oec.plan  | 70 +++++++++++++++++++++++++++++++++++++++++++++++----------------
 2 files changed, 66 insertions(+), 28 deletions(-)

diff --git a/fefe.plan b/fefe.plan
index 41681b2..15f60b4 100644
--- a/fefe.plan
+++ b/fefe.plan
@@ -1,25 +1,27 @@
 # 2023
 
+
 # 2024
-2024-01		WP2:merchant	10d
+2024-01		WP2:merchant	10d		libmerchant
 2024-02
 2024-03
-2024-04		WP2:merchant	10d
+2024-04
 2024-05
 2024-06
 2024-07
 2024-08
 2024-09
-2024-10		WP2:merchant	15d
-2024-11		WP2:merchant	15d
-2024-12		WP2:merchant	18d
+2024-10		WP2:merchant	20d		GNUnet (merchant)
+2024-11		WP2:merchant	20d		GNUnet, merchant
+2024-12		WP2:merchant	18d		merchant
 
 # 2025
-2025-01		WP2:merchant	20d
-2025-02		WP2:merchant	20d
+2025-01		WP2:merchant	20d		merchant
+2025-02		WP2:merchant	20d		merchant, reporting
+2025-03		WP2:wallet		10d		qtart, reporting
 2025-03		WP2:app			 9d
 2025-04		WP2:gls			20d
-2025-05		WP2:gls			16d
+2025-05		WP2:gls			13d
 2025-06		WP2:swiss		 9d
 2025-07
 2025-08
@@ -35,7 +37,7 @@
 2026-05		WP5:auditor		18d
 2026-06		WP5:auditor		18d
 2026-07		WP5:auditor		18d
-2026-08		WP5:auditor		18d
+2026-08
 2026-09		WP5:auditor		18d
-2026-10		WP6:stnds		18d
-2026-11
+2026-10		WP5:auditor		18d
+2026-11		WP6:stnds		18d
diff --git a/oec.plan b/oec.plan
index 7e46016..45cd125 100644
--- a/oec.plan
+++ b/oec.plan
@@ -2,44 +2,80 @@
 2023-12		WP2:legal		5d
 
 # 2024
-2024-01
-2024-02
-2024-03
-2024-04
-2024-05		WP6:events		 9d
+2024-01		WP2:gls			 2h		Status Updates
+2024-02		WP2:gls			 2h		Status Updates
+2024-03		WP2:gls			 2h		Status Updates
+2024-03		WP2:wallet		10d		FoT
+2024-04		WP2:gls			 2h		Status Updates
+2024-05		WP2:gls			 2h		Status Updates
+2024-05		WP6:events		 3d		Talk TU Eindhoven
+2024-06		WP2:gls			 2h		Status Updates
+2024-06		WP6:events		 3d		Talks Ecash Hackday
+2024-06		WP6:events		 2d		Prep PointZero Forum
 2024-06		WP2:wallet		10d		FoT
+2024-07		WP2:gls			 2h		Status Updates
 2024-07		WP2:wallet		10d		FoT
-2024-08		WP2:legal		 5d
-2024-08		WP2:wallet		 5d		Threat Model
-2024-09		WP2:wallet		15d		FoT
-2024-10		WP2:wallet		10d
-2024-11		WP2:wallet		20d
-2024-12		WP2:wallet		20d
+2024-07		WP6:events		 2d		PointZero Forum
+2024-08		WP2:gls			 2h		Status Updates
+2024-08		WP2:wallet		 5d		Petit-Vivy, Threat Model
+2024-09		WP2:gls			 2h		Status Updates
+2024-09		WP2:wallet		 5d		FoT
+2024-10		WP2:gls			 2h		Status Updates
+2024-10		WP2:wallet		10d		FoT, wallet
+2024-11		WP2:gls			 2h		Status Updates
+2024-11		WP2:wallet		20d		wallet
+2024-12		WP2:gls			 2h		Status Updates
+2024-12		WP2:wallet		20d		Threat Model
 
 # 2025
-2025-01		WP2:wallet		22d
-2025-02		WP2:wallet		20d
-2025-03		WP2:wallet		20d
-2025-04		WP2:gls			20d
-2025-05		WP2:gls			16d
+2025-01		WP2:gls			 2h		Status Updates
+2025-01		WP2:wallet		22d		wallet core
+2025-02		WP2:gls			 2h		Status Updates
+2025-02		WP2:wallet		20d		wallet core
+2025-03		WP2:gls			 2h		Status Updates
+2025-03		WP2:wallet		10d		reporting
+2025-04		WP2:gls			 2h		Status Updates
+2025-04		WP2:gls			15d
+2025-05		WP2:gls			 2h		Status Updates
+2025-05		WP2:gls			15d
+2025-05		WP2:gls			 2h		Status Updates
 2025-05		WP2:app			 9d
+2025-06		WP2:gls			 2h		Status Updates
 2025-06		WP2:swiss		 9d
+2025-07		WP2:gls			 2h		Status Updates
 2025-07		WP2:wallet		10d
+2025-08		WP2:gls			 2h		Status Updates
 2025-08		WP2:legal		 5d
+2025-09		WP2:gls			 2h		Status Updates
 2025-09		WP3:donau		18d
+2025-10		WP2:gls			 2h		Status Updates
 2025-10		WP3:donau		 9d
+2025-11		WP2:gls			 2h		Status Updates
 2025-11		WP2:mag			 9d
 
 # 2026
+2026-01		WP2:gls			 2h		Status Updates
 2026-01		WP2:legal		 3d
-2026-01		WP6:events		 9d
+2026-01		WP2:gls			 2h		Status Updates
+2026-01		WP6:events		 8d
+2026-02		WP2:gls			 2h		Status Updates
 2026-02
+2026-03		WP2:gls			 2h		Status Updates
 2026-03		WP5:auditor		18d
+2026-04		WP2:gls			 2h		Status Updates
 2026-04		WP5:auditor		18d
+2026-05		WP2:gls			 2h		Status Updates
 2026-05		WP5:auditor		18d
+2026-06		WP2:legal		 5d
+2026-06		WP2:gls			 2h		Status Updates
 2026-06		WP5:auditor		18d
+2026-07		WP2:gls			 2h		Status Updates
 2026-07		WP5:auditor		18d
+2026-08		WP2:gls			 2h		Status Updates
 2026-08		WP5:auditor		18d
+2026-09		WP2:gls			 2h		Status Updates
 2026-09		WP5:auditor		18d
+2026-10		WP2:gls			 2h		Status Updates
 2026-10		WP5:auditor		18d
+2026-11		WP2:gls			 2h		Status Updates
 2026-11		WP5:auditor		18d
-- 
cgit v1.2.3