diff options
| author | Max Kostikov <max@kostikov.co> | 2019-05-09 19:40:47 +0200 |
|---|---|---|
| committer | Max Kostikov <max@kostikov.co> | 2019-05-09 19:40:47 +0200 |
| commit | b9b65d7dfbf0d5532c93bd7395b5dbbcb8c1b68f (patch) | |
| tree | 7983e0b72be6bbd924af694cde0e1482264cf247 /app | |
| parent | 1545c78d05cee05de18d191169fd577a3fd9842d (diff) | |
| parent | f0c292e77b697bd89a529244cb23e886e5481d40 (diff) | |
| download | volse-hubzilla-b9b65d7dfbf0d5532c93bd7395b5dbbcb8c1b68f.tar.gz volse-hubzilla-b9b65d7dfbf0d5532c93bd7395b5dbbcb8c1b68f.tar.bz2 volse-hubzilla-b9b65d7dfbf0d5532c93bd7395b5dbbcb8c1b68f.zip | |
Merge branch 'dev' into 'dev'
remove the caldav and event app and make calendar the default app
See merge request hubzilla/core!1643
Diffstat (limited to 'app')
| -rw-r--r-- | app/calendar.apd (renamed from app/caldav.apd) | 6 | ||||
| -rw-r--r-- | app/events.apd | 6 | ||||
| -rw-r--r-- | app/events.png | bin | 4118 -> 0 bytes |
3 files changed, 3 insertions, 9 deletions
diff --git a/app/caldav.apd b/app/calendar.apd index 30b45b4bd..8de046e48 100644 --- a/app/caldav.apd +++ b/app/calendar.apd @@ -1,6 +1,6 @@ -version: 2 +version: 1 url: $baseurl/cdav/calendar, $baseurl/settings/calendar requires: local_channel -name: CalDAV +name: Calendar photo: icon:calendar -categories: Productivity, Personal +categories: Productivity, nav_featured_app diff --git a/app/events.apd b/app/events.apd deleted file mode 100644 index b69ee35ee..000000000 --- a/app/events.apd +++ /dev/null @@ -1,6 +0,0 @@ -version: 2 -url: $baseurl/events, $baseurl/settings/events -requires: local_channel -name: Events -photo: icon:calendar -categories: nav_featured_app, Productivity diff --git a/app/events.png b/app/events.png Binary files differdeleted file mode 100644 index a5670fd1e..000000000 --- a/app/events.png +++ /dev/null |
