aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* make vcard and contact block widget look-alikemarijus2014-08-272-46/+38
|
* Merge branch 'master' of https://github.com/friendica/redmarijus2014-08-261-0/+1
|\
| * Revert - see comments.Thomas Willingham2014-08-261-3/+3
| |
| * HTML doesn't work without ACCOUNT_ROLE_ALLOWCODE, so don't offer itThomas Willingham2014-08-261-2/+3
| | | | | | | | as an option.
* | add background color to widgetsmarijus2014-08-264-31/+9
| |
* | Merge branch 'master' of https://github.com/friendica/redmarijus2014-08-2623-82/+489
|\|
| * get rid of template "auto generated" warningsfriendica2014-08-2515-75/+0
| |
| * more diaspora stuff - most of the basic bits are there except queueing and ↵friendica2014-08-2518-12/+300
| | | | | | | | 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
| * sort out some anomaliesfriendica2014-08-254-8/+20
| |
| * more diaspora heavy liftingfriendica2014-08-253-66/+248
| |
| * notifications/system not marking all notifications seenfriendica2014-08-251-1/+1
| |
* | Merge branch 'master' of https://github.com/friendica/redmarijus2014-08-252-1/+14
|\|
| * re-obscure item body if localize_item() changes it. It's already flagged as ↵friendica2014-08-252-1/+14
| | | | | | | | obscured so we need it to actually be obscured.
* | Merge branch 'master' of https://github.com/friendica/redmarijus2014-08-252-295/+378
|\|
| * Add d* folks to address book. WARNING - DO NOT ATTEMPT THIS. LEAVE IT THE ↵friendica2014-08-242-295/+378
| | | | | | | | 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.
* | Merge branch 'master' of https://github.com/friendica/redmarijus2014-08-241-0/+2
|\|
| * onepoll: don't poll archived, blocked, or ignored connectionsfriendica2014-08-241-0/+2
| |
* | Merge branch 'master' of https://github.com/friendica/redmarijus2014-08-242-1/+114
|\|
| * diaspora discoveryfriendica2014-08-242-1/+114
| |
* | Merge branch 'master' of https://github.com/friendica/redmarijus2014-08-2416-748/+765
|\|
| * unobscure viewsrc itemsfriendica2014-08-231-2/+5
| |
| * Merge https://github.com/friendica/red into pending_mergefriendica2014-08-2311-738/+751
| |\
| | * fix nlJeroen2014-08-232-13/+13
| | |
| | * Minor adjustment photo view + update nl (at 100\%\!)Jeroen2014-08-2311-726/+739
| | |
| * | add "any connections" to can_comment_on_post() - was missingfriendica2014-08-231-0/+1
| | |
| * | switch everything over to crypto_encapsulate()friendica2014-08-234-8/+8
| |/
* | Merge branch 'master' of https://github.com/friendica/redmarijus2014-08-23121-1922/+2405
|\|
| * We really can't do this without a hubloc. I was hoping we could, but ↵friendica2014-08-226-7/+23
| | | | | | | | notifier is setup to take hublocs, not xchans.
| * issue #573 - this may not fix everything in that issue but should resolve ↵friendica2014-08-221-0/+3
| | | | | | | | some of it.
| * "false" issuefriendica2014-08-221-4/+9
| |
| * Merge https://github.com/friendica/red into pending_mergefriendica2014-08-222-5/+5
| |\
| | * fix nlJeroen2014-08-222-5/+5
| | |
| * | issue #571 - use feed/nickname?top=1friendica2014-08-222-1/+7
| | |
| * | rev updatefriendica2014-08-222-669/+661
| | |
| * | doc updatefriendica2014-08-22109-1236/+1697
| |/
* | Merge branch 'upstream'marijus2014-08-2215-138/+275
|\ \
| * | Merge branch 'master' of https://github.com/friendica/red into upstreammarijus2014-08-2228-780/+663
| |\|
| | * another round of heavy liftingfriendica2014-08-211-112/+99
| | |
| | * provide the site blacklist everywhere it is neededfriendica2014-08-213-1/+43
| | |
| | * missing template filefriendica2014-08-211-0/+57
| | |
| | * D* receive endpoint is receive/users/$guid - where $guid is really the ↵friendica2014-08-211-4/+5
| | | | | | | | | | | | 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.
| | * the rest of the diaspora local discovery stufffriendica2014-08-212-3/+24
| | |
| | * make the old personal xrd interface (old webfinger) work againfriendica2014-08-214-7/+37
| | |
| | * profile edit - missing visibility and drop link on non-default profiles, ↵friendica2014-08-214-11/+10
| | | | | | | | | | | | 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).
* | | Merge branch 'master' of https://github.com/friendica/redmarijus2014-08-2114-469/+360
|\ \ \ | | |/ | |/|
| * | abook-edit-me class lost during some edit - we need this to reset the ↵friendica2014-08-212-2/+2
| | | | | | | | | | | | permission fields
| * | extensible profiles - add the input form elements. Still needs styling and ↵friendica2014-08-203-135/+123
| | | | | | | | | | | | 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.
| * | verified that chatroom expire is working, so doing away with the second ↵friendica2014-08-202-24/+4
| | | | | | | | | | | | | | | | | | 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.
| * | restrict returned directory contents to xchans in the zot network. We could ↵friendica2014-08-201-2/+2
| | | | | | | | | | | | 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*.
| * | restructure the author and owner info from feedsfriendica2014-08-201-85/+58
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-23 19:14:30 +0000