aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | 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
* | | | | | | | 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, re-a...friendica2014-08-214-11/+10
| |_|_|_|/ / / |/| | | | | |
* | | | | | | abook-edit-me class lost during some edit - we need this to reset the permiss...friendica2014-08-212-2/+2
* | | | | | | extensible profiles - add the input form elements. Still needs styling and we...friendica2014-08-203-135/+123
* | | | | | | verified that chatroom expire is working, so doing away with the second funct...friendica2014-08-202-24/+4
* | | | | | | restrict returned directory contents to xchans in the zot network. We could p...friendica2014-08-201-2/+2
* | | | | | | restructure the author and owner info from feedsfriendica2014-08-201-85/+58
* | | | | | | move Friendica photo migrator to addons, bring back a few XML scraping functi...friendica2014-08-204-176/+165
* | | | | | | Merge https://github.com/friendica/red into pending_mergefriendica2014-08-201-0/+1
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge pull request #570 from zzottel/masterzzottel2014-08-201-0/+1
| |\ \ \ \ \ \
| | * | | | | | updated German main.bb doco filezottel2014-08-201-0/+1
| | | |_|/ / / | | |/| | | |
* | / | | | | provide admin option for allowing rss/atom feed connections. Need to do this ...friendica2014-08-202-45/+6
|/ / / / / /
* / / / / / greatly simplify consume_feed() - a lot of this was friendica specific and so...friendica2014-08-202-196/+50
|/ / / / /
* | | | | fangs baredfriendica2014-08-191-1/+23
* | | | | snakebite continuedfriendica2014-08-191-53/+108
* | | | | some work on network discoveryfriendica2014-08-192-168/+167
* | | | | also reset comment policy on alternate delivery chainsfriendica2014-08-191-2/+4
* | | | | make sure privacy scope is completely reset on second delivery chain - revert...friendica2014-08-191-8/+62
* | | | | follow => connectfriendica2014-08-191-1/+1