summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--fefe.plan33
-rw-r--r--oec.plan57
-rw-r--r--timelogs/2024.oec.timelog70
3 files changed, 83 insertions, 77 deletions
diff --git a/fefe.plan b/fefe.plan
index 15f60b4..5300c3b 100644
--- a/fefe.plan
+++ b/fefe.plan
@@ -19,25 +19,26 @@
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 13d
-2025-06 WP2:swiss 9d
+2025-03 WP2:app 9d ?
+2025-04 WP2:gls 20d ?
+2025-05 WP2:gls 13d ?
+2025-06 WP2:swiss 9d ?
2025-07
2025-08
-2025-09 WP3:donau 18d
-2025-10 WP3:donau 9d
-2025-11 WP2:mag 9d
+2025-09 WP3:donau 18d ?
+2025-10 WP3:donau 9d ?
+2025-11 WP2:mag 9d ?
+2025-12 WP5:auditor 7d ? preparation
# 2026
-2026-01 WP5:auditor 18d
-2026-02 WP5:auditor 18d
-2026-03 WP5:auditor 18d
-2026-04 WP5:auditor 18d
-2026-05 WP5:auditor 18d
-2026-06 WP5:auditor 18d
-2026-07 WP5:auditor 18d
+2026-01 WP5:auditor 20d
+2026-02 WP5:auditor 20d
+2026-03 WP5:auditor 20d
+2026-04 WP5:auditor 20d
+2026-05 WP5:auditor 15d
+2026-06 WP5:auditor 20d
+2026-07 WP5:auditor 20d
2026-08
-2026-09 WP5:auditor 18d
-2026-10 WP5:auditor 18d
+2026-09 WP5:auditor 20d
+2026-10 WP5:auditor 10d
2026-11 WP6:stnds 18d
diff --git a/oec.plan b/oec.plan
index 45cd125..4c0dc6b 100644
--- a/oec.plan
+++ b/oec.plan
@@ -8,24 +8,21 @@
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 WP6:events 5d Talks
2024-06 WP2:wallet 10d FoT
2024-07 WP2:gls 2h Status Updates
2024-07 WP2:wallet 10d FoT
-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-09 WP2:wallet 10d FoT, threat model
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-11 WP2:wallet 10d wallet
2024-12 WP2:gls 2h Status Updates
-2024-12 WP2:wallet 20d Threat Model
+2024-12 WP2:wallet 15d Threat Model
# 2025
2025-01 WP2:gls 2h Status Updates
@@ -33,49 +30,49 @@
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-03 WP2:wallet 20d reporting
2025-04 WP2:gls 2h Status Updates
-2025-04 WP2:gls 15d
+2025-04 WP2:gls 15d ?
2025-05 WP2:gls 2h Status Updates
-2025-05 WP2:gls 15d
+2025-05 WP2:gls 15d ?
2025-05 WP2:gls 2h Status Updates
-2025-05 WP2:app 9d
+2025-05 WP2:app 9d ?
+2025-05 WP2:legal 5d reporting
2025-06 WP2:gls 2h Status Updates
-2025-06 WP2:swiss 9d
+2025-06 WP2:swiss 9d ?
2025-07 WP2:gls 2h Status Updates
-2025-07 WP2:wallet 10d
+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-09 WP3:donau 18d ?
2025-10 WP2:gls 2h Status Updates
-2025-10 WP3:donau 9d
+2025-10 WP3:donau 9d ?
2025-11 WP2:gls 2h Status Updates
2025-11 WP2:mag 9d
+2025-12 WP2:gls 2h Status Updates
+2025-12 WP5:auditor 7d ? preparation
# 2026
2026-01 WP2:gls 2h Status Updates
-2026-01 WP2:legal 3d
+2026-01 WP2:legal 3d ?
2026-01 WP2:gls 2h Status Updates
-2026-01 WP6:events 8d
+2026-01 WP6:events 8d ?
2026-02 WP2:gls 2h Status Updates
-2026-02
+2026-02 WP6:events 5d ?
2026-03 WP2:gls 2h Status Updates
-2026-03 WP5:auditor 18d
+2026-03 WP5:auditor 20d
2026-04 WP2:gls 2h Status Updates
-2026-04 WP5:auditor 18d
+2026-04 WP5:auditor 20d
2026-05 WP2:gls 2h Status Updates
-2026-05 WP5:auditor 18d
-2026-06 WP2:legal 5d
+2026-05 WP5:auditor 15d
2026-06 WP2:gls 2h Status Updates
-2026-06 WP5:auditor 18d
+2026-06 WP5:auditor 20d
2026-07 WP2:gls 2h Status Updates
-2026-07 WP5:auditor 18d
+2026-07 WP5:auditor 20d
2026-08 WP2:gls 2h Status Updates
-2026-08 WP5:auditor 18d
+2026-08 WP5:auditor 10d
2026-09 WP2:gls 2h Status Updates
-2026-09 WP5:auditor 18d
+2026-09 WP5:auditor 20d
2026-10 WP2:gls 2h Status Updates
-2026-10 WP5:auditor 18d
-2026-11 WP2:gls 2h Status Updates
-2026-11 WP5:auditor 18d
+2026-10 WP5:auditor 20d
+2026-11 WP2:legal 5d reporting
diff --git a/timelogs/2024.oec.timelog b/timelogs/2024.oec.timelog
index 4ba958f..85ee777 100644
--- a/timelogs/2024.oec.timelog
+++ b/timelogs/2024.oec.timelog
@@ -31,6 +31,7 @@
2024-01-29 WP2:gls 8h Monthly Meeting, Planning
2024-01-30
2024-01-31
+
2024-02-01
2024-02-02
# 2024-02-03
@@ -60,6 +61,7 @@
2024-02-27
2024-02-28
2024-02-29
+
2024-03-01
# 2024-03-02
# 2024-03-03
@@ -93,6 +95,7 @@
# 2024-03-29 (Karfreitag)
# 2024-03-30
# 2024-03-31
+
# 2024-04-01 (Ostermontag)
2024-04-02
2024-04-03 WP3:donau 4h Meeting
@@ -154,9 +157,10 @@
2024-05-29 WP6:events 8h Prep Presentation for TU Eindhoven
2024-05-30 WP6:events 8h Prep Presentation for TU Eindhoven
2024-05-31 WP6:events 8h Presentation for TU Eindhoven
+
# 2024-06-01
# 2024-06-02
-2024-06-03 WP6:events 8h Prep Presentation PointZeroForum Biel
+2024-06-03 WP6:events 8h Prep Lecture Material and Presentation PointZeroForum Biel
2024-06-04 WP6:events 8h Prep Presentation PointZeroForum Biel
2024-06-05 WP2:wallet 8h FoT
2024-06-06 WP2:wallet 8h FoT
@@ -215,6 +219,7 @@
2024-07-29 WP2:gls 2h Status Update
2024-07-30
2024-07-31
+
2024-08-01
2024-08-02
# 2024-08-03
@@ -226,11 +231,11 @@
2024-08-09
# 2024-08-10
# 2024-08-11
-2024-08-12 WP2:wallet 8h Petit-Vivy, Threat Model
-2024-08-13 WP2:wallet 8h Petit-Vivy, Threat Model
-2024-08-14 WP2:wallet 8h Petit-Vivy, Threat Model
-2024-08-15 WP2:wallet 8h Petit-Vivy, Threat Model
-2024-08-16 WP2:wallet 8h Petit-Vivy, Threat Model
+2024-08-12 WP2:wallet 10h Petit-Vivy, Threat Model
+2024-08-13 WP2:wallet 10h Petit-Vivy, Threat Model
+2024-08-14 WP2:wallet 10h Petit-Vivy, Threat Model
+2024-08-15 WP2:wallet 10h Petit-Vivy, Threat Model
+2024-08-16 WP2:wallet 8h Petit-Vivy, Threat Model
# 2024-08-17
# 2024-08-18
# 2024-08-19 Urlaub
@@ -246,6 +251,7 @@
# 2024-08-29 Urlaub
# 2024-08-30 Urlaub
# 2024-08-31
+
# 2024-09-01
2024-09-02 WP2:wallet 8h FoT
2024-09-03 WP2:wallet 8h FoT
@@ -254,11 +260,11 @@
2024-09-06 WP2:wallet 8h FoT
# 2024-09-07
# 2024-09-08
-2024-09-09
-2024-09-10
-2024-09-11
-2024-09-12
-2024-09-13
+2024-09-09 WP2:wallet 8h FoT, threat model
+2024-09-10 WP2:wallet 8h FoT, threat model
+2024-09-11 WP2:wallet 8h FoT, threat model
+2024-09-12 WP2:wallet 8h FoT, threat model
+2024-09-13 WP2:wallet 8h FoT, threat model
# 2024-09-14
# 2024-09-15
2024-09-16
@@ -276,6 +282,7 @@
# 2024-09-28
# 2024-09-29
2024-09-30 WP2:gls 2h Status Update
+
2024-10-01 WP2:wallet 8h FoT
2024-10-02 WP2:wallet 8h FoT
# 2024-10-03 (Tag der Deutschen Einheit)
@@ -307,35 +314,36 @@
2024-10-29
2024-10-30
2024-10-31
-2024-11-01
+
+2024-11-01 WP2:wallet 8h wallet
# 2024-11-02
# 2024-11-03
-2024-11-04
-2024-11-05
-2024-11-06
-2024-11-07
-2024-11-08
+2024-11-04 WP2:wallet 8h wallet
+2024-11-05 WP2:wallet 8h wallet
+2024-11-06 WP2:wallet 8h wallet
+2024-11-07 WP2:wallet 8h wallet
+2024-11-08 WP2:wallet 8h wallet
# 2024-11-09
# 2024-11-10
-2024-11-11
-2024-11-12
-2024-11-13
-2024-11-14
-2024-11-15
+2024-11-11 WP2:wallet 4h wallet
+2024-11-12 WP2:wallet 4h wallet
+2024-11-13 WP2:wallet 4h wallet
+2024-11-14 WP2:wallet 4h wallet
+2024-11-15 WP2:wallet 4h wallet
# 2024-11-16
# 2024-11-17
-2024-11-18
-2024-11-19
-2024-11-20
-2024-11-21
-2024-11-22
+2024-11-18 WP2:wallet 4h wallet
+2024-11-19 WP2:wallet 4h wallet
+2024-11-20 WP2:wallet 4h wallet
+2024-11-21 WP2:wallet 4h wallet
+2024-11-22 WP2:wallet 4h wallet
# 2024-11-23
# 2024-11-24
2024-11-25 WP2:gls 2h Status Update
-2024-11-26
-2024-11-27
-2024-11-28
-2024-11-29
+2024-11-26 WP2:wallet 4h wallet
+2024-11-27 WP2:wallet 4h wallet
+2024-11-28 WP2:wallet 4h wallet
+2024-11-29 WP2:wallet 4h wallet
# 2024-11-30
# 2024-12-01
2024-12-02
generated by cgit v1.2.3 (git 2.39.1) at 2025-09-11 13:16:12 +0000