Mario
|
a5cd0061c5
|
Merge branch 'dev' into 'dev'
use 'cache' flag to bbcode() on content destined for Zot6. We've seen rendered...
See merge request hubzilla/core!1644
|
2019-05-11 15:39:31 +02:00 |
|
Mario Vavti
|
70220d8b9c
|
typo
|
2019-05-10 12:21:50 +02:00 |
|
Mario Vavti
|
274f69526f
|
calendar merge: implement channel calendar import in cdav/calendar
|
2019-05-10 12:18:37 +02:00 |
|
zotlabs
|
d7026fe36b
|
use 'cache' flag to bbcode() on content destined for Zot6. We've seen rendered map HTML in a couple of places and these should never be rendered for outgoing content as they will only be purified on the other end.
|
2019-05-09 22:06:32 -07:00 |
|
Max Kostikov
|
b9b65d7dfb
|
Merge branch 'dev' into 'dev'
remove the caldav and event app and make calendar the default app
See merge request hubzilla/core!1643
|
2019-05-09 19:40:47 +02:00 |
|
Max Kostikov
|
1545c78d05
|
Merge branch 'dev' into 'dev'
Add 'Create' button translation in CalDAV
See merge request hubzilla/core!1642
|
2019-05-09 14:41:12 +02:00 |
|
Mario Vavti
|
f0c292e77b
|
remove the caldav and event app and make calendar the default app
|
2019-05-09 14:39:40 +02:00 |
|
Max Kostikov
|
62336127e3
|
Add 'Create' button translation
|
2019-05-09 14:36:02 +02:00 |
|
Mario Vavti
|
9efd484e27
|
calendar merge: cleanup and comment out some unused code
|
2019-05-09 13:43:20 +02:00 |
|
Mario Vavti
|
e53650d6c6
|
another DB update to fix uid_mid index in item table and add xchan_photo_m index to xchan table
|
2019-05-08 20:12:54 +02:00 |
|
Mario
|
24f3bc9f0c
|
Channel update
|
2019-05-08 19:55:21 +02:00 |
|
Max Kostikov
|
6731564c2d
|
Update Photos.php
|
2019-05-08 08:30:25 +02:00 |
|
Max Kostikov
|
194ba0cf8d
|
Update PhotoDriver.php
|
2019-05-08 08:28:35 +02:00 |
|
Max Kostikov
|
bdcbe61273
|
Respect thumbnail storage location on image editing
|
2019-05-08 01:52:10 +02:00 |
|
Max Kostikov
|
de5d7bfbd3
|
Add photo usage detection if not exist on thumbnail save
|
2019-05-08 00:49:41 +02:00 |
|
Max Kostikov
|
89a3e8fcc7
|
Use own variable for "Go to previous comment" hint
|
2019-05-05 18:10:53 +02:00 |
|
Max Kostikov
|
6cd968b53b
|
Add arrows to scroll between related comments
|
2019-05-05 14:14:07 +02:00 |
|
Mario Vavti
|
1da4602567
|
port db update improvements from zap
|
2019-05-03 15:13:13 +02:00 |
|
Mario Vavti
|
cd829c096b
|
update directory on cover photo changes
|
2019-05-03 14:11:14 +02:00 |
|
Mario
|
c605c46f83
|
Merge branch 'replyto_fixes' into 'dev'
provide xchan_url if there is no xchan_addr
See merge request hubzilla/core!1622
|
2019-05-03 08:41:01 +02:00 |
|
Mario
|
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 |
|
zotlabs
|
f55f5fa92a
|
emojireaction compat
|
2019-05-02 21:18:54 -07:00 |
|
zotlabs
|
347e88dc65
|
move apschema to core to use for emojiReaction mapping for zot6
|
2019-05-02 20:32:26 -07:00 |
|
Mario Vavti
|
746d032e58
|
more provide xchan_url if there is no xchan_addr
|
2019-05-02 13:05:52 +02:00 |
|
Mario Vavti
|
b6d598a001
|
provide xchan_url if there is no xchan_addr
|
2019-05-02 12:58:24 +02:00 |
|
Max Kostikov
|
47fba5827b
|
Merge branch 'dev' into 'dev'
# Conflicts:
# Zotlabs/Lib/ThreadItem.php
|
2019-05-02 11:33:07 +02:00 |
|
Max Kostikov
|
47f75ad8bf
|
Add check if threads are enabled globally
|
2019-05-02 11:28:29 +02:00 |
|
Max Kostikov
|
516167c0f8
|
Revert "Merge branch 'dev' into 'dev'"
This reverts merge request !1620
|
2019-05-02 10:58:00 +02:00 |
|
Mario
|
238b3a97a8
|
Merge branch 'dev' into 'dev'
Check if 'reply on comment' enabled for this profile
See merge request hubzilla/core!1620
|
2019-05-02 10:48:55 +02:00 |
|
Max Kostikov
|
d4ab8a5a5d
|
Check if 'reply on comment' enabled for this profile
|
2019-05-02 10:40:33 +02:00 |
|
Max Kostikov
|
ea5f515f18
|
Merge branch 'dev' into 'dev'
Add Zap threads support
See merge request hubzilla/core!1619
|
2019-05-02 08:33:51 +02:00 |
|
Max Kostikov
|
ea6293544d
|
Add Zap threads support
|
2019-05-02 08:30:38 +02:00 |
|
Max Kostikov
|
cbe35281b9
|
Merge branch 'dev' into 'dev'
Add AS threaded comments support
See merge request hubzilla/core!1618
|
2019-05-01 21:45:12 +02:00 |
|
Max Kostikov
|
51a0fc45e2
|
Add threaded comments support
|
2019-05-01 21:40:43 +02:00 |
|
Max Kostikov
|
1e7e2bd34f
|
Update Item.php
|
2019-05-01 19:10:46 +02:00 |
|
Max Kostikov
|
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 |
|
Mario Vavti
|
c9a5f21344
|
calendar merge: remove deprecated share variable
|
2019-05-01 15:52:17 +02:00 |
|
Max Kostikov
|
0174bf3722
|
Fix missprint
|
2019-05-01 15:49:17 +02:00 |
|
Mario Vavti
|
9594ce9a8a
|
calendar merge: fix event_xchan mixup
|
2019-05-01 15:35:20 +02:00 |
|
Max Kostikov
|
4a91d09c86
|
Use thr_parent for comment replies
|
2019-05-01 15:33:59 +02:00 |
|
Max Kostikov
|
06837bd32b
|
Revert code to use thr_parent for comment replies
|
2019-05-01 15:12:01 +02:00 |
|
Mario
|
b8d8887d5a
|
Merge branch 'dev' into 'dev'
a couple of issues with the suggestions when viewing from the directory module
See merge request hubzilla/core!1615
|
2019-05-01 10:07:07 +02:00 |
|
Mario
|
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 |
|
zotlabs
|
9a55df245f
|
disable directory options when using suggestion mode and only return one page (60 items)
so that sorting works correctly
|
2019-04-30 23:38:48 -07:00 |
|
zotlabs
|
9800d95c50
|
fix suggestion ordering in directory module
|
2019-04-30 23:19:04 -07:00 |
|
Max Kostikov
|
9ebf2dc97b
|
Add "reply to" hint to submit button
|
2019-04-30 17:33:54 +02:00 |
|
Mario Vavti
|
a04689b784
|
do not allow editing events that do not belong to us
|
2019-04-30 12:08:19 +02:00 |
|
Max Kostikov
|
e945c12856
|
Add displaying support for threaded comments
|
2019-04-30 11:00:13 +02:00 |
|
Mario Vavti
|
0b062d0b8a
|
select event by event_hash instead of item_id
|
2019-04-30 10:47:48 +02:00 |
|
Mario Vavti
|
327e5d06e1
|
calendar merge: implement single event editing UI
|
2019-04-30 00:09:57 +02:00 |
|
Max Kostikov
|
d9be443e53
|
Add initial threaded comments support
|
2019-04-29 23:26:20 +02:00 |
|
Max Kostikov
|
6db323b15e
|
Add variables for threaded comments support
|
2019-04-29 23:24:48 +02:00 |
|
Mario
|
674215e9e6
|
Merge branch 'dev' into 'dev'
Add jot videos inline and with poster if possible
See merge request hubzilla/core!1613
|
2019-04-29 11:58:59 +02:00 |
|
Mario Vavti
|
dce6a5763d
|
calendar merge: d&d support and some minor cleanup and fixes
|
2019-04-29 11:45:55 +02:00 |
|
zotlabs
|
9641254443
|
event attachments still weren't being delivered to zot6
|
2019-04-28 18:20:40 -07:00 |
|
zotlabs
|
95871fe13c
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
|
2019-04-28 17:47:26 -07:00 |
|
Max Kostikov
|
0cecfceb14
|
Merge branch 'sql_fixes' into 'dev'
possible sql performance improvement
See merge request hubzilla/core!1611
|
2019-04-28 20:59:53 +02:00 |
|
zotlabs
|
9536a490b3
|
Add jot videos inline and with poster if possible
|
2019-04-27 17:20:38 -07:00 |
|
Mario Vavti
|
405e07f0a2
|
improve channel date query
|
2019-04-27 23:01:05 +02:00 |
|
Max Kostikov
|
d3ce91bd89
|
Merge branch 'dev' into 'dev'
Use goaway() base function
See merge request hubzilla/core!1612
|
2019-04-27 21:47:57 +02:00 |
|
Max Kostikov
|
eb44201c5f
|
Use goaway() base function
|
2019-04-27 21:38:54 +02:00 |
|
Zot
|
e2dfa1d72f
|
import/export zot6 hublocs+xchans
|
2019-04-26 09:34:58 +02:00 |
|
zotlabs
|
0c1e803208
|
import/export zot6 hublocs+xchans
|
2019-04-26 00:24:58 -07:00 |
|
Zot
|
3c8f8b76aa
|
hubloc confusion in magic auth
|
2019-04-25 11:54:37 +02:00 |
|
zotlabs
|
c88286556a
|
hubloc confusion during magic auth where hublocs with more than one network may exist
|
2019-04-24 16:21:59 -07:00 |
|
Mario
|
e937e8fff9
|
Merge branch 'dev' into 'dev'
Add modification date in Etag hash calculation and optimize cached photos processing
See merge request hubzilla/core!1607
|
2019-04-24 21:11:19 +02:00 |
|
Mario Vavti
|
f616b2d49a
|
calendar merge: bring back event categories
|
2019-04-24 14:48:30 +02:00 |
|
Max Kostikov
|
fe84dae313
|
Optimize cached photos processing
|
2019-04-24 11:18:17 +02:00 |
|
Max Kostikov
|
9104933b18
|
Add modified date in Etag hash calculation
|
2019-04-24 11:13:17 +02:00 |
|
Mario Vavti
|
9275fd16c2
|
resolve merge conflict
|
2019-04-20 10:23:11 +02:00 |
|
Max Kostikov
|
0212de68a4
|
Merge branch 'dev' into 'dev'
Add translation to calendar event update button
See merge request hubzilla/core!1601
|
2019-04-19 21:14:29 +02:00 |
|
Max Kostikov
|
2ea9b6d409
|
Add translation to update button
|
2019-04-19 21:11:34 +02:00 |
|
Mario Vavti
|
fd87faa7a6
|
Merge branch 'dev' into calendar_merge
|
2019-04-19 19:37:06 +02:00 |
|
Mario Vavti
|
cb2d706fa1
|
provide location and description information
|
2019-04-19 19:06:01 +02:00 |
|
Mario
|
6b638ac896
|
Merge branch 'dev' into 'dev'
Add remove profile photo button
See merge request hubzilla/core!1598
|
2019-04-19 17:23:10 +02:00 |
|
Mario Vavti
|
2bd5ae3617
|
provide link to source and some cleanup
|
2019-04-19 17:21:45 +02:00 |
|
Mario Vavti
|
39a5311315
|
Merge branch 'dev' into calendar_merge
|
2019-04-19 15:34:02 +02:00 |
|
Mario Vavti
|
9b6e46dc6b
|
calendar merge initial commit
|
2019-04-19 15:32:56 +02:00 |
|
Max Kostikov
|
7311d1182d
|
Add remove profile photo button
|
2019-04-19 15:30:05 +02:00 |
|
Mario
|
fb03e3f00e
|
Merge branch 'dev' into 'dev'
required php version not available but allowed to continue
See merge request hubzilla/core!1597
|
2019-04-19 15:19:43 +02:00 |
|
Mario
|
c9c35255e7
|
Merge branch 'dev' into 'dev'
Precise cache related headers processing; remove duplicated code and optimization
See merge request hubzilla/core!1596
|
2019-04-19 15:19:19 +02:00 |
|
zotlabs
|
6feddcbced
|
required php version not available but allowed to continue
|
2019-04-18 13:53:39 -07:00 |
|
Max Kostikov
|
db020ca1a3
|
Update Photo.php
|
2019-04-18 21:55:06 +02:00 |
|
Max Kostikov
|
6c93518ef7
|
Merge branch 'dev' into 'dev'
add attachments to zot6 event objects, add zot6 to federated transports (webfinger)
See merge request hubzilla/core!1593
|
2019-04-18 20:59:41 +02:00 |
|
Max Kostikov
|
eb02d01eed
|
Update Photo.php
|
2019-04-18 10:13:03 +02:00 |
|
Max Kostikov
|
7a9093f634
|
Implement ETag: header support for cache control
|
2019-04-18 09:50:37 +02:00 |
|
Max Kostikov
|
1732b2dfe3
|
Add 'must-revalidate' to Cache-control header for profile photos
|
2019-04-17 23:15:46 +02:00 |
|
Max Kostikov
|
a62f891a60
|
Precise 'Modified:' header processing if no profile photo added; remove duplicated code
|
2019-04-17 18:30:50 +02:00 |
|
Max Kostikov
|
c490970324
|
Fix file path with filesystem storage
|
2019-04-16 22:24:48 +02:00 |
|
zotlabs
|
df5a1c59e6
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
|
2019-04-15 20:53:44 -07:00 |
|
zotlabs
|
0615709a7a
|
add attachments to zot6 event objects, add zot6 to federated transports (webfinger)
|
2019-04-15 20:51:57 -07:00 |
|
Mario
|
9c8cb4dea3
|
Merge branch 'dev' into 'dev'
Thumbnails storage in filesystem or database implementation
See merge request hubzilla/core!1588
|
2019-04-13 21:19:06 +02:00 |
|
Max Kostikov
|
ed902fdb70
|
Update photo usage only for thumbnails
|
2019-04-13 14:12:58 +02:00 |
|
Max Kostikov
|
26e35344d0
|
Add multiple profiles support on image operations in photo driver
|
2019-04-12 15:53:00 +02:00 |
|
Max Kostikov
|
979f2415fb
|
Save profile photo in filesystem or database; more precise modification time processing
|
2019-04-12 15:06:59 +02:00 |
|
Max Kostikov
|
28c1d219f6
|
Save cover photo thumbnails in filesystem or database
|
2019-04-12 15:03:59 +02:00 |
|
Max Kostikov
|
4b5922f652
|
Fix wrong image resolution selection
|
2019-04-10 22:09:10 +02:00 |
|
Max Kostikov
|
85be906b68
|
Fix image scale on thumbnail save
|
2019-04-10 14:44:50 +02:00 |
|
Mario
|
e96fa64625
|
Merge branch 'dev' into 'dev'
Dev
See merge request hubzilla/core!1586
|
2019-04-10 13:25:57 +02:00 |
|
Max Kostikov
|
5d70d889e9
|
Revert "Update htconfig.sample.php"
This reverts commit f2126ef18c8b66020305d07dcefeacc4e55a3c12
|
2019-04-10 13:25:03 +02:00 |
|
zotlabs
|
999ae6eb49
|
typo
|
2019-04-08 17:03:08 -07:00 |
|
zotlabs
|
ae1450bbcf
|
missing endTime on Zot6 encoded events, optimise the url fetch of embedphotos
|
2019-04-08 16:45:07 -07:00 |
|
Mario Vavti
|
b026be410c
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
|
2019-04-07 22:48:33 +02:00 |
|
Mario Vavti
|
767a1711ff
|
enable list views
|
2019-04-06 16:10:50 +02:00 |
|
Mario Vavti
|
3007009fab
|
upgrade cdav calendar to version 4
|
2019-04-06 10:22:03 +02:00 |
|
Max Kostikov
|
8e0b9b82e9
|
Update Photo.php
|
2019-04-05 14:21:05 +02:00 |
|
Max Kostikov
|
ea4b4ddce4
|
Update Photo.php
|
2019-04-05 14:17:39 +02:00 |
|
Max Kostikov
|
bd95c7b82a
|
Update Photo.php
|
2019-04-05 14:15:40 +02:00 |
|
Max Kostikov
|
e20c5cf9cf
|
Prevent return wrong profile photo modification date by plugin
|
2019-04-05 14:10:48 +02:00 |
|
Max Kostikov
|
0c2db1cea5
|
Skip removal if no cover image found
|
2019-04-04 11:00:19 +02:00 |
|
Max Kostikov
|
e33604887b
|
Sync cover photo removal with clones
|
2019-04-03 12:05:22 +02:00 |
|
Max Kostikov
|
410f37df1b
|
Fix sync cover photo for clonned channels
|
2019-04-03 00:15:34 +02:00 |
|
Mario
|
4346d7605d
|
Revert "Revert "suggestion widget using feature_enabled still - upgrade to use apps.""
This reverts commit a0a2c27973
|
2019-04-02 14:59:35 +02:00 |
|
Mario
|
a0a2c27973
|
Revert "suggestion widget using feature_enabled still - upgrade to use apps."
This reverts commit b2bdc73164
|
2019-04-02 14:55:03 +02:00 |
|
Max Kostikov
|
242aeea24c
|
Add text to cover remove button
|
2019-04-01 13:15:16 +02:00 |
|
Mario
|
f61b898633
|
Merge branch 'dev' into 'dev'
Add remove cover photo function
See merge request hubzilla/core!1577
|
2019-04-01 12:42:28 +02:00 |
|
zotlabs
|
a1bea7d7cc
|
Merge branch 'dev' of ../hz into dev
|
2019-03-31 16:23:04 -07:00 |
|
zotlabs
|
b2bdc73164
|
suggestion widget using feature_enabled still - upgrade to use apps.
|
2019-03-31 16:22:02 -07:00 |
|
zotlabs
|
103563b375
|
we no longer use xchan_instance_url - this is an abook thing
|
2019-03-30 15:10:28 -07:00 |
|
Max Kostikov
|
1ee91dd690
|
Add remove cover photo processing
|
2019-03-30 22:55:36 +01:00 |
|
M. Dent
|
4fa827ddfd
|
Merge branch 'connections_ordering' into 'dev'
add backend support for connections ordering
See merge request hubzilla/core!1576
|
2019-03-29 18:19:06 +01:00 |
|
Mario Vavti
|
1b3c73618c
|
backslash
|
2019-03-29 15:51:31 +01:00 |
|
Mario Vavti
|
7b08f1cc8c
|
missing use declaration
|
2019-03-29 15:50:10 +01:00 |
|
Mario Vavti
|
f44cc2b60c
|
fix typo
|
2019-03-28 15:56:28 +01:00 |
|
Mario Vavti
|
31680898e3
|
another fix for z6_discover() and create a zot6 hubloc if applicable
|
2019-03-28 15:51:24 +01:00 |
|
Mario Vavti
|
318fd7c9e3
|
add backend support for connections ordering
|
2019-03-27 20:42:56 +01:00 |
|
DM42.Net (Matt Dent)
|
af84c4e6bd
|
Add ITEM_TYPE_CUSTOM support to Zotlabs/Module/Display.php
|
2019-03-24 22:56:18 -04:00 |
|
Mario
|
9d186e9ba3
|
add punify() again
|
2019-03-23 22:53:29 +01:00 |
|
Mario
|
3c3a4526bf
|
fix typo
|
2019-03-23 22:49:27 +01:00 |
|
Mario
|
3094c2ce17
|
fix subthread on sys channel items
|
2019-03-23 22:48:52 +01:00 |
|
Mario
|
393494a728
|
fix revert accidental moving of Features.php
|
2019-03-23 22:01:46 +01:00 |
|
Mario
|
d2725c3f49
|
aparently we do not use underscores anymore. this fixes spaming of dreports with recipient not found entries for our own xchan
|
2019-03-23 21:50:50 +01:00 |
|
Mario
|
4d4425a5bf
|
fix variables for xporof_locale and xprof_postcode
|
2019-03-23 20:57:22 +01:00 |
|
Mario
|
c11fbe0868
|
revert accidental moving of Features.php
|
2019-03-23 20:33:43 +01:00 |
|
Mario
|
c676689df0
|
fix 48 hours timeframe check and remove unused var in mod changeaddr
|
2019-03-23 20:32:15 +01:00 |
|
Mario
|
0f5625d721
|
revert accidental moving of Enotify.php
|
2019-03-23 20:22:11 +01:00 |
|
Mario
|
6f5e6bd0f1
|
fix typo
|
2019-03-23 20:17:35 +01:00 |
|
Mario
|
a0af092ecb
|
fix wrong variable in unused function
|
2019-03-23 20:01:20 +01:00 |
|
Mario
|
3a07a194ab
|
Webfinger::zot_url() requires a string (webfinger address), empty var given in update_directory_entry()
|
2019-03-23 19:42:22 +01:00 |
|
Mario
|
682ffa7cf5
|
db_columns() requires a string, empty var given in process_channel_sync_delivery()
|
2019-03-23 19:21:28 +01:00 |
|
zotlabs
|
dc4a4ca9d3
|
nomadic is not a parameter in the hz version of encode_item_collection
|
2019-03-21 18:00:33 -07:00 |
|
Mario Vavti
|
fad26a49be
|
mysql: remove some unused indices and add thr_parent index. pgsql: sync indices with mysql indices after testing on hub.disroot.org and add thr_parent
|
2019-03-19 10:52:10 +01:00 |
|
zotlabs
|
ed8d2cb482
|
Merge branch 'dev' of https://gitlab.com/macgirvin/hubzilla into dev
|
2019-03-18 20:42:58 -07:00 |
|
zotlabs
|
8e1f022810
|
share encoding issue between hz and zap
|
2019-03-18 20:41:59 -07:00 |
|
Mike Macgirvin
|
4c25072c18
|
Merge branch 'dev' of https://gitlab.com/macgirvin/hubzilla into dev
|
2019-03-19 13:13:21 +11:00 |
|
zotlabs
|
a743feb040
|
Merge branch 'dev' of ../hz into dev
|
2019-03-18 19:10:38 -07:00 |
|
zotlabs
|
b028667de1
|
messagefilter enhancements, fix edge case in unsupported advisory privacy
|
2019-03-18 19:09:12 -07:00 |
|
Mario Vavti
|
d486b03089
|
fix typos
|
2019-03-18 21:58:18 +01:00 |
|
Mario Vavti
|
968c6ed8be
|
some more xss prevention
|
2019-03-18 21:30:25 +01:00 |
|
Mario Vavti
|
2ec3e4a912
|
use urlencode
|
2019-03-18 13:29:08 +01:00 |
|
Mario Vavti
|
a086745ec0
|
ENT_COMPAT will only take care of double-quotes. Use double-quotes here to prevent XSS
|
2019-03-18 13:19:24 +01:00 |
|
Zot
|
ea9925f489
|
clone systems apps to the extent possible, auto-configure imagick thumbnail binary during setup if possible
|
2019-03-18 09:35:53 +01:00 |
|
zotlabs
|
026b96b8f2
|
clone systems apps to the extent possible, auto-configure imagick thumbnail binary during setup if possible
|
2019-03-17 17:56:29 -07:00 |
|
Mike Macgirvin
|
97009a2748
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
|
2019-03-18 08:55:54 +11:00 |
|
zotlabs
|
a976f418e3
|
use php_eol for all mail header generation
|
2019-03-16 15:28:21 -07:00 |
|
zotlabs
|
3c701e780c
|
use the php_eol constant for encoded subjects
|
2019-03-16 15:23:17 -07:00 |
|
Mario Vavti
|
769dd174bd
|
fix dreport redeliver
|
2019-03-15 23:10:17 +01:00 |
|
Mario
|
ebc3666c6f
|
Cleanup and fixes
|
2019-03-15 02:51:51 +01:00 |
|
Mario
|
8769fa0156
|
Merge branch 'dev' into 'dev'
two compatibility issues zot/zot6
See merge request hubzilla/core!1553
|
2019-03-14 09:38:46 +01:00 |
|
Mike Macgirvin
|
6a55500c1b
|
Merge branch 'dev' of https://gitlab.com/macgirvin/hubzilla into dev
|
2019-03-14 10:30:01 +11:00 |
|
zotlabs
|
a5a5ac60ba
|
find unregistered z6 clones on hubzilla sites (does not happen automatically since z6 is not the default protocol on hubzilla). This will need to be pushed to master for the next point release.
|
2019-03-13 16:27:52 -07:00 |
|
Mario Vavti
|
a3e94855f9
|
add zot6 to clonable networks
|
2019-03-13 17:48:00 +01:00 |
|
Mike Macgirvin
|
088a93e023
|
limit 1
|
2019-03-13 13:21:04 +11:00 |
|
zotlabs
|
cf5a310286
|
rework authenticated item fetches (check ACL on the parent, not on the requested item)
|
2019-03-12 16:17:34 -07:00 |
|
zotlabs
|
72384ff2cb
|
add owner permission checks to AS item fetch
|
2019-03-12 15:17:25 -07:00 |
|
zotlabs
|
51024d3821
|
authenticated fetch fixes
|
2019-03-09 12:58:03 -08:00 |
|
zotlabs
|
220d6ed494
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
|
2019-03-08 14:56:13 -08:00 |
|
zotlabs
|
b5ed3edc8f
|
port zot_record_preferred
|
2019-03-08 14:51:30 -08:00 |
|
Mario
|
507c71f64c
|
$sender is supposed to be string in libzot
|
2019-03-08 05:45:02 +01:00 |
|
zotlabs
|
ce0067d8eb
|
It is in fact the 'Content Import' app string that needs to be translated. A previous commit errantly included the string 'Content Filter'. But don't remove 'Content Filter'. That is actually a thing in Zap and will eventually make its way to Hubzilla.
|
2019-03-07 20:01:41 -08:00 |
|
zotlabs
|
1f7622e4c4
|
fetch private objects using delivery channel credentials
|
2019-03-07 15:45:42 -08:00 |
|
zotlabs
|
26e7da0b96
|
channel_type is not integer
|
2019-03-05 17:06:42 -08:00 |
|
zotlabs
|
98b1c7a38c
|
maintain compatibility with recent zot6 changes
|
2019-03-05 16:57:32 -08:00 |
|
zotlabs
|
47001c3303
|
api_router - allow parameters as final path argument
|
2019-03-04 20:11:43 -08:00 |
|
zotlabs
|
8e50fecccc
|
remove clones from delivery recipients for top-level posts - they will get the post via clone sync
|
2019-03-04 20:09:47 -08:00 |
|
zotlabs
|
938fcdd1a6
|
mod_oep: photos/album/xxxxx is no longer hex2bin/bin2hex but the album hash and is throwing php warnings when trying to decode
|
2019-03-04 20:07:01 -08:00 |
|
zotlabs
|
9ede57b228
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
|
2019-03-04 14:50:33 -08:00 |
|
Mario Vavti
|
117a8cafca
|
while in legacy zot $sender is expected to be an array, in zot6 $sender is expected to be a string (xchan_hash)
|
2019-03-02 15:50:53 +01:00 |
|
zotlabs
|
29cb62af3d
|
translate name of content filter (addon) app.
|
2019-02-28 17:51:13 -08:00 |
|
Klaus Weidenbach
|
3f13c85b64
|
Update PHP Version check during Setup.
Hubzilla 4.0 requires PHP7. The oldest still supported PHP branch is 7.1.
So check during Setup for PHP >= 7.1.
|
2019-02-21 21:31:36 +01:00 |
|
Mario Vavti
|
a0ad110cff
|
fix summary and use item_normal_search() for viewsrc so we can also view the source for articles, cards, etc.
|
2019-02-21 08:48:47 +01:00 |
|
zotlabs
|
51e9f302b0
|
hubzilla has uuid - use that instead of wildcard
|
2019-02-19 13:36:53 -08:00 |
|
zotlabs
|
72fd1cc5a6
|
remove extraneous logging
|
2019-02-19 13:23:46 -08:00 |
|
zotlabs
|
1a77bdd1d0
|
fix ability for file storage creators (visitors) to be able to delete their own content
|
2019-02-19 13:14:19 -08:00 |
|
zotlabs
|
1ea9002fe8
|
Merge branch 'dev' of https://framagit.org/zot/core into dev
|
2019-02-19 11:56:26 -08:00 |
|
zotlabs
|
7d1c3920fd
|
mod_id should return object not collection
|
2019-02-19 11:45:42 -08:00 |
|
zotlabs
|
175f78fa84
|
support zot location independent urls
|
2019-02-18 18:16:50 -08:00 |
|
Mario Vavti
|
13ca56d380
|
if local_channel() and updating the page do not query for another item if the first query returned no results. we will most probably find an item from another channel (e.g. after liking a comment) and end up with multiple items with the same mid from different channels after the page update
|
2019-02-18 14:27:01 +01:00 |
|
Mario
|
b5109d2a1a
|
Merge branch 'photo_driver_refactor' into 'dev'
Photo driver refactor
See merge request hubzilla/core!1515
|
2019-02-18 10:02:46 +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 |
|
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 |
|
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 |
|
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 |
|
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 |
|