ea19d59fca
Merge branch 'dev' into 'dev'
...
Replace own image URL in clonned channel posts
See merge request hubzilla/core!1638
2019-05-08 10:43:06 +02:00
d34d14c1f4
Replace own image URL in clonned channel posts
2019-05-08 10:40:46 +02:00
242878c45c
Merge branch 'dev' into 'dev'
...
possible xchan confusion include/follow
See merge request hubzilla/core!1635
2019-05-06 13:49:17 +02:00
c0911da887
review of last commit
2019-05-06 04:19:54 -07:00
6e0bf04276
possible xchan (protocol) confusion in include/follow
2019-05-06 04:15:34 -07:00
f0933b66a9
Remove 'os_syspath' from direct 'photo' table update
2019-05-06 10:39:47 +02:00
6cd968b53b
Add arrows to scroll between related comments
2019-05-05 14:14:07 +02:00
88d283a89d
found another case where channel_r_photos could get referenced
2019-05-04 02:58:57 -07:00
20bf139b3f
strip obsolete channel_(rw)_photos from channel sync packets
2019-05-03 15:27:26 -07:00
f127c55802
removing items from ex-connections turns out to be more complicated than originally envisioned
2019-05-03 04:09:04 -07:00
b1dec12893
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
2019-05-03 00:00:00 -07:00
319b0acdd8
fix item query
2019-05-02 23:58:51 -07:00
6da4dfe605
Merge branch 'unfriend_delete_posts_bug' into 'dev'
...
Unfriend delete posts bug
See merge request hubzilla/core!1624
2019-05-03 08:36:58 +02:00
7b4cb31a10
when removed items for unfriended connections, check if the parent has been retained, not just the item
2019-05-02 22:34:34 -07:00
6672299f8a
calendar merge: use b64 encoded mid for plink
2019-05-02 10:11:08 +02:00
fa2f3d136f
Merge branch 'xmlify' into 'dev'
...
address xmlify/unxmlify performance issue
See merge request hubzilla/core!1616
2019-05-01 16:41:19 +02:00
92b6026695
Merge branch 'dev' into 'dev'
...
Use thr_parent tp handle reply on comment feature
See merge request hubzilla/core!1617
2019-05-01 16:10:40 +02:00
0d003e7450
Preserve parent_mid with threaded comments
2019-05-01 15:45:12 +02:00
8847838c43
address xmlify/unxmlify performance issue
2019-05-01 15:40:06 +02:00
256f8dd41b
Merge branch 'dev' into 'dev'
...
Add 'reply on comment' feature
See merge request hubzilla/core!1614
2019-05-01 10:06:24 +02:00
39da3459c7
Add 'reply on comment' feature
...
(cherry picked from commit 80ca2023aa67ef7c0c43414acaf135e5748044b2)
2019-04-29 23:43:11 +02:00
5abbfd3f19
Add initial threaded comment support
2019-04-29 23:21:17 +02:00
73248aadd5
possible sql performance improvement
2019-04-27 15:35:41 +02:00
e2dfa1d72f
import/export zot6 hublocs+xchans
2019-04-26 09:34:58 +02:00
3c8f8b76aa
hubloc confusion in magic auth
2019-04-25 11:54:37 +02:00
9a6531e2a2
Fix infinite loop using postgres as backend
...
unescapebin is handed a string in some cases, and it causes an infinite
loop when it does. This ensures that the argument is a resource before
loading its contents.
2019-04-21 11:14:17 +00:00
39a5311315
Merge branch 'dev' into calendar_merge
2019-04-19 15:34:02 +02:00
9b6e46dc6b
calendar merge initial commit
2019-04-19 15:32:56 +02:00
df5a1c59e6
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
2019-04-15 20:53:44 -07:00
0615709a7a
add attachments to zot6 event objects, add zot6 to federated transports (webfinger)
2019-04-15 20:51:57 -07:00
509067391b
Update xchan profile edited date only once
2019-04-13 14:08:44 +02:00
04b261057d
Set 'os_syspath' with local path
2019-04-12 22:34:32 +02:00
852343f254
Override received 'content' if we saving thumbnail in filesystem
2019-04-12 16:27:58 +02:00
d3a619659f
Fix 'os_syspath' if we store thumbnails in filesystem
2019-04-12 15:38:10 +02:00
5792f4bf07
Add comment on required changes in upcoming releases
2019-04-12 15:00:56 +02:00
3a0fa5cb29
Store thumbnails in filesystem or database
2019-04-12 14:59:13 +02:00
074ee656f0
Fetch thumbnails and store it in filesystem or DB; update xchan profile edit time on fetch
2019-04-12 14:56:07 +02:00
42f96dc7a6
Fix use UNIX socket file to connect DB
2019-04-10 14:13:16 +02:00
e96fa64625
Merge branch 'dev' into 'dev'
...
Dev
See merge request hubzilla/core!1586
2019-04-10 13:25:57 +02:00
5d70d889e9
Revert "Update htconfig.sample.php"
...
This reverts commit f2126ef18c8b66020305d07dcefeacc4e55a3c12
2019-04-10 13:25:03 +02:00
1ed0079882
Merge branch 'dev' of https://gitlab.com/macgirvin/hubzilla into dev
2019-04-07 19:23:38 -07:00
4e12f86e90
Merge branch 'dev' into 'dev'
...
security: perms_pending not evaluated correctly
See merge request hubzilla/core!1583
2019-04-06 10:27:30 +02:00
2d886b65ce
permissions cleanup
2019-04-05 18:06:59 -07:00
8700b87030
Merge branch 'dev' of ../hz into dev
2019-04-05 16:48:04 -07:00
5a46f1229d
security: perms_pending not evaluated correctly
2019-04-05 16:46:52 -07:00
c9f3883c8c
Remove suggest channels from features
2019-04-02 15:12:32 +02:00
cbaf0a3864
check service class limits when syncing files
2019-03-30 15:11:13 -07:00
7d392e5adb
Merge branch 'z6_discover_fixes' into 'dev'
...
fix various issues in z6_discover() and add zot6 hubloc creation on channel import
See merge request hubzilla/core!1575
2019-03-29 15:28:28 +01:00
31680898e3
another fix for z6_discover() and create a zot6 hubloc if applicable
2019-03-28 15:51:24 +01:00
b10b8ca3f4
fix various issues in z6_discover()
2019-03-27 15:20:43 +01:00
Max Kostikov
Mario
zotlabs
Daniel Lowe