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 |
|
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 |
|
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
|
6230dbed2d
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
|
2019-04-28 18:21:28 -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
|
13970280d9
|
Merge branch 'dev' of ../hz into dev
|
2019-04-27 17:22:00 -07: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
|
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 |
|
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
|
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 |
|
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 |
|
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
|
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
|
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 |
|
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
|
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
|
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 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 |
|