Mario Vavti
|
960246fbb9
|
Merge remote-tracking branch 'mike/master' into dev
|
2019-01-25 09:51:36 +01:00 |
|
zotlabs
|
2fa274de1e
|
support photo items between zot and zot6
|
2019-01-24 19:08:57 -08:00 |
|
Max Kostikov
|
fafd05afb2
|
Merge branch 'js_fixes' into 'dev'
possibly more page jumping fixes
See merge request hubzilla/core!1486
|
2019-01-24 21:57:42 +01:00 |
|
Max Kostikov
|
7a3ad30bfa
|
Merge branch 'zot6_fixes' into 'dev'
macke mod chanview aware of zot6
See merge request hubzilla/core!1487
|
2019-01-24 21:57:14 +01:00 |
|
Mario Vavti
|
32acf9cb72
|
macke mod chanview aware of zot6
|
2019-01-24 18:06:27 +01:00 |
|
Mario Vavti
|
0946ac2ff9
|
possibly more page jumping fixes
|
2019-01-24 12:53:38 +01:00 |
|
Max Kostikov
|
1d314834a4
|
Merge branch 'js_fixes' into 'dev'
fix page jumping when liking a collapsed/expanded post
See merge request hubzilla/core!1484
|
2019-01-24 10:40:33 +01:00 |
|
Mario
|
51a7be29f5
|
Merge branch 'prepare_text' into 'dev'
Correct parameter in include/text.php prepare_text()
See merge request hubzilla/core!1483
|
2019-01-23 15:41:54 +01:00 |
|
Mario
|
ef46738384
|
Merge branch 'dev' into 'dev'
Skip tags detection in URL
See merge request hubzilla/core!1482
|
2019-01-23 15:39:13 +01:00 |
|
Mario Vavti
|
54806f6ee8
|
fix page jumping when liking a collapsed/expanded post
|
2019-01-23 15:36:34 +01:00 |
|
Klaus Weidenbach
|
ae538a2259
|
Correct parameter in include/text.php prepare_text()
Also extend documentation.
|
2019-01-22 23:25:30 +01:00 |
|
Max Kostikov
|
66f443fd00
|
Skip tags detection in URL
|
2019-01-22 16:23:44 +01:00 |
|
Mario
|
ca9c29e2b6
|
Merge branch 'embedphotos' into 'dev'
Try to fix some warnings in Zotlabs\Module\Embedphotos.
See merge request hubzilla/core!1481
|
2019-01-22 12:23:20 +01:00 |
|
Mario
|
273beb016b
|
Merge branch 'patch-20190114a' into 'dev'
Add remaining hook insertions
See merge request hubzilla/core!1471
|
2019-01-22 12:13:16 +01:00 |
|
M. Dent
|
cd8a0f33b5
|
Add remaining hook insertions
|
2019-01-22 12:13:16 +01:00 |
|
Klaus Weidenbach
|
b1e05b4832
|
Try to fix some warnings in Zotlabs\Module\Embedphotos.
$phototypes was undefined, hope this is correct selection
to fix it.
Correct Doxygen and clean up some variables and refactoring.
|
2019-01-22 00:59:00 +01:00 |
|
Mario Vavti
|
4c0378eeae
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
|
2019-01-21 12:04:57 +01:00 |
|
Mario Vavti
|
ea14398929
|
Merge remote-tracking branch 'mike/master' into dev
|
2019-01-21 12:04:01 +01:00 |
|
zotlabs
|
1b5dd8bbd7
|
comment permission fix
|
2019-01-20 15:09:35 -08:00 |
|
M. Dent
|
39128c34cc
|
Merge branch 'dev' into 'dev'
Some fixes in include/help.php.
See merge request hubzilla/core!1479
|
2019-01-19 05:21:53 +01:00 |
|
M. Dent
|
542d21c4e1
|
Merge branch 'bugfix-plugin' into 'dev'
Fix wrong variable name in include/plugin.php.
See merge request hubzilla/core!1480
|
2019-01-19 05:18:35 +01:00 |
|
Klaus Weidenbach
|
90a62405ca
|
Fix wrong variable name in include/plugin.php.
|
2019-01-19 00:28:01 +01:00 |
|
Klaus Weidenbach
|
bba20c27fe
|
Some fixes in include/help.php.
Remove unused variables and a wrong function name.
|
2019-01-18 22:37:05 +01:00 |
|
Mario Vavti
|
d355e57fa6
|
Merge remote-tracking branch 'mike/master' into dev
|
2019-01-18 10:09:16 +01:00 |
|
Mario
|
f2d7c4091a
|
Merge branch 'QA' into 'dev'
Add PostgreSQL to gitlab-ci setup.
See merge request hubzilla/core!1478
|
2019-01-18 10:05:13 +01:00 |
|
M. Dent
|
bf879ce742
|
Merge branch 'dreport_fixes' into 'dev'
fix delivery report for zot6 connections
See merge request hubzilla/core!1476
|
2019-01-18 06:15:01 +01:00 |
|
M. Dent
|
e89a3b05ec
|
Merge branch 'core_fixes' into 'dev'
possible fix for #1326
See merge request hubzilla/core!1477
|
2019-01-18 06:13:04 +01:00 |
|
zotlabs
|
52305ca91b
|
more specific network checking in several places and remove some old debugging crud
|
2019-01-17 14:45:53 -08:00 |
|
Klaus Weidenbach
|
d6167636fa
|
Add PostgreSQL to gitlab-ci setup.
Run our tests against a PostgreSQL again.
|
2019-01-17 22:13:12 +01:00 |
|
Mario Vavti
|
cc1e1a525f
|
possible fix for #1326
|
2019-01-17 21:42:24 +01:00 |
|
zotlabs
|
96deae43fa
|
this should fix the rest of the event stuff
|
2019-01-17 11:47:55 -08:00 |
|
Mario Vavti
|
5aa0267936
|
add space
|
2019-01-17 20:09:19 +01:00 |
|
zotlabs
|
b1b1e0eba4
|
channel connect issue
|
2019-01-17 10:47:04 -08:00 |
|
Mario Vavti
|
07f6465872
|
fix delivery report for zot6 connections
|
2019-01-17 11:39:52 +01:00 |
|
zotlabs
|
eda7c5369c
|
event attendance testing continued (now works at a basic level from one direction, more testing needed)
|
2019-01-16 21:09:04 -08:00 |
|
zotlabs
|
e9f709301c
|
more z6 event work
|
2019-01-16 17:32:16 -08:00 |
|
zotlabs
|
7e29bd10b6
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
|
2019-01-16 16:52:21 -08:00 |
|
zotlabs
|
20eea2184b
|
more work on z6 events
|
2019-01-16 16:50:44 -08:00 |
|
zotlabs
|
eaa375936f
|
more z6 compatibility fixes
|
2019-01-16 15:28:30 -08:00 |
|
Mario Vavti
|
de8582ec07
|
Merge branch 'fix_dreport_issue' into dev
|
2019-01-16 21:52:16 +01:00 |
|
M. Dent
|
e6ccdc2378
|
Merge branch 'queue_fixes_1' into 'dev'
do not return if delivery report could not bedecrypted
See merge request hubzilla/core!1475
|
2019-01-16 15:58:13 +01:00 |
|
Mario Vavti
|
4450a01014
|
do not return if delivery report could not bedecrypted
|
2019-01-16 15:09:18 +01:00 |
|
Mario Vavti
|
a1ac507a94
|
change logic for consistency
|
2019-01-16 10:02:13 +01:00 |
|
Mario Vavti
|
ad6eb15eac
|
fix legacy zot dreport not passing the is_storable check
|
2019-01-15 22:36:01 +01:00 |
|
Mario
|
2e94e4cd67
|
Merge branch 'core_fixes' into 'dev'
Core fixes
See merge request hubzilla/core!1470
|
2019-01-15 11:38:41 +01:00 |
|
Mario Vavti
|
c26e112bee
|
whitespace
|
2019-01-14 15:06:21 +01:00 |
|
Mario Vavti
|
7daf18b077
|
fix a new instance of autocomplete created on each conversation update
|
2019-01-14 14:07:56 +01:00 |
|
Mario
|
a8a5d2fc4e
|
Merge branch 'patch-20190113c' into 'dev'
Hooks to allow addons to add "extras" to privacy group settings edit page.
See merge request hubzilla/core!1469
|
2019-01-14 10:29:48 +01:00 |
|
Mario
|
90f6abfa7c
|
Merge branch 'patch-20190113a' into 'dev'
Add collect_public_recipients hook
See merge request hubzilla/core!1467
|
2019-01-14 10:29:19 +01:00 |
|
Mario Vavti
|
65f2d7fd66
|
Merge branch 'dev' into core_fixes
|
2019-01-14 10:14:44 +01:00 |
|