Merge remote-tracking branch 'upstream/dev' into dev

2017-01-02 07:56:23 -05:00
parent 7b11e634aa 369a29ac90
commit bc0d4f28ef
9 changed files with 344 additions and 9 deletions
--- a/doc/roadmap_hz3.md
+++ b/doc/roadmap_hz3.md
@@ -0,0 +1,23 @@
+
+Hubzilla III
+============
+
+Due: December 2017
+Codename: 
+
+
+Wishlist:
+
+- Move CalDAV/CardDAV server to core
+
+- Integrate Hubzilla events with CalDAV
+
+- Connection 'roles' allows you to select different permission roles for your connections; such as follower, friend, contributor, etc. 
+
+- CardDAV integration with abook and profiles
+
+- App tray
+
+- issues manager
+
+- wiki cloning