zotlabs
|
e8ea8d203d
|
more client-side mail privacy work
|
2017-04-26 23:05:30 -07:00 |
|
zotlabs
|
ac670856f6
|
provide a broken feed as a separate module
|
2017-04-26 20:14:45 -07:00 |
|
zotlabs
|
88149f56bb
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
|
2017-04-26 20:11:12 -07:00 |
|
zotlabs
|
6fcfab3488
|
issues from hubzilla:#737
|
2017-04-26 19:47:05 -07:00 |
|
zotlabs
|
dab3e90353
|
provide a broken feed as a separate module
|
2017-04-26 13:26:50 -07:00 |
|
Mario Vavti
|
1c304eb8ba
|
make mastodon happy args
|
2017-04-26 22:16:23 +02:00 |
|
Mario Vavti
|
d1c84ad9f0
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
|
2017-04-26 14:20:16 +02:00 |
|
git-marijus
|
c39a680096
|
Merge pull request #733 from zotlabs/etwoeemail
Etwoeemail
|
2017-04-26 14:19:54 +02:00 |
|
git-marijus
|
e8ddee284c
|
Merge pull request #731 from anaqreon/dev
When template "none" is used in a webpage layout, then the contents o…
|
2017-04-26 14:18:42 +02:00 |
|
git-marijus
|
abd7cfdc97
|
Merge pull request #734 from zotlabs/emojionelicense
Emojionelicense
|
2017-04-26 14:17:32 +02:00 |
|
zotlabs
|
c904bd3a62
|
The rest of the library and backend changes to support client-side e2ee and deprecate previous uses of item_obscured.
|
2017-04-26 14:16:07 +02:00 |
|
zotlabs
|
d48bda88e6
|
In the rare case where a default channel is not selected but channels actually exist, you should be able to visit /manage and set a default channel. Originally I believe this may have been possible but the ability was lost when delegation was added to the interface - which requires an active channel. Remove the active channel restriction so that the rest of the interface works (channel selections can be made and the ability to set a default is provided) however delegation info isn't presented unless there is an active channel.
|
2017-04-26 14:13:45 +02:00 |
|
zotlabs
|
4ca24f114b
|
support reverse magic-auth in oembed requests.
|
2017-04-26 14:12:52 +02:00 |
|
zotlabs
|
7667c630a4
|
provide a broken feed for services which require a broken feed
|
2017-04-26 14:12:11 +02:00 |
|
zotlabs
|
97458b2885
|
make it easier to hook into feed headers in the future
|
2017-04-26 14:11:55 +02:00 |
|
zotlabs
|
803bff4043
|
smilies - add param to only list default emoticons
|
2017-04-26 14:09:45 +02:00 |
|
zotlabs
|
17aa8da9f0
|
Attribution is required
|
2017-04-26 01:08:03 -07:00 |
|
zotlabs
|
7d5ee81628
|
database support for client side e2ee for private mail
|
2017-04-25 21:52:24 -07:00 |
|
zotlabs
|
b88be137ca
|
provide a broken feed for services which require a broken feed
|
2017-04-25 20:48:38 -07:00 |
|
zotlabs
|
195eb71200
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
|
2017-04-25 19:43:01 -07:00 |
|
zotlabs
|
f36e384ed7
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2017-04-25 19:42:42 -07:00 |
|
zotlabs
|
3a3bd582b1
|
mostly text formatting changes
|
2017-04-25 19:42:06 -07:00 |
|
zotlabs
|
a342a5f8e0
|
smilies - add param to only list default emoticons
|
2017-04-25 16:36:37 -07:00 |
|
Mario Vavti
|
42d139ee82
|
Revert "fix the query of last pullrequest"
This reverts commit bda9a833ba.
|
2017-04-24 09:05:33 +02:00 |
|
zotlabs
|
f1c6fd08c4
|
database upgrade
|
2017-04-23 20:28:04 -07:00 |
|
Andrew Manning
|
8ad2b3e7a1
|
When template "none" is used in a webpage layout, then the contents of the page should be the sole output, with no other code before or after the page element content.
|
2017-04-23 21:22:40 -04:00 |
|
zotlabs
|
a84695bb86
|
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-23 17:13:38 -07:00 |
|
zotlabs
|
c2ec3b0bf4
|
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-23 16:38:44 -07:00 |
|
Mario Vavti
|
bda9a833ba
|
fix the query of last pullrequest
|
2017-04-23 17:22:28 +02:00 |
|
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 |
|
zotlabs
|
02ea713d6a
|
make it easier to hook into feed headers in the future
|
2017-04-20 21:25:37 -07:00 |
|
zotlabs
|
94f15e3551
|
The rest of the library and backend changes to support client-side e2ee and deprecate previous uses of item_obscured.
|
2017-04-20 20:19:15 -07:00 |
|
zotlabs
|
2d90b831f0
|
In the rare case where a default channel is not selected but channels actually exist, you should be able to visit /manage and set a default channel. Originally I believe this may have been possible but the ability was lost when delegation was added to the interface - which requires an active channel. Remove the active channel restriction so that the rest of the interface works (channel selections can be made and the ability to set a default is provided) however delegation info isn't presented unless there is an active channel.
|
2017-04-20 19:52:50 -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
|
f52c670c05
|
support reverse magic-auth in oembed requests.
|
2017-04-19 20:48:10 -07:00 |
|
zotlabs
|
f3adc8d738
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
|
2017-04-19 17:55:07 -07:00 |
|
zotlabs
|
40f6280c48
|
follow_from_feed issue when called from push
|
2017-04-19 17:53:50 -07:00 |
|
zotlabs
|
1c6d2857cb
|
follow_from_feed issue when called from push
|
2017-04-19 17:52:15 -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 |
|