Mario
4cbaddf4c4
Merge branch 'dark-fix-dev' into 'dev'
...
fix for dark theme; includes one changes to bbcode.php and redbasic/css/style.css
See merge request hubzilla/core!1442
2018-12-19 10:14:29 +01:00
phani00
aaab905e72
remove some fancy formatting.
2018-12-18 12:37:51 +01:00
Mario
6fc8c174f9
Merge branch 'dev' into 'dev'
...
Remove scale_external_images()
See merge request hubzilla/core!1441
2018-12-18 10:17:57 +01:00
Mario Vavti
63b205c601
Merge remote-tracking branch 'mike/master' into dev
2018-12-18 09:59:34 +01:00
zotlabs
15ce8bc79b
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
2018-12-17 18:45:42 -08:00
zotlabs
8d70b91955
regression: mail from dev to core not delivering
2018-12-17 18:14:32 -08:00
zotlabs
a33ed05bec
fix default values for affinity tool and other information which could be lost when approving a connection without the entire form provided by connedit.
2018-12-17 11:32:59 -08:00
phani00
aace8a14ce
new fix for dark theme
...
change implementation of hl-tags in include/bbcode.php
insert class='default-highlight' instead of background-color: 'yellow' into span
add span.default-highlight definition to view/theme/redbasic/css/style.css
this works for all schemas incl. dark.
2018-12-17 15:28:15 +00:00
Max Kostikov
3a66255576
Remove scale_external_images()
2018-12-17 13:29:37 +01:00
Max Kostikov
1541f67eab
Remove scale_external_images()
2018-12-17 13:28:58 +01:00
Max Kostikov
a2959c6e9e
Remove scale_external_images()
2018-12-17 13:28:18 +01:00
zotlabs
06c71eec65
default curl to http/1.1
...
(cherry picked from commit 04a45a407e
2018-12-17 12:17:44 +01:00
Mario Vavti
e4c60d70b0
Merge remote-tracking branch 'mike/master' into dev
2018-12-17 10:12:53 +01:00
zotlabs
04a45a407e
default curl to http/1.1
2018-12-16 14:38:58 -08:00
Mario
3ed6763da9
Merge branch 'custom-item-types' into 'dev'
...
Add ITEM_TYPE_CUSTOM and hooks for processing custom item types
See merge request hubzilla/core!1431
2018-12-15 20:55:28 +01:00
harukin
e02c09d361
merge again upstream/master for 3.8.7
2018-12-15 17:17:00 +09:00
DM42.Net (Matt Dent)
09b2cdd618
Add ITEM_TYPE_CUSTOM and hooks for processing custom item types
2018-12-14 20:20:26 -05:00
zotlabs
c2ad9d4996
regression: the ability to order apps messed up since adding pinned apps to the ordering
...
(cherry picked from commit 6464099364
2018-12-14 21:31:02 +01:00
DM42.Net (Matt Dent)
3416190e4b
Set min/maxversion for plugins to STD_VERSION unless otherwise specified
2018-12-14 14:22:28 -05:00
harukin
097afab9f4
merge from upsream
2018-12-15 00:40:38 +09:00
Mario Vavti
ad4b18cbbe
return on readImageBlob() exception
...
(cherry picked from commit 993db01400
2018-12-14 11:31:11 +01:00
Mario Vavti
c771d2809f
Merge remote-tracking branch 'mike/master' into dev
2018-12-14 10:28:55 +01:00
zotlabs
fc78206049
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
2018-12-13 16:13:13 -08:00
zotlabs
6464099364
regression: the ability to order apps messed up since adding pinned apps to the ordering
2018-12-12 19:11:30 -08:00
Mario Vavti
993db01400
return on readImageBlob() exception
2018-12-11 12:21:09 +01:00
Mario Vavti
15a689c6f5
Merge remote-tracking branch 'mike/master' into dev
2018-12-10 10:38:06 +01:00
zotlabs
214b81e491
rmagic discovery for z6 networks
2018-12-09 16:37:15 -08:00
harukin
e8acf7e87a
merge from upsream 3.8.6 release
2018-12-04 23:52:59 +09:00
Max Kostikov
d12744011a
Merge branch 'dev' into 'dev'
...
Add strings to Russian translation
See merge request hubzilla/core!1418
2018-12-04 11:50:04 +01:00
zotlabs
ffc3dba682
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
2018-12-03 19:19:31 -08:00
zotlabs
7d694dca07
more work on z6 commenting
2018-12-03 18:50:45 -08:00
Mario Vavti
9fcadc2d7c
prevent incompatible export files (osada/zap) from being imported (manual patch from dev)
2018-12-03 11:08:39 +01:00
Mario Vavti
c50e3a702a
more notifications fixes
...
(cherry picked from commit 9ef6c57ca5
2018-12-03 10:49:08 +01:00
Mario Vavti
2173ef5fb6
catch exception if readImageBlob() receives bogus data
...
(cherry picked from commit 443d7684db
2018-12-03 10:48:39 +01:00
Mario Vavti
9ef6c57ca5
more notifications fixes
2018-12-03 10:46:49 +01:00
Mario Vavti
443d7684db
catch exception if readImageBlob() receives bogus data
2018-12-03 10:45:43 +01:00
Max Kostikov
1f6da1c653
Merge branch 'photocache' into 'dev'
...
Add flag to allow to save image without validation
See merge request hubzilla/core!1416
2018-12-03 00:57:52 +01:00
Max Kostikov
c165894ce9
Add Expires field support
2018-12-03 00:51:09 +01:00
Max Kostikov
19903ea3c1
Add flag to allow to save image without validation
2018-12-02 21:59:08 +01:00
M. Dent
0b38ab259c
Merge branch 'photocache' into 'dev'
...
Add Photo Cache addon support
See merge request hubzilla/core!1412
2018-12-02 19:33:54 +01:00
Mario Vavti
defa2d9df1
make pdf preview 100% width and 300px height to match it openstreetmaps preview
...
(cherry picked from commit df84352385
2018-12-02 10:18:37 +01:00
zotlabs
4bf3d4d87a
attached photo permissions regression
...
(cherry picked from commit 6cade7d935
2018-12-02 10:17:29 +01:00
zotlabs
4010ea814a
fix mastodon tag notifications (again)
...
(cherry picked from commit 8e71324514
2018-12-02 10:13:12 +01:00
zotlabs
8e25c091f4
no mention notifications from mastodon (and pleroma)
...
(cherry picked from commit ea235c0c67
2018-12-02 10:12:44 +01:00
Max Kostikov
2a57e00cb4
Remove local_channel() check on cache_body_hook call
2018-12-02 10:07:12 +01:00
M. Dent
52424b0f9c
Merge branch 'pdf_embed_fixes' into 'dev'
...
make pdf preview 100% width and 300px height to match it openstreetmaps preview
See merge request hubzilla/core!1414
2018-12-02 05:09:45 +01:00
Mario Vavti
fdb0459288
Merge remote-tracking branch 'mike/master' into dev
2018-12-01 21:43:54 +01:00
Mario Vavti
df84352385
make pdf preview 100% width and 300px height to match it openstreetmaps preview
2018-12-01 21:37:33 +01:00
zotlabs
6cade7d935
attached photo permissions regression
2018-11-30 13:54:17 -08:00
Max Kostikov
c857ecab46
Create plink depending on message id format
2018-11-30 19:56:49 +01:00
Max Kostikov
53d9cbc69c
Check local_channel() before cache call
2018-11-30 11:38:47 +01:00
Max Kostikov
0ee403eab3
Move cache code to addon
2018-11-30 10:50:00 +01:00
Max Kostikov
6f2d09eb20
Fix wrong parameter
2018-11-29 23:28:45 +01:00
Max Kostikov
d6442ec991
Update text.php
2018-11-29 23:07:39 +01:00
Max Kostikov
3265c2e543
Skip sslify for images if it already were cached with https enabled
2018-11-29 20:36:21 +01:00
Max Kostikov
1a9ea64523
Update text.php
2018-11-29 19:28:54 +01:00
Max Kostikov
9de650e175
Cache for viewer channel
2018-11-29 19:13:43 +01:00
Max Kostikov
d8b5f383f5
Disable links to cached photos for non logged viewers
2018-11-29 16:21:50 +01:00
Max Kostikov
d9faf6c4bb
Update text.php
2018-11-29 11:48:12 +01:00
Max Kostikov
48cd5855fe
Add photo cache support using sslify()
2018-11-29 11:06:14 +01:00
zotlabs
19e4f3c2f0
prevent incompatible export files (osada/zap) from being imported. This is to keep your DB from getting trashed. We probably need a similar thing for item import since the object formats aren't compatible
2018-11-27 11:53:02 -08:00
Mario
f408ff982c
Merge remote-tracking branch 'mike/master' into dev
2018-11-23 15:42:40 +01:00
zotlabs
9a8d1200ec
use uuid in file storage
2018-11-22 18:39:38 -08:00
Mario
85f52d2aed
Merge remote-tracking branch 'mike/master' into dev
2018-11-22 10:17:18 +01:00
zotlabs
8e71324514
fix mastodon tag notifications (again)
2018-11-21 20:25:59 -08:00
zotlabs
ea235c0c67
no mention notifications from mastodon (and pleroma)
2018-11-21 20:03:58 -08:00
harukin
f5faa053bf
merge from upsream 3.8.5 release
2018-11-19 20:40:12 +09:00
Mario
7be1d9e45a
Merge branch 'patch-20181118a' into 'dev'
...
Patch 20181118a - fix delayed publication of posts
See merge request hubzilla/core!1398
(cherry picked from commit f34af496ec3787c490
2018-11-19 10:45:01 +01:00
DM42.Net (Matt Dent)
3787c490d4
Fix: delayed items propagate before publication on cloned channels
2018-11-18 07:00:06 -05:00
Mario Vavti
4812c5486d
strlen($this->imageString()) does not return the correct size when dealing with os_storage images. use filesize() instead.
...
(cherry picked from commit afc75af62f
2018-11-16 22:19:01 +01:00
Mario Vavti
afc75af62f
strlen($this->imageString()) does not return the correct size when dealing with os_storage images. use filesize() instead.
2018-11-16 22:14:11 +01:00
zotlabs
b0689614bf
datetime_convert wrong args
2018-11-15 21:14:14 -08:00
zotlabs
5162459e4a
delivery report issue
2018-11-15 18:07:58 -08:00
zotlabs
39d914c9df
add item.uuid to relevant places
2018-11-15 16:34:09 -08:00
zotlabs
26f593afaa
delivery issue
2018-11-15 13:52:25 -08:00
zotlabs
9c25f300cf
fixes to old z6 delivery
2018-11-14 18:56:38 -08:00
zotlabs
db4ff56f0b
more logging
2018-11-14 18:41:36 -08:00
zotlabs
830c2472cb
more logging
2018-11-14 18:39:23 -08:00
zotlabs
079e2af0c0
check keyid
2018-11-14 18:33:00 -08:00
zotlabs
5f166158c3
filter by network
2018-11-14 18:25:02 -08:00
zotlabs
4a06378d67
crypto fix
2018-11-14 18:19:35 -08:00
zotlabs
b64dd7ab57
Merge branch 'master' into zvi
2018-11-14 16:42:03 -08:00
harukin
23b65c8e6e
Merge Upstream to here. 3.8.4
2018-11-14 19:45:51 +09:00
Mario
6ed9443972
Merge branch 'patch-20181113b' into 'dev'
...
Patch 20181113b
See merge request hubzilla/core!1395
2018-11-14 09:30:54 +01:00
Mario
08e0f172de
Merge branch 'dev' into 'dev'
...
Remove unneccessary fetch_image_from_url() function
See merge request hubzilla/core!1393
2018-11-14 09:30:28 +01:00
zotlabs
cfc43f6dea
Merge branch 'master' into zvi
2018-11-13 20:37:52 -08:00
DM42.Net (Matt Dent)
302d9796c4
Revert "Filter search box before display"
...
This reverts commit 35e66770be
2018-11-13 22:59:36 -05:00
zotlabs
ee85784be1
stay ahead of the game
2018-11-13 19:55:43 -08:00
DM42.Net (Matt Dent)
35e66770be
Filter search box before display
2018-11-13 17:20:21 -05:00
Max Kostikov
2f59d78737
Remove fetch_image_from_url() because of functions duplicate
2018-11-13 11:37:32 +01:00
zotlabs
1a2df9c51c
item uuid changes
2018-11-12 18:25:55 -08:00
zotlabs
770fdb2b7d
dreport updates
2018-11-12 16:08:22 -08:00
Mario Vavti
7bd60adfbe
fix css issues in bbcode conversion and focus-light schema
2018-11-12 09:35:12 +01:00
zotlabs
da452decf6
more z6 debugging
2018-11-11 15:12:01 -08:00
Max Kostikov
29f1f9c872
Merge branch 'dev' into 'dev'
...
# Conflicts:
# include/photo/photo_driver.php
2018-11-10 20:47:35 +01:00
Max Kostikov
a49cfa8142
Update photo_driver.php
2018-11-10 20:45:20 +01:00
Mario
01d8bd445e
Merge branch 'dev' into 'dev'
...
Remove DNS check for database connection during installation...
See merge request hubzilla/core!1384
2018-11-10 15:02:27 +01:00
Max Kostikov
c6e14a696e
Fixed wrong value assign on compare with 0
2018-11-10 11:56:34 +01:00
Max Kostikov
d34423fce9
Fixed wrong value assign on compare with 0
2018-11-10 11:53:49 +01:00
Max Kostikov
d20759c141
Do not return default images from vCard
2018-11-10 11:11:23 +01:00
Max Kostikov
32873ce70d
Preserve received image modification date on caching
2018-11-09 22:20:41 +01:00
Mario
4bf3fdd898
Merge branch 'patch-1' into 'dev'
...
Return image modification date on remote fetch for caching
See merge request hubzilla/core!1383
2018-11-09 16:51:36 +01:00
Andrew Manning
108a892a11
Remove DNS check for database connection during installation. Causes friction with Docker deployment.
2018-11-09 05:31:55 -05:00
Max Kostikov
2c4bd9a3fe
Workaround for local resource path to photo from Diaspora
2018-11-09 10:03:58 +01:00
zotlabs
c80ac58eff
add zot6 delivery method
2018-11-08 20:42:09 -08:00
zotlabs
d56e1f6285
begin native summary support
2018-11-08 19:49:57 -08:00
Max Kostikov
098ec1abb4
remove image type double guess by checking HTTP headers
2018-11-08 22:43:17 +01:00
Max Kostikov
17cf824545
Return image modification date using HTTP 'Last-Modified' and '304 Not Modified' on remote fetch for caching
2018-11-08 18:00:18 +01:00
Mario Vavti
302f49baf2
provide a function to log to syslog
2018-11-08 10:12:33 +01:00
zotlabs
d2aa2c080f
Merge branch 'master' into zvi
2018-11-07 01:43:43 -08:00
zotlabs
7148311953
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
2018-11-07 01:43:26 -08:00
Mario Vavti
c23dfa0d23
Merge remote-tracking branch 'mike/master' into dev
2018-11-07 10:15:40 +01:00
zotlabs
f57fcefe6b
signature issue
2018-11-06 21:45:43 -08:00
zotlabs
a5483a03c9
fix signatures
2018-11-06 21:44:57 -08:00
zotlabs
bb8b3b9291
this is brutal
2018-11-06 20:44:40 -08:00
zotlabs
3b9aedec5f
populate new fields
2018-11-05 19:52:30 -08:00
zotlabs
43a5f928ba
these changes needed to ensure cloning/syncing works in the future to non-zot6 enabled servers after the (coming) zot6 schema updates. This should probably be on a fast track to master branch
2018-11-05 16:57:32 -08:00
harukin
d3bd55e628
commit
2018-11-05 21:33:01 +09:00
Mario
d6523c67a6
Merge branch 'patch-20181028a' into 'dev'
...
Add timestamp to pconfig
See merge request hubzilla/core!1355
2018-11-05 10:40:29 +01:00
M.Dent
346a4f5933
strpos needs to test with ===0 not ==0
2018-11-01 20:23:22 -04:00
Max Kostikov
c6551336c8
Fix wrong image resize for some external images
2018-11-01 21:50:36 +01:00
harukin
88a6a2d1de
2018-11-01 23:01:27 +09:00
harukin
e022a7edee
2018-11-01 22:59:08 +09:00
harukin
5d912efb32
2018-11-01 22:58:08 +09:00
harukin
5243af975c
2018-11-01 22:56:50 +09:00
harukin
43486e7137
2018-11-01 22:55:18 +09:00
harukin
b2430495f5
修正
2018-11-01 22:53:44 +09:00
harukin
1b1a6e357a
修正
2018-11-01 22:50:16 +09:00
harukin
626b5f36ad
修正
2018-11-01 22:46:40 +09:00
harukin
746ceebcdc
5000兆円欲しい！！
2018-11-01 22:39:28 +09:00
harukin
23c40b9618
2018-11-01 21:53:18 +09:00
Mario Vavti
0252bac4ba
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
2018-10-31 09:39:10 +01:00
Mario
b468069875
Merge branch 'patch-20' into 'dev'
...
Beautiful embedding for Hubzilla links
See merge request hubzilla/core!1360
2018-10-31 09:36:09 +01:00
zotlabs
70c55da1df
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
2018-10-30 18:11:49 -07:00
zotlabs
9594105e57
typo
2018-10-30 17:21:39 -07:00
zotlabs
675343f575
issue syncing the channel_primary setting which shows up as a wrong count on the admin summary page
2018-10-30 17:18:15 -07:00
Mario Vavti
b4bac88c39
fix markdown tests
2018-10-30 22:37:41 +01:00
Mario Vavti
c622ba84b9
really fix html2markdown() - when using environment, we must set the defaults
2018-10-30 22:16:37 +01:00
Max Kostikov
339f95c647
Update oembed.php
2018-10-30 16:49:48 +01:00
Max Kostikov
ec67e0ab22
Beautiful embedding for Hubzilla links
2018-10-30 15:38:19 +01:00
Mario Vavti
0b371c8103
fix html2markdown() and re-enable previously failing tests
2018-10-30 13:55:08 +01:00
Your Name
d12c6ccb72
2018-10-29 21:44:52 +09:00
Mario Vavti
e1c3a19420
merge include/zot.php from dev
2018-10-29 10:08:12 +01:00
Mario Vavti
cc586685e6
merge include/nav.php from dev
2018-10-29 10:07:54 +01:00
Mario Vavti
31883f603c
merge include/import.php from dev
2018-10-29 10:07:15 +01:00
Mario Vavti
f377c81c8a
merge include/connections.php from dev
2018-10-29 10:06:44 +01:00
Mario Vavti
e1df69dfcb
Merge branch 'dev'
2018-10-29 07:43:40 +01:00
Your Name
ecab83264c
harukinの表示サイズ変更
2018-10-29 11:26:30 +09:00
Your Name
ff1db9a055
harukin絵文字追加テスト
2018-10-29 10:45:45 +09:00
M.Dent
3ab0ef1902
Add timestamp and associated logic to pconfig
2018-10-28 17:23:31 -04:00
zotlabs
ae4aeb4b1e
delivery chain linkage messed up if original post was edited
2018-10-26 13:00:26 -07:00
Mario Vavti
5c4fbbebe1
refine stream filter and forum notification behaviour (mostly for performance). personal posts will be displayed in unthreaded mode and clicking a forum notification will show only the unseen items of the forum in unthreaded mode. group the filters in the widget - threaded at the top, unthreaded beneath.
2018-10-24 20:58:25 +02:00
Mario Vavti
fa9e9510e5
Merge branch '3.8RC'
2018-10-19 11:18:28 +02:00
Mario
c440b758a3
Merge branch 'dev' into 'dev'
...
Fix template root redirection
See merge request hubzilla/core!1343
(cherry picked from commit e9471124c0442d1cb4
2018-10-18 09:12:38 +02:00
M.Dent
442d1cb48f
Fix template root redirection
2018-10-17 22:21:31 -04:00
Mario
7268426248
Merge branch 'dev' into 'dev'
...
Bring back some basic automated testing for PHP7.1 and mysql via gitlab-ci.
See merge request hubzilla/core!1332
(cherry picked from commit c39de966dfb77acb3e22275f300db047e5
2018-10-15 10:00:06 +02:00
Mario
c39de966df
Merge branch 'dev' into 'dev'
...
Bring back some basic automated testing for PHP7.1 and mysql via gitlab-ci.
See merge request hubzilla/core!1332
2018-10-15 09:59:52 +02:00
Mario
eb133ef9a7
Merge branch 'patch-16' into 'dev'
...
JS plurals displaying code cleanup
See merge request hubzilla/core!1338
(cherry picked from commit 721461dd3eb7280a44ab0e2f52f9c3b807ce52c27a
2018-10-15 09:59:25 +02:00
Max Kostikov
ab0e2f5236
Update language.php
2018-10-14 22:28:14 +02:00
Mario
eaee27c9e4
Merge branch 'patch-14' into 'dev'
...
Add date/time plurals translation in JavaScript
See merge request hubzilla/core!1336
(cherry picked from commit a2575059e25c0d3187729d0d53f68674b33ac4337ae96e3dc654bdf59d
2018-10-13 20:17:14 +02:00
Max Kostikov
54bdf59dde
Update js_strings.php
2018-10-13 19:56:07 +02:00
Max Kostikov
729d0d5368
Update language.php
2018-10-13 19:50:09 +02:00
Max Kostikov
5c0d31873a
Add date/time plurals translation in JavaScript
2018-10-13 19:48:45 +02:00
Mario Vavti
2c961328f1
Merge branch 'dev' into 3.8RC
2018-10-13 17:21:12 +02:00
Mario Vavti
c36773674e
Revert "Merge branch 'patch-11' into 'dev'"
...
This reverts commit e5184458538ce240b95c
2018-10-13 17:18:42 +02:00
Mario Vavti
f0cdbd0f52
Merge branch 'dev' into 3.8RC
2018-10-13 14:11:08 +02:00
ZotSocial Admin
321b2b9b49
Fix order of assignment and get template file before return
...
(cherry picked from commit 8ebcc4439b
2018-10-13 14:01:43 +02:00
Mario
fb3dd5eee6
Merge branch 'dev' into 'dev'
...
Fix order of assignment and get template file before return
See merge request hubzilla/core!1329
2018-10-13 14:01:01 +02:00
git-marijus
0db047e572
fix phpunit error with html2markdown test and temporary disable failing markdown test in connection with **bold** and _italic_ (it is not clear why they fail and the code appears to work as expected)
2018-10-13 13:39:22 +02:00
Max Kostikov
6ae9ef571e
Update language.php
2018-10-13 02:14:19 +02:00
Max Kostikov
8e5189464e
Update language.php
2018-10-13 01:36:24 +02:00
Max Kostikov
0de713ff36
Update language.php
2018-10-13 01:08:06 +02:00
Max Kostikov
137bee9d27
Update language.php
2018-10-13 00:40:06 +02:00
Max Kostikov
3641ab8c7d
Update language.php
2018-10-13 00:28:12 +02:00
Max Kostikov
16b6b76507
Update language.php
2018-10-13 00:25:57 +02:00
Max Kostikov
5cd9540d5f
Update language.php
2018-10-13 00:24:04 +02:00
Max Kostikov
ae7873260e
Update language.php
2018-10-13 00:20:23 +02:00
Max Kostikov
3e19c4ddae
Update language.php
2018-10-13 00:12:17 +02:00
Max Kostikov
8cb05a91ab
Update language.php
2018-10-12 23:45:52 +02:00
Max Kostikov
5f2c3f607e
Add plurals translation at browser side (JS)
2018-10-12 23:43:38 +02:00
ZotSocial Admin
8ebcc4439b
Fix order of assignment and get template file before return
2018-10-12 15:20:57 -04:00
zotlabs
f783454774
verify some edge case http signatures
...
(cherry picked from commit c6bfd5e7be
2018-10-12 10:56:28 +02:00
zotlabs
c6bfd5e7be
verify some edge case http signatures
2018-10-11 21:28:47 -07:00
zotlabs
2cb52f8875
Merge branch 'dev'
2018-10-08 20:58:16 -07:00
zotlabs
2c797807cd
whitespace
2018-10-08 20:56:20 -07:00
Max Kostikov
2ba95758eb
Prevent links damage on foreign channel repost for cloned
...
(cherry picked from commit d9efb037e3
2018-10-08 11:20:34 +02:00
Mario
13c08f9660
Merge branch 'patch-2' into 'dev'
...
Prevent links damage on foreign channel repost for cloned
See merge request hubzilla/core!1307
2018-10-08 11:18:28 +02:00
M.Dent
8ca321df7c
Add missing else clause
...
(cherry picked from commit 259db3778c
2018-10-07 08:43:58 +02:00
zotlabs
ed97800c80
use hubloc_store_lowlevel to ensure all hubloc columns are initialised
...
(cherry picked from commit 52be5c1660
2018-10-07 08:43:28 +02:00
Mario Vavti
5acd166d18
Merge remote-tracking branch 'mike/master' into dev
2018-10-07 08:39:29 +02:00
M. Dent
3efeeecace
Merge branch 'dev' into 'dev'
...
Add missing else clause
See merge request hubzilla/core!1317
2018-10-07 05:05:27 +02:00
M.Dent
259db3778c
Add missing else clause
2018-10-06 23:02:22 -04:00
zotlabs
52be5c1660
use hubloc_store_lowlevel to ensure all hubloc columns are initialised
2018-10-06 14:47:40 -07:00
Mario Vavti
9bfa5c82d1
move profile assign selector to profile settings and personal menu selector to channel_home settings and get rid of misc channel settings section.
...
(cherry picked from commit 66cf085272
2018-10-06 20:34:57 +02:00
Mario Vavti
66cf085272
move profile assign selector to profile settings and personal menu selector to channel_home settings and get rid of misc channel settings section.
2018-10-06 20:29:32 +02:00
Mario Vavti
a38ded702f
strings and force import_system_apps() on std_version change
...
(cherry picked from commit cd5f255966
2018-10-06 17:21:49 +02:00
Mario Vavti
cd5f255966
strings and force import_system_apps() on std_version change
2018-10-06 17:20:23 +02:00
Mario Vavti
5aa0304149
version RC1
2018-10-06 16:43:28 +02:00
Max Kostikov
d9efb037e3
Prevent links damage on foreign channel repost for cloned
2018-10-05 13:16:29 +02:00
Mario Vavti
c403c9aece
Merge branch '3.8RC' of https://framagit.org/hubzilla/core into 3.8RC
2018-10-05 12:10:15 +02:00
Mario Vavti
df5115e7b8
force major version system apps import for 3.8RC - remove this at a later point
2018-10-05 12:09:54 +02:00
zotlabs
22fbb512d5
do not propagate channel deletion for an already deleted channel.
...
(cherry picked from commit 7c1e99884c
2018-10-05 11:45:09 +02:00
Mario Vavti
69659e9bd5
Merge remote-tracking branch 'mike/master' into dev
2018-10-05 11:40:50 +02:00
zotlabs
3a0a611f15
Merge branch 'dev'
2018-10-04 19:20:10 -07:00
Mario Vavti
d4af745fc8
move *_divmore_height setting to the module extra_settings, and fix issue where feature settings were not synced if rpath was provided
2018-10-04 21:38:39 +02:00
Mario Vavti
6e03104e3e
move *_list_mode to features
2018-10-04 20:48:22 +02:00
Mario
5e7c9b9d4a
jot: show settings icon only to local profile owner
2018-10-03 15:21:20 +02:00
Mario
009e03c3ba
move archives from network to channel_home
2018-10-03 11:47:12 +02:00
Mario Vavti
af3b0146a8
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
2018-10-03 10:44:18 +02:00
Mario Vavti
883e2ccc91
move filing from conversation to network - it is only functional there.
2018-10-03 10:43:54 +02:00
zotlabs
7c1e99884c
do not propagate channel deletion for an already deleted channel.
2018-10-02 19:42:21 -07:00
M. Dent
29e1302f3f
Merge branch 'dev' into 'dev'
...
Fix misplaced comma with period.
See merge request hubzilla/core!1304
2018-10-03 03:18:43 +02:00
M.Dent
798f2466e4
Fix misplaced comma with period.
2018-10-02 21:14:36 -04:00
Mario Vavti
7dadf387e5
indicate locked features
2018-10-01 11:01:56 +02:00
M. Dent
ff20370d0b
Status editor hook
2018-09-29 20:22:27 +02:00
M. Dent
5f992ffe15
Remove servicelevel logic
2018-09-29 00:17:55 +02:00
Mario
27fef98a39
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
2018-09-28 13:05:44 +02:00
Mario
41108fc4d3
nav_channel_select should be off by default
2018-09-28 11:46:17 +02:00
Mario Vavti
20285d076b
settings for channel home
2018-09-28 11:29:05 +02:00
Max Kostikov
65785ead69
Update zot.php
2018-09-28 01:05:03 +02:00
Max Kostikov
2836bce8fe
Update security.php
2018-09-28 00:51:21 +02:00
Max Kostikov
51c0045be4
Update zot.php
2018-09-28 00:38:36 +02:00
Max Kostikov
abfbfd9e9b
Update group.php
2018-09-28 00:33:52 +02:00
Max Kostikov
208d38207e
Update acl_selectors.php
2018-09-27 23:59:45 +02:00
Max Kostikov
ffe80c66d7
Update api_zot.php
2018-09-27 23:58:49 +02:00
Max Kostikov
bfa672f42c
Update channel.php
2018-09-27 23:56:54 +02:00
Max Kostikov
9f89f3190a
Update connections.php
2018-09-27 23:55:20 +02:00
Max Kostikov
71931b423c
Update items.php
2018-09-27 23:53:51 +02:00
Max Kostikov
b54aabc958
Update security.php
2018-09-27 23:52:46 +02:00
Max Kostikov
a45fe72eb9
Update text.php
2018-09-27 23:50:26 +02:00
Max Kostikov
62d64631b5
Update xchan.php
2018-09-27 23:49:41 +02:00
Mario Vavti
6b23c3e179
implement conversation tools (settings/conversation), remove additional features from the settings menu and get rid of skill levels
2018-09-27 14:56:47 +02:00
Mario Vavti
e3c04b1fd0
guest access app
2018-09-26 22:24:36 +02:00
Mario Vavti
a7948d7bfe
permcats app
2018-09-26 22:02:50 +02:00
Mario Vavti
505782f224
remove oauth from features
2018-09-26 16:35:05 +02:00
Mario Vavti
9948bb3f2a
appification of privacy groups
2018-09-25 12:59:53 +02:00
Mario Vavti
65423b1768
get rid of general features
2018-09-25 12:02:48 +02:00
Mario Vavti
39866b7463
move start_menu switch to settings/display for now
2018-09-25 11:37:22 +02:00
Mario Vavti
4c58a5cef2
premium channel app
2018-09-25 10:06:24 +02:00
Mario Vavti
c3aa15cc16
appification of notes
2018-09-24 11:46:18 +02:00
Mario Vavti
b45bd901e0
move categories from tools to editor settings
2018-09-24 10:13:56 +02:00
Mario
7cadc30914
settings for directory and set App::$profile_uid in directory if local_channel()
2018-09-24 09:33:52 +02:00
Mario
a1d1d5dba7
use different settings for cal_first_day in events and cdav/calendar. This is a tradeoff. It would be better to have one setting for both but if we want to preserve the *all settings* view, this would break its functionality
2018-09-23 19:40:52 +02:00
Mario
781fdaafcd
settings for events and cdav calendar
2018-09-23 19:18:05 +02:00
Mario
1f1d5b9181
provide settings for mod photo and make it slightly simpler to create new module settings
2018-09-23 17:52:32 +02:00
Mario
9e22ec267c
keep the features in the central array but sort them by module name
2018-09-23 01:11:06 +02:00
Mario
45078dda82
introduce profile settings and provide a way for modules without an app to still be able to link to its settings page from the navbar
2018-09-22 19:48:17 +02:00
Mario Vavti
822bbd9ad5
another try to fix Fix PHP Warning: DOMDocument::loadHTML(): htmlParseEntityRef: no name in Entity
2018-09-22 14:18:37 +02:00
Mario
c873f7e702
Revert "Fix PHP Warning: DOMDocument::loadHTML(): htmlParseEntityRef: no name in Entity"
...
This reverts commit 184928204a
2018-09-22 14:15:30 +02:00
Mario Vavti
9638bf2b1e
provide a return path from settings pages
2018-09-21 20:23:31 +02:00
zotlabs
a4d987b45a
Merge branch 'dev'
2018-09-20 18:36:14 -07:00
zotlabs
3cc66b6816
bookmarks fail to sync
2018-09-20 16:07:32 -07:00
Mario Vavti
1ca558f011
move connection filtering setting from network to connections, provide a link to settings in the navbar if present for a module and some code optimisation
2018-09-20 13:22:41 +02:00
Mario Vavti
a6db822a69
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
2018-09-20 12:10:39 +02:00
Mario Vavti
ad8226d549
deal with the ability to provide settings url in apd files in include/nav.php
2018-09-20 12:10:27 +02:00
M.Dent (DM42.Net)
3ee632514c
Add structure to permit_hook
2018-09-19 22:33:25 -04:00
M.Dent (DM42.Net)
456fe71ca9
add hook: permit_hook
2018-09-19 21:54:46 -04: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
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
M.Dent (DM42.Net)
abe35817cd
Add attach_delete hook
2018-09-15 23:09:16 -04: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
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
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
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
be3b630474
important hyperdrive component
2018-09-09 20:53:20 -07:00
zotlabs
c5bc4fe245
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
2018-09-05 21:02:06 -07:00
zotlabs
bc4a92b702
detect and automatically repair duplicate plugin hook scenarios.
2018-09-05 19:43:07 -07:00
M.Dent
9446e0348e
Corrected resubmit of fixes to Authors unable to comment on posts they authored when owned by others.
2018-09-04 08:14:52 -04:00
Mario Vavti
41ccb61c2e
Revert "Fix: Authors unable to comment on posts they authored when under owned by others in certain circumstances."
...
This reverts commit e2824f9259
2018-09-03 18:14:17 +02:00
Mario
1b7781a159
Merge branch 'add-delivery-status-info' into 'dev'
...
Fix: Authors unable to comment on posts they authored when under owned by others…
See merge request hubzilla/core!1268
2018-09-02 09:17:29 +02:00
M.Dent
e2824f9259
Fix: Authors unable to comment on posts they authored when under owned by others in certain circumstances.
2018-09-01 13:45:05 -04:00
Mario
c5ce9b0699
Merge branch 'call-hooks-optimization' into 'dev'
...
Micro-optimization to call_hooks()
See merge request hubzilla/core!1267
2018-08-30 10:09:00 +02:00
Mario
c74a7ce4fc
Merge branch 'add-delivery-status-info' into 'dev'
...
Add dreport_process hook
See merge request hubzilla/core!1266
2018-08-30 10:07:18 +02:00
Mario Vavti
d98ed68749
html-to-markdown adds a backslash infront of a hash after each new line - manualy remove those
2018-08-29 16:16:17 +02:00
M.Dent
70d6d2f2db
Micro-optimization to call_hooks()
2018-08-29 10:02:04 -04:00
M.Dent
da441c59f6
Add dreport_process hook
2018-08-29 08:58:49 -04:00
zotlabs
7018da3f12
code cleanup
2018-08-23 22:44:22 -07:00
zotlabs
a66c43166a
first_post_date() (used by archive widget) - trigger the query options off of the active module rather than rely on passed parameters
2018-08-23 21:01:28 -07:00
zotlabs
6ecd31a715
tweak archive widget for articles
2018-08-22 13:30:16 -07:00
zotlabs
0eeaf8713f
add api_not_found hook
2018-08-21 23:13:54 -07:00
zotlabs
42c4a0da51
Zot/Finger: ignore deleted hublocs
2018-08-21 21:38:10 -07:00
zotlabs
066febdf40
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
2018-08-20 20:20:57 -07:00
zotlabs
df26fec1b3
hubzilla core issue #1262
2018-08-17 21:21:02 -07:00
Mario Vavti
e25db4d1b5
Merge remote-tracking branch 'mike/master' into dev
2018-08-16 08:50:52 +02:00
zotlabs
f230c07ba5
possible fixes for can_comment_on_post(), provide wiki_list on wiki sidebar
2018-08-15 17:00:37 -07:00
Mario Vavti
2becc3273a
Merge remote-tracking branch 'mike/master' into dev
2018-08-15 13:21:12 +02:00
zotlabs
f4f610f1a3
more backporting for zot6
2018-08-14 18:19:34 -07:00
Mario Vavti
10c5b46e3b
Merge remote-tracking branch 'mike/master' into dev
2018-08-14 13:04:37 +02:00
M. Dent
94393d27c8
Override helpfiles
2018-08-14 13:03:26 +02:00
zotlabs
12f4787b67
issue with mdpost addon and archive.org links which contain a full url as a path/query component
2018-08-13 23:11:10 -07:00
zotlabs
f15c1c4e54
hubloc DB changes needed for z6
2018-08-13 21:18:20 -07:00
zotlabs
4fdf5d28ca
minor oauth2 updates - renamed zot webbie to 'webfinger' and zothash to 'portable_id', fixed/simplified cgi auth mode
2018-08-13 17:24:48 -07:00
Mario
b78c9a2251
Merge branch 'add-template-overrides' into 'dev'
...
Add template overrides
See merge request hubzilla/core!1256
2018-08-13 14:06:36 +02:00
M.Dent
b436c4a94c
Add support for overriding the default template location and individual templates via .htconfig.php
2018-08-12 19:47:10 -04:00
zotlabs
db1a546aba
add table support to markdown
2018-08-12 16:25:14 -07:00
zotlabs
2d29095348
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
2018-08-12 15:10:19 -07:00
zotlabs
ac03b4ccd7
make channel_remove less memory hungry
2018-08-12 15:09:02 -07:00
Mario Vavti
759a18685b
Merge remote-tracking branch 'mike/master' into dev
2018-08-12 14:07:16 +02:00
zotlabs
5afe779ffc
prevent json-ld bombing, turn off browser autocomplete on channel sources creation
2018-08-11 16:16:54 -07:00
Mario Vavti
7890157f52
revert debug comment from the last commit
2018-08-09 23:07:50 +02:00
Mario Vavti
b3d1ea4cd5
fix zid leaking to nonzot sites if markdown is enabled
2018-08-09 17:03:20 +02:00
Mario Vavti
7c842f3170
search form action for channel search needs the channel address
...
(cherry picked from commit 054c5da294
2018-08-09 15:50:49 +02:00
Mario Vavti
054c5da294
search form action for channel search needs the channel address
2018-08-09 15:47:57 +02:00
Mario Vavti
569cd6c57c
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
2018-07-31 14:39:51 +02:00
zotlabs
0cfaf34a22
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
2018-07-30 18:11:49 -07:00
zotlabs
e8aeecc4c9
When checking permissions ignore checking site "Block Public" settings in cases where site permissions aren't applicable
2018-07-30 17:41:37 -07:00
Mario
7f6bf7170a
Merge branch 'patch-9' into 'dev'
...
Respect navbar translations
See merge request hubzilla/core!1243
(cherry picked from commit cbd8c0726505b3237b
2018-07-30 10:00:24 +02:00
gia vec
149071bf0c
Update network.php
...
(cherry picked from commit 8db006d9a1
2018-07-30 09:48:24 +02:00
zotlabs
32614e4074
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
2018-07-29 18:00:56 -07:00
zotlabs
9dc5a3bfc9
this may conflict
2018-07-29 17:59:40 -07:00
gia vec
8db006d9a1
Update network.php
2018-07-29 19:19:37 +02:00
zotlabs
13386ddbd7
SECURITY: sanitise vcard fields
...
(cherry picked from commit 2367d94a42
2018-07-29 07:04:38 +02:00
Mario Vavti
45d262d6c0
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
2018-07-29 06:59:10 +02:00
zotlabs
2367d94a42
SECURITY: sanitise vcard fields
2018-07-28 15:33:20 -07:00
Max Kostikov
05b3237bae
Update nav.php
2018-07-27 11:50:04 +02:00
Mario Vavti
7062a7ce66
fix sql error
...
(cherry picked from commit ec3a066e4e
2018-07-26 09:34:48 +02:00
Mario Vavti
ec3a066e4e
fix sql error
2018-07-26 09:32:52 +02:00
Mario Vavti
1b1d11dcf1
Merge branch '3.6RC'
2018-07-25 10:19:19 +02:00
zotlabs
67848c03ed
query filter was a bit greedy
...
(cherry picked from commit a05c8ff66b
2018-07-19 09:21:14 +02:00
zotlabs
931afe98b1
mangled urls on redirects
...
(cherry picked from commit 5ce50d0a2e
2018-07-19 09:19:33 +02:00
zotlabs
13d19d42cb
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
2018-07-18 19:14:21 -07:00
zotlabs
a05c8ff66b
query filter was a bit greedy
2018-07-18 17:48:23 -07:00
zotlabs
5ce50d0a2e
mangled urls on redirects
2018-07-18 17:05:38 -07:00
Mario Vavti
4a6f775334
set the correct album name when moving photos
...
(cherry picked from commit eb322e8312
2018-07-18 13:20:20 +02:00
Mario Vavti
5fa3e10701
set the correct album name when moving photos
...
(cherry picked from commit eb322e8312
2018-07-18 13:19:35 +02:00
