Mario
05ae18d74e
Merge branch 'patch-6' into 'dev'
...
Add new table names in docs
See merge request hubzilla/core!1315
(cherry picked from commit 778086ce194f70fd3e2e4772ac4cb46c12c087aaf5
2018-10-06 14:54:38 +02:00
Mario
778086ce19
Merge branch 'patch-6' into 'dev'
...
Add new table names in docs
See merge request hubzilla/core!1315
2018-10-06 14:54:21 +02:00
Mario
63ba72331f
Merge branch 'patch-5' into 'dev'
...
Respect new table names on import
See merge request hubzilla/core!1314
(cherry picked from commit 3e231e7c13ebb4811a
2018-10-06 14:53:37 +02:00
Mario
3e231e7c13
Merge branch 'patch-5' into 'dev'
...
Respect new table names on import
See merge request hubzilla/core!1314
2018-10-06 14:53:18 +02:00
Mario Vavti
a522a66715
bookmarks: change wording
2018-10-06 14:50:17 +02:00
Mario Vavti
c2c891723f
bookmark app
2018-10-06 14:48:12 +02:00
Max Kostikov
c087aaf5be
Update database.bb
2018-10-06 14:48:04 +02:00
Max Kostikov
4cb46c124a
Update intro_for_developers.bb
2018-10-06 14:43:40 +02:00
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
Max Kostikov
ebb4811a75
Respect new table names on import
2018-10-06 14:06:24 +02:00
zotlabs
835e222af0
minor app cleanup
2018-10-05 16:27:50 -07: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
dcd99c2d30
Merge branch 'undefined' into '3.8RC'
...
New russian translations
See merge request hubzilla/core!1308
2018-10-05 14:53:23 +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
Max Kostikov
ff53da5b0a
New russian translations hmessages.po
2018-10-05 13:25:40 +02:00
Max Kostikov
9520123f6d
New russian translations hstrings.php
2018-10-05 13:23:37 +02:00
Max Kostikov
d9efb037e3
Prevent links damage on foreign channel repost for cloned
2018-10-05 13:16:29 +02:00
Mario Vavti
c403c9aece
Merge branch '3.8RC' of https://framagit.org/hubzilla/core into 3.8RC
2018-10-05 12:10:15 +02:00
Mario Vavti
df5115e7b8
force major version system apps import for 3.8RC - remove this at a later point
2018-10-05 12:09:54 +02:00
zotlabs
22fbb512d5
do not propagate channel deletion for an already deleted channel.
...
(cherry picked from commit 7c1e99884c
2018-10-05 11:45:09 +02:00
zotlabs
2acfa7e525
regression: double linebreaks in viewsrc output
...
(cherry picked from commit d33c331abd
2018-10-05 11:44:32 +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
zotlabs
3a0a611f15
Merge branch 'dev'
2018-10-04 19:20:10 -07: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
