Diffstat (limited to 'wiki/src/contribute/calendar.mdwn')
1 files changed, 27 insertions, 14 deletions
diff --git a/wiki/src/contribute/calendar.mdwn b/wiki/src/contribute/calendar.mdwn
index 3c0e71e..4d6c12d 100644
@@ -1,21 +1,34 @@
-* 2015-09-03: [[Monthly meeting|contribute/meetings]]
-* 2015-09-12: [[Low-hanging fruits session|contribute/low-hanging_fruit_sessions]]
-* 2015-09-22: Release 1.6 (anonym is the RM)
-* 2015-09-22: [Tails - Computer nutzen und Privatsphäre schützen](http://pentabarf.linkemedienakademie.de/export/lima15_2/events/158.de.html)
- by Vera Henssler and Ulrich Overdieck in Berlin, Germany (in German)
-* 2015-09-27 to 2015-10-02: Tor developers meeting in Berlin
-* 2015-09-29 to 2015-10-02: Farsi localization sprint in Amsterdam
* 2015-10-06 to 08: OTF Annual Summit in Washington DC
-* 2015-11-03: Release 1.7 (anonym is the RM)
+ - Freeze Tails 1.7: All feature branches targeting Tails 1.7 should
+ be merged into the `devel` branch by noon, CET. I'm open to make
+ exceptions if you can be online and responsive during that
+ - Build and upload Tails 1.7~rc1.
+ - Start testing Tails 1.7~rc1 during late CET if building the image
+ went smoothly.
+ - Finish testing Tails 1.7~rc1 by the afternoon, CET.
+ - Release Tails 1.7~rc1.
+ - All new branches targeting Tails 1.7 must be merged into the
+ `testing` branch by noon CET. I'm open to make exceptions if you
+ can be online and responsive during that afternoon.
+ - Tor Browser 4.5.x, based on Firefox 38esr, is hopefully out so
+ we can import it.
+ - Build and upload Tails 1.7 ISO image and IUKs.
+ - Start testing Tails 1.7 during late CET if building the image
+ went smoothly.
+ - Finish testing Tails 1.7 by the afternoon, CET.
+ - Release Tails 1.7 during late CET, earliest when Mozilla
+ publishes their MFSAs.
* 2015-11-20 to 2015-11-22: User testing of the Installation Assistant