zotlabs
|
d9170c6617
|
more photo object work
|
2018-10-28 21:01:58 -07:00 |
|
zotlabs
|
7e3c8e46e7
|
turn photos into proper AS objects (still need to fix the places where they were turned into Note for short-term compatibility)
|
2018-10-28 20:39:01 -07:00 |
|
zotlabs
|
516a375fff
|
fix embed photos from albums and phase1 of the forum count bug from hubzilla and the edit post breaking delivery chain bug also from hubzilla
|
2018-10-27 14:30:07 -07:00 |
|
zotlabs
|
7b46fd47fb
|
add my_perms_contains for balance
|
2018-10-24 23:00:30 -07:00 |
|
zotlabs
|
60bb243081
|
handle at least some basic friendica attachment bbcodes
|
2018-10-24 19:01:43 -07:00 |
|
zotlabs
|
6378cb8f27
|
miscellaneous fixes, unset project icon, onepoll feed failure
|
2018-10-20 02:03:31 -07:00 |
|
zotlabs
|
6d3d106c23
|
more event work
|
2018-10-18 15:14:33 -07:00 |
|
zotlabs
|
52c3377c0b
|
event issue
|
2018-10-18 02:54:40 -07:00 |
|
zotlabs
|
cd2c3f7127
|
share issue on zot6 side
|
2018-10-17 15:51:23 -07:00 |
|
zotlabs
|
38b54f55d1
|
event formatting and rsvp parenting
|
2018-10-16 13:56:46 -07:00 |
|
zotlabs
|
eda156a5bb
|
regression in socgraph
|
2018-10-15 19:29:32 -07:00 |
|
zotlabs
|
23256b5b1a
|
update banner
|
2018-10-13 17:53:17 -07:00 |
|
zotlabs
|
e6d8fe98e1
|
reduce the curl logging info to the important stuff
|
2018-10-11 21:18:02 -07:00 |
|
zotlabs
|
c9bcde817a
|
the rest of the bits
|
2018-10-10 17:58:51 -07:00 |
|
zotlabs
|
3a8d916702
|
better signature handling
|
2018-10-09 21:08:57 -07:00 |
|
zotlabs
|
b66312e408
|
status editor hook
|
2018-10-08 21:27:35 -07:00 |
|
zotlabs
|
1dc002c4fd
|
wrong mime type
|
2018-10-07 20:37:34 -07:00 |
|
zotlabs
|
87587c40d3
|
rework the banner code
|
2018-10-07 19:54:25 -07:00 |
|
zotlabs
|
4d76e4a99f
|
default icon
|
2018-10-07 19:44:27 -07:00 |
|
zotlabs
|
a5455fa049
|
add personal filter and fix api zot-auth
|
2018-10-07 15:51:52 -07:00 |
|
zotlabs
|
2f48679fef
|
fix import/export after project merger
|
2018-10-04 13:45:20 -07:00 |
|
zotlabs
|
bd5d6158a1
|
zap/osada repo merger
|
2018-10-03 19:10:52 -07:00 |
|
zotlabs
|
290b8b58ec
|
rename groups and group_members tables
|
2018-09-25 17:50:59 -07:00 |
|
zotlabs
|
0bc76e85e4
|
Merge branch 'zap' into dev
|
2018-09-19 16:26:36 -07:00 |
|
zotlabs
|
fd0de5fc12
|
Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap
|
2018-09-19 16:26:05 -07:00 |
|
zotlabs
|
d3b28b718c
|
Merge branch 'red' into dev
|
2018-09-18 20:51:38 -07:00 |
|
zotlabs
|
ce70411a6c
|
Merge branch 'zap' into dev
|
2018-09-18 17:49:14 -07:00 |
|
zotlabs
|
75a39d5e91
|
Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap
|
2018-09-18 17:48:58 -07:00 |
|
zotlabs
|
f099d0878d
|
double dbesc in item_store_update
|
2018-09-18 17:46:46 -07:00 |
|
zotlabs
|
0709d0f08e
|
Merge branch 'zap' into dev
|
2018-09-17 23:41:03 -07:00 |
|
zotlabs
|
ab3d3b029e
|
Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap
|
2018-09-17 23:40:45 -07:00 |
|
zotlabs
|
9f14cd4b3c
|
missing connect link if no xchan_addr
|
2018-09-17 23:40:17 -07:00 |
|
zotlabs
|
f2d3fd0f1a
|
Merge branch 'zap' into dev
|
2018-09-17 22:53:51 -07:00 |
|
zotlabs
|
f6c5e9e610
|
Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap
|
2018-09-17 22:53:38 -07:00 |
|
zotlabs
|
f2c99480f0
|
generate better photo and event activities
|
2018-09-17 22:51:27 -07:00 |
|
Mario
|
c4c1b1f5a2
|
Merge branch 'patch-3' into 'dev'
Save combined view while deleting or recalling first message in thread
See merge request hubzilla/core!1273
|
2018-09-17 13:29:52 +02:00 |
|
Max Kostikov
|
12b9106fc7
|
Update zot.php
|
2018-09-17 13:16:04 +02:00 |
|
Max Kostikov
|
faaffdd618
|
Update message.php
|
2018-09-17 13:15:43 +02:00 |
|
Max Kostikov
|
774729b221
|
Update msglib.php
|
2018-09-17 13:15:24 +02:00 |
|
Mario
|
eefa47776b
|
Merge branch 'trap-template-errors' into 'dev'
Trap errors in template rendering. Output a generic error and log problem.
See merge request hubzilla/core!1274
|
2018-09-17 11:03:37 +02:00 |
|
Mario
|
0b12a7e66f
|
Merge branch 'delete-attach-hook' into 'dev'
delete_attach hook
See merge request hubzilla/core!1275
|
2018-09-17 11:00:22 +02:00 |
|
zotlabs
|
6d9b38dad8
|
discover issue
|
2018-09-16 22:05:04 -07:00 |
|
zotlabs
|
f0266b4837
|
Merge branch 'zap' into dev
|
2018-09-16 21:43:20 -07:00 |
|
zotlabs
|
8d565a8305
|
Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap
|
2018-09-16 21:43:06 -07:00 |
|
zotlabs
|
943edb4c14
|
simplify AP discovery
|
2018-09-16 21:42:41 -07:00 |
|
zotlabs
|
c3a74b3ece
|
setup and channel sync fixes from upstream
|
2018-09-16 20:01:53 -07:00 |
|
zotlabs
|
27617efbfb
|
Merge branch 'dev'
|
2018-09-16 19:05:12 -07:00 |
|
zotlabs
|
6ab12597f5
|
do not sync the channel_moved field
|
2018-09-16 18:59:12 -07:00 |
|
zotlabs
|
a3e3c93902
|
consistency
|
2018-09-16 01:17:25 -07:00 |
|
M.Dent (DM42.Net)
|
abe35817cd
|
Add attach_delete hook
|
2018-09-15 23:09:16 -04:00 |
|
zotlabs
|
c57e8519dc
|
Merge branch 'zap' into dev
|
2018-09-15 16:44:27 -07:00 |
|
zotlabs
|
ac0020979c
|
Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap
|
2018-09-15 16:44:06 -07:00 |
|
zotlabs
|
cebfeabc41
|
logic issue
|
2018-09-15 16:43:44 -07:00 |
|
zotlabs
|
df7605435f
|
Merge branch 'zap' into dev
|
2018-09-15 16:21:00 -07:00 |
|
zotlabs
|
34e8a36019
|
Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap
|
2018-09-15 16:14:52 -07:00 |
|
zotlabs
|
f58c244ba0
|
refactor include/follow
|
2018-09-15 16:13:44 -07:00 |
|
Max Kostikov
|
585bdf562a
|
Update msglib.php
|
2018-09-16 00:43:45 +02:00 |
|
Max Kostikov
|
034441bd13
|
use common msg_drop function
|
2018-09-15 22:32:56 +02:00 |
|
Max Kostikov
|
1819704620
|
Use common msg_drop function
|
2018-09-15 22:32:07 +02:00 |
|
Max Kostikov
|
18801a6c60
|
formatting
|
2018-09-15 22:31:08 +02:00 |
|
Max Kostikov
|
f83c2d5cd1
|
Create msglib.php
|
2018-09-15 22:27:39 +02:00 |
|
Max Kostikov
|
724dc48fe8
|
Add new file
|
2018-09-15 21:41:13 +02:00 |
|
zotlabs
|
d67d26564d
|
bookmark links are deprecated in zap
|
2018-09-14 16:49:08 -07:00 |
|
Max Kostikov
|
284e5dd2e8
|
unification with zot.php code for future reuse
|
2018-09-15 01:45:54 +02:00 |
|
Max Kostikov
|
3d3f4f50fb
|
formatting
|
2018-09-15 01:40:17 +02:00 |
|
Max Kostikov
|
8d89c4bbce
|
Save combined view on calling first message in thread
|
2018-09-15 01:20:49 +02:00 |
|
Max Kostikov
|
85d8225cc0
|
less data in select
|
2018-09-15 01:01:48 +02:00 |
|
M.Dent
|
8ad24ca3e8
|
Catch errors in template rendering. Output a generic error and log problem.
|
2018-09-14 17:53:28 -04:00 |
|
Max Kostikov
|
6360dee125
|
formatting
|
2018-09-14 17:45:42 +02:00 |
|
Max Kostikov
|
e931616011
|
Save combined view while deleting first message in thread
|
2018-09-14 17:38:14 +02:00 |
|
zotlabs
|
c16fa755a8
|
Merge branch 'zap' into dev
|
2018-09-13 22:40:23 -07:00 |
|
zotlabs
|
4b7770f28c
|
Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap
|
2018-09-13 22:40:11 -07:00 |
|
zotlabs
|
048c5f65e2
|
old protocol string still showing
|
2018-09-13 22:39:05 -07:00 |
|
zotlabs
|
55d4973439
|
Merge commit 'decf21c' into dev
|
2018-09-13 20:36:13 -07:00 |
|
zotlabs
|
b253aa9f9c
|
Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap
|
2018-09-13 20:35:54 -07:00 |
|
zotlabs
|
decf21c78b
|
add privacy groups link
|
2018-09-13 20:32:44 -07:00 |
|
Mario Vavti
|
869534fafa
|
remove network_tabs() which has been deprecated and replaced by activity_{order, filters} widgets
|
2018-09-13 11:53:59 +02:00 |
|
Mario Vavti
|
56f88f2e30
|
move chat from feature to apps
|
2018-09-13 11:32:43 +02:00 |
|
Mario Vavti
|
a1d5ce3716
|
remove profile_tabs() which has been deprecated and replaced by channel_apps()
|
2018-09-13 10:59:37 +02:00 |
|
Mario
|
78dc679a72
|
Merge branch 'patch-1' into 'dev'
z_fetch_url with case insensitive headers
See merge request hubzilla/core!1271
|
2018-09-12 21:11:47 +02:00 |
|
Mario Vavti
|
57e3ee47ee
|
more feature to app transition
|
2018-09-12 20:52:55 +02:00 |
|
Mario Vavti
|
184928204a
|
Fix PHP Warning: DOMDocument::loadHTML(): htmlParseEntityRef: no name in Entity
|
2018-09-12 11:14:49 +02:00 |
|
Mario Vavti
|
2651eae663
|
mpre feature to app transition
|
2018-09-12 11:08:53 +02:00 |
|
zotlabs
|
363aba90fb
|
Merge branch 'zap' into dev
|
2018-09-11 18:03:38 -07:00 |
|
zotlabs
|
8500c2fb21
|
Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap
|
2018-09-11 18:03:16 -07:00 |
|
zotlabs
|
acec460c1c
|
remove linkid for the time being
|
2018-09-11 18:02:25 -07:00 |
|
zotlabs
|
fda9a36505
|
Merge branch 'zap' into dev
|
2018-09-11 17:41:22 -07:00 |
|
zotlabs
|
eb3a5349db
|
Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap
|
2018-09-11 17:37:54 -07:00 |
|
zotlabs
|
f9b344ac4d
|
runtime errors
|
2018-09-11 17:35:31 -07:00 |
|
zotlabs
|
67ae00ae2f
|
it's alive
|
2018-09-11 03:36:31 -07:00 |
|
zotlabs
|
adc164b825
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
|
2018-09-10 22:11:26 -07:00 |
|
Max Kostikov
|
66bf55710e
|
Update network.php
|
2018-09-10 15:13:28 +02:00 |
|
Mario Vavti
|
c6abe87ec2
|
move cards from features to apps
|
2018-09-10 13:34:05 +02:00 |
|
zotlabs
|
44df4d785e
|
Merge branch 'zap' into dev
|
2018-09-09 23:23:42 -07:00 |
|
zotlabs
|
ddb50b8de4
|
Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap
|
2018-09-09 23:17:23 -07:00 |
|
zotlabs
|
44af74af3b
|
tweaks
|
2018-09-09 23:16:58 -07:00 |
|
zotlabs
|
c4dc8b9cca
|
hyperdrive stuff
|
2018-09-09 23:15:59 -07:00 |
|
zotlabs
|
b837f0b8fc
|
Merge branch 'red' into dev
|
2018-09-09 20:59:13 -07:00 |
|
zotlabs
|
be3b630474
|
important hyperdrive component
|
2018-09-09 20:53:20 -07:00 |
|
zotlabs
|
e1b0570690
|
assorted fixes
|
2018-09-09 18:28:13 -07:00 |
|