0bba5cdc30
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
2017-04-19 10:23:52 +02:00
a3b1eec548
backend infrastructure for 'channel protection password'; which will be used to optionally encrypt export files and resolve channel/identity ownership/hijacking disputes
2017-04-19 09:59:50 +02:00
f174c4fccb
don't allow any null fields in notify creation
2017-04-19 09:58:31 +02:00
32eead1542
webfinger cleanup
2017-04-19 09:58:13 +02:00
1701e100cf
Merge pull request #722 from zotlabs/env_prv
...
envelope privacy
2017-04-19 09:51:08 +02:00
397fef519c
give the item_obscured flag a new lease on life by using it to designate third party client-side e2ee or binary content which can only be downloaded and not viewed directly on the web (as a side effect this also allows binary files to be submitted as activities/content). The content display is suppressed and replaced with a download button. This is unfinished but harmless to backport while work is in progress unless told otherwise. Future development will take care of the remaining loose ends.
2017-04-18 21:18:49 -07:00
53bd0146bb
oembed cache: don't store the url (which may need to be truncated), store a hash instead. This will allow us to convert the table to utf8mb4 without running into mysql key length restrictions as well as dealing with the potential ambiguity of truncated urls.
2017-04-18 18:31:10 -07:00
a037758245
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
2017-04-18 18:18:53 -07:00
ffce1fc177
envelope privacy
2017-04-18 17:29:11 -07:00
368f88740a
envelope privacy
2017-04-18 17:26:50 -07:00
ab369ab91d
more lock carets
2017-04-18 14:29:56 +02:00
ddddf29f82
update to bs-git
2017-04-18 14:20:35 +02:00
fdc36fb140
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
2017-04-18 14:15:52 +02:00
9ce5e25507
the caret beside the lock seems a little overkill
2017-04-18 14:15:38 +02:00
0bc4de2f34
Merge pull request #721 from zotlabs/client_e2ee
...
allow downloading via viewsrc to support client side e2ee
2017-04-18 13:57:01 +02:00
e3dc242a3c
allow downloading via viewsrc to support client side e2ee
2017-04-17 20:48:57 -07:00
bff2ed3837
allow downloading via viewsrc to support client side e2ee
2017-04-17 20:45:53 -07:00
9c31e26cf1
include attach.php here (boot.php) instead of each file that uses it. Eventually this needs to move to an autoloader.
2017-04-17 17:54:50 -07:00
7a31c039fb
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
2017-04-17 16:04:17 -07:00
7cca2b7fb0
missing clearfix
2017-04-16 12:09:09 +02:00
10e5cf01cc
css fixes
2017-04-16 10:59:26 +02:00
384c19e54e
Merge pull request #717 from dawnbreak/simplepie
...
⬆️ Update SimplePie library.
2017-04-15 17:40:45 +02:00
7d5e7bf6c8
We do not parse the body in discover_by_url(), so no need to preserve iframes in SimplePie.
2017-04-15 15:20:14 +02:00
b6459e6172
⬆️ Update SimplePie library.
...
As a follow up to issue #699 update SimplePie from 1.2.1-dev (around
6years old) to current git master (1.4.4-dev). We use the master branch
until the next release because it contains our patch for enclosure
titles already. The other patches in the library from us can be done by
configuring the SimplePie object in our code instead.
Used composer to manage this library and use class autoloading.
Add some unit tests for include/feedutils.php, but the interesting parts
are unfortunately not testable with the current code.
2017-04-15 00:41:42 +02:00
b4f65840d1
Merge pull request #716 from dawnbreak/docu
...
Some documentation for include/network.php and some fixes.
2017-04-14 11:54:20 +02:00
b266ade4fe
Some documentation for include/network.php and some fixes.
...
Some variables had wrong names and have never been used.
2017-04-14 00:21:54 +02:00
0f0fba0e9e
missing includes
2017-04-13 23:20:09 +02:00
54f25609c9
bs font set might work better for win and mac
2017-04-13 12:28:38 +02:00
c48e90a556
bump version
2017-04-13 12:15:20 +02:00
e0409386c2
update bs-dev
2017-04-13 12:13:11 +02:00
2aa69257a4
Merge pull request #715 from zotlabs/cpp
...
backend infrastructure for 'channel protection password'; which will …
2017-04-13 12:08:17 +02:00
60d4b4c4f6
remove fulltext indexes for innodb
2017-04-12 20:21:56 -07:00
4a6a06fdc0
change default database settings
2017-04-12 20:20:46 -07:00
c631da7b0d
whitespace
2017-04-12 19:25:46 -07:00
9d425b4727
typo
2017-04-12 18:48:30 -07:00
07d62bc111
typo
2017-04-12 18:48:06 -07:00
91d0f87181
make sure the new fields don't leak through sync packets and break older versions
2017-04-12 18:46:41 -07:00
1c32564536
backend infrastructure for 'channel protection password'; which will be used to optionally encrypt export files and resolve channel/identity ownership/hijacking disputes
2017-04-12 18:46:15 -07:00
da07108be9
make sure the new fields don't leak through sync packets and break older versions
2017-04-12 17:43:27 -07:00
d7f4526a00
backend infrastructure for 'channel protection password'; which will be used to optionally encrypt export files and resolve channel/identity ownership/hijacking disputes
2017-04-12 17:32:28 -07:00
63dd6ad01a
don't allow any null fields in notify creation
2017-04-11 23:05:56 -07:00
7b173a75e4
correct the mastodon "boost" (aka 'share') author attribution by checking for share activities and pulling the original author info from the activity:object
2017-04-12 07:04:22 +02:00
cb5a047e5d
ugly hack to webfinger to allow connections to be made to mastodon servers.
2017-04-12 07:04:10 +02:00
ed5abe5981
some signatures showing as invalid because of recent import_author_zot() changes.
2017-04-12 07:03:20 +02:00
940534e303
webfinger cleanup
2017-04-11 22:02:29 -07:00
1609473e5d
correct the mastodon "boost" (aka 'share') author attribution by checking for share activities and pulling the original author info from the activity:object
2017-04-11 20:17:22 -07:00
1f951e2bd3
Merge pull request #714 from mjfriaza/dev
...
Updated the Spanish translation
2017-04-11 06:55:12 +02:00
ed8e4962b9
ugly hack to webfinger to allow connections to be made to mastodon servers.
2017-04-10 20:31:45 -07:00
10f9f9cc80
Updated the Spanish translation
2017-04-10 12:50:42 +02:00
56c8e00b84
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
2017-04-09 20:27:54 -07:00
Mario Vavti
zotlabs
Klaus Weidenbach
Manuel Jiménez Friaza