aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* more hard workfriendica2014-08-264-123/+159
* works one way sort of - now to go the other way - which will require fixing ...friendica2014-08-264-29/+51
* houston we have liftofffriendica2014-08-262-12/+14
* Merge https://github.com/friendica/red into pending_mergefriendica2014-08-266-77/+48
|\
| * 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
| * | add background color to widgetsmarijus2014-08-264-31/+9
| * | Merge branch 'master' of https://github.com/friendica/redmarijus2014-08-2623-82/+489
| |\|
| * | Merge branch 'master' of https://github.com/friendica/redmarijus2014-08-252-1/+14
| |\ \
| * \ \ Merge branch 'master' of https://github.com/friendica/redmarijus2014-08-252-295/+378
| |\ \ \
| * \ \ \ Merge branch 'master' of https://github.com/friendica/redmarijus2014-08-241-0/+2
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of https://github.com/friendica/redmarijus2014-08-242-1/+114
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of https://github.com/friendica/redmarijus2014-08-2416-748/+765
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of https://github.com/friendica/redmarijus2014-08-23121-1922/+2405
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'upstream'marijus2014-08-2215-138/+275
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/friendica/red into upstreammarijus2014-08-2228-780/+663
| | |\ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/friendica/redmarijus2014-08-2114-469/+360
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/friendica/redmarijus2014-08-203-196/+51
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' of https://github.com/friendica/redmarijus2014-08-207-239/+373
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/friendica/redmarijus2014-08-192-5927/+6256
| |\ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | take off the kid glovesfriendica2014-08-264-52/+41
| |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
* | | | | | | | | | | | | get rid of template "auto generated" warningsfriendica2014-08-2515-75/+0
* | | | | | | | | | | | | more diaspora stuff - most of the basic bits are there except queueing and ph...friendica2014-08-2518-12/+300
* | | | | | | | | | | | | 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
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
* | | | | | | | | | | | re-obscure item body if localize_item() changes it. It's already flagged as o...friendica2014-08-252-1/+14
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
* | | | | | | | | | | Add d* folks to address book. WARNING - DO NOT ATTEMPT THIS. LEAVE IT THE FRU...friendica2014-08-242-295/+378
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
* | | | | | | | | | onepoll: don't poll archived, blocked, or ignored connectionsfriendica2014-08-241-0/+2
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | diaspora discoveryfriendica2014-08-242-1/+114
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | 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
|/ / / / / / /
* | | | | | | We really can't do this without a hubloc. I was hoping we could, but notifier...friendica2014-08-226-7/+23
* | | | | | | issue #573 - this may not fix everything in that issue but should resolve som...friendica2014-08-221-0/+3
* | | | | | | "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
|/ / / / / /
* | | | | | 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 channe...friendica2014-08-211-4/+5
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-29 14:53:54 +0000