Mario Vavti
8ab532efb5
remove zottel.net from fallback servers. it switched to directory_mode_normal from secondary
2019-02-18 10:02:18 +01:00
Mario
f11c17063c
Merge branch 'QA' into 'dev'
...
Improve gitlab-ci environment.
See merge request hubzilla/core!1516
2019-02-18 09:44:26 +01:00
Mario
72eb44aebc
Merge branch 'dev' into 'dev'
...
MySQL 8 admin summary compatibility
See merge request hubzilla/core!1517
2019-02-18 09:41:38 +01:00
Max Kostikov
b070503e77
MySQL 8 admin summary compatibility
2019-02-17 22:47:08 +01:00
Klaus Weidenbach
f48e1ee0ac
Improve gitlab-ci environment.
...
Use a custom Hubzilla image to speed up pipeline.
Single test jobs were around 4:30-5:00 minutes, now ~1:30 minute.
Improve Composer cache in Gitlab CI/CD.
Add more recent databases (MySQL8, MariaDB10.3) to the pipeline.
2019-02-17 18:19:09 +01:00
M. Dent
a5b7590d3a
Merge branch 'exclude_addon_common' into 'dev'
...
exclude addon_common from addon list
See merge request hubzilla/core!1513
2019-02-15 22:03:33 +01:00
M. Dent
f0955f1620
Merge branch 'rm_addon_settings' into 'dev'
...
Remove deprecated addon settings
See merge request hubzilla/core!1514
2019-02-15 22:02:33 +01:00
Mario
4769254978
deprecate addon settings
2019-02-15 12:35:19 +01:00
Mario
ca917f7b9a
exclude addon_common from addon list
2019-02-15 11:39:59 +01:00
Klaus Weidenbach
b9df4c99cf
Remove duplicate code in PhotoDriver classes.
...
cropImage is just a special case of cropImageRect, no need to
duplicate all the code.
2019-02-14 22:06:42 +01:00
Klaus Weidenbach
e6dadb215e
Refactor photo_driver to use namespaces.
...
Add simple UnitTest, but it is not yet very meaningful.
2019-02-14 22:06:42 +01:00
Klaus Weidenbach
d70bba2806
Clean up and documentation in photo_drive.
2019-02-14 22:06:42 +01:00
Mario Vavti
3217452b02
missing use app
2019-02-14 14:48:16 +01:00
M. Dent
ff0494b180
Merge branch 'affinity_fixes' into 'dev'
...
affinity tool fixes
See merge request hubzilla/core!1511
2019-02-14 14:06:25 +01:00
M. Dent
8be15c1b5b
Merge branch 'disable_repeats' into 'dev'
...
disable repeats until issues are resolved
See merge request hubzilla/core!1512
2019-02-14 14:05:24 +01:00
Mario Vavti
0207b5ba8b
disable repeats until issues are resolved
2019-02-14 11:32:43 +01:00
Mario Vavti
5ab917f606
affinity tool fixes
2019-02-14 11:06:52 +01:00
Mario
ea541ca21b
Merge branch 'aff2' into 'dev'
...
affinity slider as app
See merge request hubzilla/core!1449
2019-02-14 09:56:53 +01:00
phani00
fc223f5924
affinity slider as app
2019-02-14 09:56:53 +01:00
Mario
7b8eb84cb8
Merge branch 'patch-20190212a' into 'dev'
...
Fix: only first lock red with privacy_warning
See merge request hubzilla/core!1510
2019-02-13 20:36:33 +01:00
M.Dent
c3e2b463e4
Only cascade privacy warning if thread parent has privacy concerns.
2019-02-13 08:26:03 -05:00
M.Dent
5b3ea012ab
Fix: only first lock red with privacy_warning
2019-02-12 22:05:57 -05:00
Max Kostikov
07df43aa2a
Merge branch 'dev' into 'dev'
...
Update Russian translayion
See merge request hubzilla/core!1509
2019-02-12 11:55:17 +01:00
Max Kostikov
6e3bc77369
Update hstrings.php
2019-02-12 11:48:50 +01:00
Max Kostikov
24ddefe3ad
Update hmessages.po
2019-02-12 11:47:53 +01:00
Mario
7db645587b
Merge branch 'fix-20190211a' into 'dev'
...
Get all listeners
See merge request hubzilla/core!1508
2019-02-12 08:45:48 +01:00
M.Dent
cbf6d53e84
Get all listeners
2019-02-11 20:24:17 -05:00
Mario Vavti
f52a532771
use ACTIVITY_SHARE to match the verb
2019-02-08 11:33:01 +01:00
Mario Vavti
efc4c53b44
missing use App
2019-02-08 10:15:28 +01:00
zotlabs
4837f9cdad
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
2019-02-07 19:54:07 -08:00
zotlabs
317c53acf6
disable repeat unless mid is a resolvable uri since this will do radically different things on different network stacks (e.g. Diaspora) and it turns out there is no possible way to make Diaspora reshares compatible with ActivityPub or Zot6 repeat/announce/boost/whatever.
2019-02-07 14:38:05 -08:00
zotlabs
f02af5fe6e
automatically redirect repeat to share for posts with unresolvable message-ids (diaspora, hz < 4.0, etc.).
2019-02-07 14:25:25 -08:00
zotlabs
92e6c21210
add missing zot6 conversation completion (required for message repeats)
2019-02-07 14:13:13 -08:00
zotlabs
beb26e84f3
fix mid generation for shares
2019-02-07 11:18:34 -08:00
Mario Vavti
2b7a605223
exec updateInit() instead of notificationsUpdate() in jotShare()
2019-02-07 09:55:22 +01:00
Mario Vavti
d70f0092f7
Merge remote-tracking branch 'mike/master' into dev
2019-02-07 09:34:22 +01:00
zotlabs
7f6e4a9744
fix verb for reshares
2019-02-06 19:59:05 -08:00
zotlabs
96a4fc7ca2
more work on share/repeat
2019-02-06 19:26:28 -08:00
zotlabs
29c1797493
work on repeat/share for Hubzilla
2019-02-06 17:26:09 -08:00
Mario Vavti
860dead985
Merge remote-tracking branch 'mike/master' into dev
2019-02-06 06:46:05 +01:00
zotlabs
518ceb53a8
allow conversation completion for new comments to expired posts, regardless of hyperdrive settings.
...
Note that hyperdrive conversations may still be fetched from zap/osada servers but will be ignored.
2019-02-05 14:51:01 -08:00
Max Kostikov
4bcddca1f0
Merge branch 'viewsrc_update' into 'dev'
...
add the actual mid for debuging reasons
See merge request hubzilla/core!1506
2019-02-04 10:38:26 +01:00
Mario Vavti
cf80f03084
Merge remote-tracking branch 'mike/master' into dev
2019-02-04 10:03:38 +01:00
zotlabs
47f31eed37
update tests for changes in handle_tags()
2019-02-03 17:10:33 -08:00
zotlabs
8ff9a9ff08
fix linkify_tags() so it works with xchans across multiple protocols, also some fixes to activity parsing from upstream.
2019-02-03 16:53:49 -08:00
Mario Vavti
8dcf27ba29
add the actual mid for debuging reasons
2019-02-03 21:12:09 +01:00
Mario Vavti
d97043725d
update changelog
2019-02-03 15:12:38 +01:00
Mario Vavti
c657d766cf
cleanup logging and return if query returns empty result
2019-02-03 14:58:19 +01:00
Mario Vavti
4706ff6938
do not overwrite $sql_extra
2019-02-03 14:52:50 +01:00
M. Dent
c444af007f
Merge branch 'core_fixes' into 'dev'
...
fix #1332
See merge request hubzilla/core!1505
2019-02-03 02:22:16 +01:00