Commit Graph

22318 Commits

Author SHA1 Message Date
Max Kostikov
2e4772ac0e Update db_groups.bb 2018-10-06 14:40:48 +02:00
Max Kostikov
4f70fd3e71 Add new table names in docs 2018-10-06 14:39:54 +02:00
M. Dent
a5e63aa90a Merge branch 'revert-f5acbccb' into 'dev'
Revert Fix: for hook registration.  Needs more testing.

See merge request hubzilla/core!1311
2018-10-05 19:32:42 +02:00
M. Dent
1922a2139d Revert "Merge branch 'dev' into 'dev'"
This reverts merge request !1310
2018-10-05 19:30:49 +02:00
M. Dent
f5acbccb79 Merge branch 'dev' into 'dev'
Fix: hooks not added to App::$hooks[] at the time of registration

See merge request hubzilla/core!1310
2018-10-05 19:27:30 +02:00
M.Dent
d39ebebc9d Fix: hooks not added to App::[] at the time of registration 2018-10-05 13:25:16 -04:00
Max Kostikov
b5ed1de31e New russian translations hmessages.po
(cherry picked from commit ff53da5b0a)
2018-10-05 14:54:53 +02:00
Max Kostikov
5cf156f698 New russian translations hstrings.php
(cherry picked from commit 9520123f6d)
2018-10-05 14:54:22 +02:00
Mario
a29e5521cc Merge branch 'patch-3' into 'dev'
Add 'Channel Export' in Apps list

See merge request hubzilla/core!1309
2018-10-05 14:52:46 +02:00
Max Kostikov
59bd90b967 Add 'Channel Export' in Apps list 2018-10-05 13:31:54 +02:00
Mario Vavti
69659e9bd5 Merge remote-tracking branch 'mike/master' into dev 2018-10-05 11:40:50 +02:00
Mario Vavti
6c066f6107 bump version 2018-10-05 11:33:52 +02:00
Mario Vavti
b96a05494b optimize autoloader 2018-10-05 11:28:14 +02:00
Mario Vavti
0d42b4cf8a strings 2018-10-05 11:26:26 +02:00
Mario Vavti
df0c77ccd3 bump version 2018-10-05 11:17:00 +02:00
Mario Vavti
1eaf6df842 fix issues with bs accordions 2018-10-04 22:21:20 +02:00
Mario Vavti
9fe9137c96 fix displaying of perm cats selector 2018-10-04 22:01:34 +02:00
Mario Vavti
363fc5c72b whitespace 2018-10-04 21:49:00 +02:00
Mario Vavti
d4af745fc8 move *_divmore_height setting to the module extra_settings, and fix issue where feature settings were not synced if rpath was provided 2018-10-04 21:38:39 +02:00
Mario Vavti
6e03104e3e move *_list_mode to features 2018-10-04 20:48:22 +02:00
Mario
e89a84608f Merge branch 'patch-1' into 'dev'
Incorrect block wrapping fixed

See merge request hubzilla/core!1306
2018-10-04 14:57:03 +02:00
Max Kostikov
1dbd83a582 Update settings.tpl 2018-10-04 14:35:32 +02:00
Mario
c1002557cf Merge branch 'patch-1' into 'dev'
button sticking fixed

See merge request hubzilla/core!1305
2018-10-04 13:53:00 +02:00
Mario Vavti
cccea911fa remove redundant var 2018-10-04 13:44:26 +02:00
Mario Vavti
eb10120607 add apd file 2018-10-04 13:27:16 +02:00
Mario Vavti
c00dc6120d defperm app 2018-10-04 13:26:45 +02:00
Mario Vavti
d0605e8d5f uexport app 2018-10-04 11:50:38 +02:00
zotlabs
d33c331abd regression: double linebreaks in viewsrc output 2018-10-03 21:18:23 -07:00
Max Kostikov
05b6c33a2c button sticking fixed 2018-10-03 21:19:13 +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
zotlabs
7c1e99884c do not propagate channel deletion for an already deleted channel. 2018-10-02 19:42:21 -07: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