Commit Graph
22289 Commits
Author SHA1 Message Date
Mario Vavti d0605e8d5f uexport app 2018-10-04 11:50:38 +02:00
Mario 3064f2ced5 bump activity app version 2018-10-03 16:09:31 +02:00
Mario 5e7c9b9d4a jot: show settings icon only to local profile owner 2018-10-03 15:21:20 +02:00
Mario 009e03c3ba move archives from network to channel_home 2018-10-03 11:47:12 +02:00
Mario Vavti af3b0146a8 Merge branch 'dev' of https://framagit.org/hubzilla/core into dev 2018-10-03 10:44:18 +02:00
Mario Vavti 883e2ccc91 move filing from conversation to network - it is only functional there. 2018-10-03 10:43:54 +02:00
M. Dent 29e1302f3f Merge branch 'dev' into 'dev'
Fix misplaced comma with period.

See merge request hubzilla/core!1304
2018-10-03 03:18:43 +02:00
M.Dent 798f2466e4 Fix misplaced comma with period. 2018-10-02 21:14:36 -04:00
Mario Vavti 67f19745fd add app_destroy hook which allows addons to perform post delete actions 2018-10-02 14:29:56 +02:00
Mario Vavti 72abe5f3d3 do not rely on startpage pconfig anymore 2018-10-01 12:47:14 +02:00
Mario Vavti 08a287dea1 do not default to channel_startpage if startpage app is not installed 2018-10-01 12:38:04 +02:00
Mario Vavti 7dadf387e5 indicate locked features 2018-10-01 11:01:56 +02:00
M. Dent 8febcc2705 Merge branch 'status-editor-hook' into 'dev'
Status editor hook

See merge request hubzilla/core!1300
2018-09-29 20:22:27 +02:00
M. Dent ff20370d0b Status editor hook 2018-09-29 20:22:27 +02:00
Mario Vavti cc9ca8bbff do not unset $_GET[search] and adjust activity_order widget 2018-09-29 18:38:19 +02:00
Mario Vavti 5906d6cce3 improve network search 2018-09-29 18:00:14 +02:00
Mario Vavti 8265dac9c0 Merge branch 'dev' of https://framagit.org/hubzilla/core into dev 2018-09-29 16:00:54 +02:00
Mario Vavti 6eeac03a0e appman: query terms also by uid to prevent double entries 2018-09-29 16:00:34 +02:00
Mario Vavti 7ca8f7b5cc allow to install apps by name 2018-09-29 15:42:22 +02:00
Mario Vavti d7ed5518d1 Merge remote-tracking branch 'mike/master' into dev 2018-09-29 15:41:54 +02:00
zotlabs 6f036bc778 hubzilla core issue #1276 2018-09-28 15:44:18 -07:00
M. Dent ba4a8aa762 Merge branch 'remove-servicelevel-logic' into 'dev'
Remove servicelevel logic

See merge request hubzilla/core!1291
2018-09-29 00:17:55 +02:00
M. Dent 5f992ffe15 Remove servicelevel logic 2018-09-29 00:17:55 +02:00
M. Dent 2904e58a9f Merge translations for non-installed apps message
See merge request hubzilla/core!1296
2018-09-28 21:34:15 +02:00
Max Kostikov c45a9504e7 Update Group.php 2018-09-28 19:52:11 +02:00
Max Kostikov 403ead44f9 Update Wiki.php 2018-09-28 19:50:45 +02:00
Max Kostikov 9b0d123217 Update Webpages.php 2018-09-28 19:50:29 +02:00
Max Kostikov 8e673a6cdf Update Tokens.php 2018-09-28 19:50:15 +02:00
Max Kostikov 6d3c1fb7fc Update Sources.php 2018-09-28 19:49:56 +02:00
Max Kostikov 01043fa790 Update Poke.php 2018-09-28 19:49:42 +02:00
Max Kostikov 23d5e15f0f Update Permcats.php 2018-09-28 19:49:20 +02:00
Max Kostikov 5500473387 Update Pdledit.php 2018-09-28 19:49:02 +02:00
Max Kostikov c8399e8104 Update Oauth2.php 2018-09-28 19:48:44 +02:00
Max Kostikov 423e1422ef Update Oauth.php 2018-09-28 19:48:25 +02:00
Max Kostikov c34c0c6718 Update Notes.php 2018-09-28 19:48:09 +02:00
Max Kostikov e3e96e59d2 Update Mood.php 2018-09-28 19:47:52 +02:00
Max Kostikov accb211280 Update Lang.php 2018-09-28 19:47:37 +02:00
Max Kostikov f07a4667b6 Update Invite.php 2018-09-28 19:47:20 +02:00
Max Kostikov cb768ea23f Update Connect.php 2018-09-28 19:46:36 +02:00
Max Kostikov b3249c10c2 Update Chat.php 2018-09-28 19:46:20 +02:00
Max Kostikov c6fce5de24 Update Cdav.php 2018-09-28 19:46:04 +02:00
Max Kostikov 5c8e1169cd Update Cards.php 2018-09-28 19:45:11 +02:00
Max Kostikov c0a485083d Update Articles.php 2018-09-28 19:44:35 +02:00
Max Kostikov 5f7d83bd4d Update Articles.php 2018-09-28 19:44:10 +02:00
Max Kostikov 52916bfcec Merge branch 'patch-11' into 'dev'
add translations

See merge request Kostikov/core!21
2018-09-28 16:04:29 +02:00
Max Kostikov cb2646154a Merge branch 'patch-12' into 'dev'
Update Oauth2.php

See merge request Kostikov/core!20
2018-09-28 16:03:44 +02:00
Max Kostikov 61a7c4fb33 Merge branch 'patch-13' into 'dev'
Update Pdledit.php

See merge request Kostikov/core!19
2018-09-28 16:03:05 +02:00
Max Kostikov 3a3abc8087 Merge branch 'patch-14' into 'dev'
Update Permcats.php

See merge request Kostikov/core!18
2018-09-28 16:02:33 +02:00
Max Kostikov e9b60cfb26 Merge branch 'patch-15' into 'dev'
Update Poke.php

See merge request Kostikov/core!17
2018-09-28 16:01:49 +02:00
Max Kostikov eea9e2c1d0 Merge branch 'patch-16' into 'dev'
Update Sources.php

See merge request Kostikov/core!16
2018-09-28 16:01:05 +02:00