aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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 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
| |/
* | 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 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
* | | 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 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
| |\ \
| * | | provide admin option for allowing rss/atom feed connections. Need to do this ...friendica2014-08-202-45/+6
* | | | Merge branch 'master' of https://github.com/friendica/redmarijus2014-08-203-196/+51
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| |
| * | Merge pull request #570 from zzottel/masterzzottel2014-08-201-0/+1
| |\ \ | | |/ | |/|
| | * updated German main.bb doco filezottel2014-08-201-0/+1
| * | greatly simplify consume_feed() - a lot of this was friendica specific and so...friendica2014-08-202-196/+50
| |/
* | Merge branch 'master' of https://github.com/friendica/redmarijus2014-08-207-239/+373
|\|
| * 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
| * really really fix lockview (cross fingers) ;-)friendica2014-08-191-5/+7
| * Merge pull request #569 from git-marijus/masterRedMatrix2014-08-201-1/+2
| |\
| * | fix nlJeroen2014-08-192-3/+3
* | | Merge branch 'master' of https://github.com/friendica/redmarijus2014-08-192-5927/+6256
|\| | | |/ |/|
| * Update nlJeroen2014-08-192-5927/+6256
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 11:32:22 +0000