marijus
2df4c44de5
make vcard and contact block widget look-alike
2014-08-27 00:59:07 +02:00
marijus
6c11fd349e
Merge branch 'master' of https://github.com/friendica/red
2014-08-26 22:35:47 +02:00
marijus
c703d83350
add background color to widgets
2014-08-26 22:35:00 +02:00
Thomas Willingham
450434a690
Revert - see comments.
2014-08-26 20:13:27 +01:00
Thomas Willingham
cc2bef67dd
HTML doesn't work without ACCOUNT_ROLE_ALLOWCODE, so don't offer it
...
as an option.
2014-08-26 19:09:00 +01:00
marijus
592be71626
Merge branch 'master' of https://github.com/friendica/red
2014-08-26 09:14:03 +02:00
friendica
c99d89e441
get rid of template "auto generated" warnings
2014-08-25 22:58:30 -07:00
friendica
6e99848043
more diaspora stuff - most of the basic bits are there except queueing and physical delivery (I'm keeping delivery turned off until some of the bugs are fixed so we don't cause inifinite loops or network meltdowns) - now it's just a matter of going through and methodically finding all the bugs
2014-08-25 22:43:44 -07:00
friendica
eb8f194419
sort out some anomalies
2014-08-25 21:42:46 -07:00
friendica
84ff380302
more diaspora heavy lifting
2014-08-25 20:57:10 -07:00
friendica
df634f9853
notifications/system not marking all notifications seen
2014-08-25 20:55:37 -07:00
marijus
9e8a2a06b5
Merge branch 'master' of https://github.com/friendica/red
2014-08-25 23:09:19 +02:00
friendica
86fb165dc9
re-obscure item body if localize_item() changes it. It's already flagged as obscured so we need it to actually be obscured.
2014-08-25 02:14:48 -07:00
marijus
a512f54d93
Merge branch 'master' of https://github.com/friendica/red
2014-08-25 09:34:05 +02:00
friendica
e0ee66d0b4
Add d* folks to address book. WARNING - DO NOT ATTEMPT THIS. LEAVE IT THE FRUCK ALONE until the feature is stable. I won't help you if you try this and end up with a borked site. You are completely on your own.
2014-08-24 17:52:26 -07:00
marijus
5a080881c5
Merge branch 'master' of https://github.com/friendica/red
2014-08-24 14:30:12 +02:00
friendica
d57c57ad59
onepoll: don't poll archived, blocked, or ignored connections
2014-08-24 05:26:00 -07:00
marijus
c2d8133253
Merge branch 'master' of https://github.com/friendica/red
2014-08-24 14:22:27 +02:00
friendica
5cba209604
diaspora discovery
2014-08-24 04:27:10 -07:00
marijus
f991ca8df1
Merge branch 'master' of https://github.com/friendica/red
2014-08-24 09:35:21 +02:00
friendica
9b524c9bc4
unobscure viewsrc items
2014-08-23 21:12:33 -07:00
friendica
a93608391a
Merge https://github.com/friendica/red into pending_merge
2014-08-23 15:23:05 -07:00
friendica
56e8b2b971
add "any connections" to can_comment_on_post() - was missing
2014-08-23 15:22:26 -07:00
Jeroen
b11e9fe03c
fix nl
2014-08-23 20:13:23 +00:00
Jeroen
ceabf2d488
Minor adjustment photo view + update nl (at 100\%\!)
2014-08-23 17:01:19 +00:00
friendica
5d2dc4e8fd
switch everything over to crypto_encapsulate()
2014-08-23 02:45:21 -07:00
marijus
8d382a9394
Merge branch 'master' of https://github.com/friendica/red
2014-08-23 07:59:12 +02:00
friendica
9196c9eef0
We really can't do this without a hubloc. I was hoping we could, but notifier is setup to take hublocs, not xchans.
2014-08-22 21:37:08 -07:00
friendica
255ab8e9c9
issue #573 - this may not fix everything in that issue but should resolve some of it.
2014-08-22 18:01:21 -07:00
friendica
38f931618c
"false" issue
2014-08-22 17:34:18 -07:00
friendica
aa4bf824a4
Merge https://github.com/friendica/red into pending_merge
2014-08-22 15:52:34 -07:00
friendica
2dc705d9a0
issue #571 - use feed/nickname?top=1
2014-08-22 15:51:48 -07:00
friendica
9dbfed64be
rev update
2014-08-22 15:51:36 -07:00
friendica
9f22f28d2f
doc update
2014-08-22 15:51:03 -07:00
Jeroen
a328fc4865
fix nl
2014-08-22 21:42:33 +00:00
marijus
b0d52943e8
Merge branch 'upstream'
2014-08-22 09:17:17 +02:00
marijus
c5f4e5bac7
Merge branch 'master' of https://github.com/friendica/red into upstream
2014-08-22 09:14:19 +02:00
friendica
1abd2a2917
another round of heavy lifting
2014-08-21 22:28:09 -07:00
friendica
69d3e5468d
provide the site blacklist everywhere it is needed
2014-08-21 21:07:32 -07:00
friendica
72a766432d
missing template file
2014-08-21 20:45:15 -07:00
friendica
05515e3b10
D* receive endpoint is receive/users/$guid - where $guid is really the channel_guid, not the channel_hash. We'll allow this to be truncated for older D* sites or those that can't process our 64 character guids.
2014-08-21 20:42:55 -07:00
friendica
e524835463
the rest of the diaspora local discovery stuff
2014-08-21 20:31:55 -07:00
friendica
921799b045
make the old personal xrd interface (old webfinger) work again
2014-08-21 17:42:19 -07:00
friendica
831714f0f0
profile edit - missing visibility and drop link on non-default profiles, re-arrange order of replacing red#matrix smilie so it works correctly, accept a post with body content of '0' which was interpreted by x() as nothing (was treated as integer).
2014-08-21 16:46:24 -07:00
marijus
1a3be50451
Merge branch 'master' of https://github.com/friendica/red
2014-08-21 13:20:49 +02:00
friendica
a59a6fbd90
abook-edit-me class lost during some edit - we need this to reset the permission fields
2014-08-21 01:41:15 -07:00
friendica
b4aed12129
extensible profiles - add the input form elements. Still needs styling and we're not yet storing the results. And right now we're ignoring the type and only doing type=string. Oh yeah - and I split off starting the second delivery chain into its own function in tag_deliver since it was largely duplicate code.
2014-08-20 23:01:25 -07:00
friendica
af45b34ee0
verified that chatroom expire is working, so doing away with the second function to do the same thing.
...
If you have a problem with chatroom expiration, check that it was created with cr_expire set to 120 (minutes). Chatrooms created during the first couple of days of the chat feature didn't have this. You can set the DB value manually.
2014-08-20 20:49:03 -07:00
friendica
b8a5b7a610
restrict returned directory contents to xchans in the zot network. We could probably add other networks to this and create a distributed directory for the free web. It's highly unlikely we would do this but we *could*.
2014-08-20 19:36:01 -07:00
friendica
a169e5c4f3
restructure the author and owner info from feeds
2014-08-20 18:35:36 -07:00
