Mario Vavti
cf80f03084
Merge remote-tracking branch 'mike/master' into dev
2019-02-04 10:03:38 +01:00
zotlabs
8ff9a9ff08
fix linkify_tags() so it works with xchans across multiple protocols, also some fixes to activity parsing from upstream.
2019-02-03 16:53:49 -08:00
Mario
bf3d0c1274
Merge branch 'patch-20190201a' into 'dev'
...
Add filter hooks and the ability to add buttons to the default status editor
See merge request hubzilla/core!1502
2019-02-02 20:50:40 +01:00
M. Dent
0ded1d326c
Merge branch 'dev' into 'dev'
...
Prevent Hubzilla usage for SEO backlinks
See merge request hubzilla/core!1501
2019-02-01 18:01:01 +01:00
DM42.Net (Matt Dent)
708d288121
Add filter hooks and the ability to add buttons to the default status editor
2019-02-01 09:49:11 -05:00
Max Kostikov
6462c83f69
Prevent Hubzilla usage for SEO backlinks
2019-02-01 15:47:51 +01:00
Mario Vavti
e64c5661da
Merge remote-tracking branch 'mike/master' into dev
2019-01-30 09:48:07 +01:00
zotlabs
b15421826d
cache embeds in the background on initial storage rather than on first access
2019-01-29 15:14:49 -08:00
Klaus Weidenbach
728788e3b9
Extend documentation.
2019-01-28 23:58:19 +01:00
Klaus Weidenbach
13e0151cd2
Correct and extend Doxygen comments.
...
Correct some documentation errors for Doxygen and add
more comments.
Document some undefined variables with @FIXME.
2019-01-23 22:25:47 +01:00
Mario
51a7be29f5
Merge branch 'prepare_text' into 'dev'
...
Correct parameter in include/text.php prepare_text()
See merge request hubzilla/core!1483
2019-01-23 15:41:54 +01:00
Mario
ef46738384
Merge branch 'dev' into 'dev'
...
Skip tags detection in URL
See merge request hubzilla/core!1482
2019-01-23 15:39:13 +01:00
Klaus Weidenbach
ae538a2259
Correct parameter in include/text.php prepare_text()
...
Also extend documentation.
2019-01-22 23:25:30 +01:00
Max Kostikov
66f443fd00
Skip tags detection in URL
2019-01-22 16:23:44 +01:00
Mario Vavti
4c0378eeae
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
2019-01-21 12:04:57 +01:00
M. Dent
39128c34cc
Merge branch 'dev' into 'dev'
...
Some fixes in include/help.php.
See merge request hubzilla/core!1479
2019-01-19 05:21:53 +01:00
Klaus Weidenbach
90a62405ca
Fix wrong variable name in include/plugin.php.
2019-01-19 00:28:01 +01:00
Klaus Weidenbach
bba20c27fe
Some fixes in include/help.php.
...
Remove unused variables and a wrong function name.
2019-01-18 22:37:05 +01:00
zotlabs
96deae43fa
this should fix the rest of the event stuff
2019-01-17 11:47:55 -08:00
zotlabs
7e29bd10b6
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
2019-01-16 16:52:21 -08:00
zotlabs
eaa375936f
more z6 compatibility fixes
2019-01-16 15:28:30 -08:00
Mario Vavti
4450a01014
do not return if delivery report could not bedecrypted
2019-01-16 15:09:18 +01:00
Mario
90f6abfa7c
Merge branch 'patch-20190113a' into 'dev'
...
Add collect_public_recipients hook
See merge request hubzilla/core!1467
2019-01-14 10:29:19 +01:00
DM42.Net (Matt Dent)
b4c1ca88f3
move order by and rewrite similar in update_queue_item()
2019-01-13 14:41:44 -05:00
DM42.Net (Matt Dent)
ab074f52fe
outq_created not outq_scheduled
2019-01-13 14:10:35 -05:00
DM42.Net (Matt Dent)
121fa834d5
FIX: aggregated query error in MYSQL
2019-01-13 14:06:36 -05:00
DM42.Net (Matt Dent)
598cbf2210
Add collect_public_recipients hook
2019-01-12 22:37:44 -05:00
M. Dent
8aa117e4ae
FIX: memory exhaustion on zot message pickup with large message queue
2019-01-12 09:22:37 +01:00
zotlabs
57dde3e980
failure to import mail
...
(cherry picked from commit 7b30fc4b82
2019-01-11 12:20:50 +01:00
Mario Vavti
dc8da4717f
Merge remote-tracking branch 'mike/master' into dev
2019-01-11 10:14:06 +01:00
zotlabs
7b30fc4b82
failure to import mail
2019-01-10 15:02:58 -08:00
Mario Vavti
90b6afe06b
we must sslify all possible content variables
2019-01-10 00:29:05 +01:00
Mario
312e0dcbc8
Update bbcode
2019-01-07 17:09:00 +01:00
Mario Vavti
b93bc142d3
missing closing parenthesis
2019-01-03 19:18:49 +01:00
Mario Vavti
ab9b8b8b0a
fix content type check
2019-01-03 19:13:56 +01:00
Max Kostikov
3bf1866f4a
Revert "Merge branch 'check_content_type' into 'dev'"
...
This reverts merge request !1453
2019-01-03 17:13:40 +01:00
Max Kostikov
3f61d24d0a
Merge branch 'check_content_type' into 'dev'
...
check suppported type if we get content type from header
See merge request hubzilla/core!1453
2019-01-03 16:31:48 +01:00
Mario Vavti
da2688403e
Merge remote-tracking branch 'mike/master' into dev
2019-01-02 23:07:37 +01:00
zotlabs
f660530ef5
allow notification updates when composing comments. This was disabled when it was possible to have liveUpdate run automatically while composing comments, but it seems that live update is no longer possible (however the setting still remains - this should probably be removed).
2019-01-02 12:49:04 -08:00
Mario Vavti
f3f106c21f
check suppported type if we get content type from header
2019-01-02 17:49:21 +01:00
harukin
ffadb70d81
Merge branch 'origin' into 'develop'
...
merge upstream/master for 3.8.8
See merge request harukin/core!30
2018-12-24 00:54:15 +09:00
Mario
880b22604b
manualy Fix cURL with HTTP/2 due to merge conflicts
2018-12-22 20:17:20 +01:00
Mario
04a2dc075f
manualy remove scale_external_images() due to merge conflicts
2018-12-22 20:08:44 +01:00
Max Kostikov
01448c152c
Remove scale_external_images()
...
(cherry picked from commit 1541f67eab
2018-12-22 20:04:09 +01:00
Max Kostikov
a09beb3833
Remove scale_external_images()
...
(cherry picked from commit a2959c6e9e
2018-12-22 20:03:49 +01:00
phani00
4d47b098e5
remove some fancy formatting.
...
(cherry picked from commit aaab905e72
2018-12-22 19:54:11 +01:00
phani00
66b56416b6
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.
(cherry picked from commit aace8a14ce
2018-12-22 19:52:39 +01:00
Max Kostikov
60f890ce0d
Fix for cURL with default HTTP/2
2018-12-20 21:13:05 +01:00
Max Kostikov
e4958d5bb9
Revert "Fix cURL with HTTP/2"
...
This reverts commit 090fe394e4
2018-12-20 20:58:48 +01:00
Max Kostikov
090fe394e4
Fix cURL with HTTP/2
2018-12-20 20:38:35 +01:00
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
