Mario Vavti
ac12f923ea
Revert "Revert "if there is no site record, site_dead won't be 0, in a left join it will in fact be null. As long as it isn't 1, we should attempt delivery.""
...
This reverts commit b6be0e1b99
.
2017-04-23 16:05:14 +02:00
Mario Vavti
b6be0e1b99
Revert "if there is no site record, site_dead won't be 0, in a left join it will in fact be null. As long as it isn't 1, we should attempt delivery."
...
This reverts commit 42f5291f69
.
2017-04-23 12:58:36 +02:00
git-marijus
01809b08c9
Merge pull request #730 from zotlabs/nullsite
...
if there is no site record, site_dead won't be 0, in a left join it w…
2017-04-23 12:21:19 +02:00
zotlabs
42f5291f69
if there is no site record, site_dead won't be 0, in a left join it will in fact be null. As long as it isn't 1, we should attempt delivery.
2017-04-22 23:15:00 -07:00
git-marijus
1d271ee771
Merge pull request #728 from zotlabs/typo1
...
Typo1
2017-04-21 09:24:58 +02:00
zotlabs
1d19ea4a33
typo - this time the correct repo
2017-04-20 21:31:44 -07:00
zotlabs
0d9b6ebc36
Revert "typo" - wrong repo
...
This reverts commit d9a48092e6
.
2017-04-20 21:30:29 -07:00
zotlabs
d9a48092e6
typo
2017-04-20 21:26:36 -07:00
git-marijus
35110b6327
Merge pull request #723 from zotlabs/followfeed
...
follow_from_feed issue when called from push
2017-04-20 10:08:10 +02:00
zotlabs
40f6280c48
follow_from_feed issue when called from push
2017-04-19 17:53:50 -07:00
Mario Vavti
09967598e1
order wiki pages by creation date
2017-04-19 10:51:50 +02:00
zotlabs
d3feb93619
typo
2017-04-19 10:25:57 +02:00
Mario Vavti
0bba5cdc30
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
2017-04-19 10:23:52 +02:00
zotlabs
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
zotlabs
f174c4fccb
don't allow any null fields in notify creation
2017-04-19 09:58:31 +02:00
zotlabs
32eead1542
webfinger cleanup
2017-04-19 09:58:13 +02:00
git-marijus
1701e100cf
Merge pull request #722 from zotlabs/env_prv
...
envelope privacy
2017-04-19 09:51:08 +02:00
zotlabs
368f88740a
envelope privacy
2017-04-18 17:26:50 -07:00
Mario Vavti
ab369ab91d
more lock carets
2017-04-18 14:29:56 +02:00
Mario Vavti
ddddf29f82
update to bs-git
2017-04-18 14:20:35 +02:00
Mario Vavti
fdc36fb140
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
2017-04-18 14:15:52 +02:00
Mario Vavti
9ce5e25507
the caret beside the lock seems a little overkill
2017-04-18 14:15:38 +02:00
git-marijus
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
zotlabs
bff2ed3837
allow downloading via viewsrc to support client side e2ee
2017-04-17 20:45:53 -07:00
Mario Vavti
7cca2b7fb0
missing clearfix
2017-04-16 12:09:09 +02:00
Mario Vavti
10e5cf01cc
css fixes
2017-04-16 10:59:26 +02:00
git-marijus
384c19e54e
Merge pull request #717 from dawnbreak/simplepie
...
⬆️ Update SimplePie library.
2017-04-15 17:40:45 +02:00
Klaus Weidenbach
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
Klaus Weidenbach
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
git-marijus
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
Klaus Weidenbach
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
Mario Vavti
0f0fba0e9e
missing includes
2017-04-13 23:20:09 +02:00
Mario Vavti
54f25609c9
bs font set might work better for win and mac
2017-04-13 12:28:38 +02:00
Mario Vavti
c48e90a556
bump version
2017-04-13 12:15:20 +02:00
Mario Vavti
e0409386c2
update bs-dev
2017-04-13 12:13:11 +02:00
git-marijus
2aa69257a4
Merge pull request #715 from zotlabs/cpp
...
backend infrastructure for 'channel protection password'; which will …
2017-04-13 12:08:17 +02:00
zotlabs
9d425b4727
typo
2017-04-12 18:48:30 -07:00
zotlabs
da07108be9
make sure the new fields don't leak through sync packets and break older versions
2017-04-12 17:43:27 -07:00
zotlabs
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
zotlabs
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
zotlabs
cb5a047e5d
ugly hack to webfinger to allow connections to be made to mastodon servers.
2017-04-12 07:04:10 +02:00
zotlabs
ed5abe5981
some signatures showing as invalid because of recent import_author_zot() changes.
2017-04-12 07:03:20 +02:00
git-marijus
1f951e2bd3
Merge pull request #714 from mjfriaza/dev
...
Updated the Spanish translation
2017-04-11 06:55:12 +02:00
Manuel Jiménez Friaza
10f9f9cc80
Updated the Spanish translation
2017-04-10 12:50:42 +02:00
git-marijus
57f20c0c22
Merge pull request #713 from zotlabs/photo-zero
...
Photo zero
2017-04-08 10:15:40 +02:00
zotlabs
a32b097e3c
photo size-0 issue
2017-04-07 14:57:29 -07:00
zotlabs
2ebf76cd50
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2017-04-07 14:56:53 -07:00
git-marijus
06b0c89aee
Merge pull request #712 from zotlabs/fr_update
...
Fr update (Monret)
2017-04-07 21:00:37 +02:00
Mario Vavti
113bfe8fa2
remove redundant string
2017-04-07 18:41:13 +02:00
Mario Vavti
df4e193990
the string was there but the template var was wrong
2017-04-07 13:35:17 +02:00