aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'tobiasd-master'Friendika2011-02-021-1/+1
|\
| * double $ in de/strings.php correctedTobias Diekershoff2011-02-031-1/+1
* | Merge branch 'tobiasd-master'Friendika2011-02-021-7/+55
|\|
| * updates to the German strings.php fileTobias Diekershoff2011-02-031-7/+55
* | Merge branch 'fabrixxm-master'Friendika2011-02-024-12/+55
|\ \
| * | IT string updatefabrixxm2011-02-031-0/+19
| * | Merge branch 'friendika-master'fabrixxm2011-02-039-30/+114
| |\|
| * | Merge branch 'friendika-master'fabrixxm2011-02-027-37/+84
| |\ \
| * | | update jot-headersfabrixxm2011-02-013-12/+36
| * | | Merge branch 'friendika-master'fabrixxm2011-02-012-18/+36
| |\ \ \
| * \ \ \ Merge branch 'master' of github.com:fabrixxm/friendikafabrixxm2011-02-015-69/+71
| |\ \ \ \
| | * \ \ \ Merge remote branch 'friendika-master/master'Fabio Comuni2011-02-0125-126/+341
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' of github.com:fabrixxm/friendikaFabio Comuni2011-02-010-0/+0
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge remote branch 'friendika-master/master'Fabio Comuni2011-01-3129-135/+321
| | |\ \ \ \ \ \
| * | \ \ \ \ \ \ Merge branch 'friendika-master'fabrixxm2011-02-0135-89/+374
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'master' of github.com:fabrixxm/friendikafabrixxm2011-01-290-0/+0
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Merge remote branch 'friendika-master/master'Fabio Comuni2011-01-2818-452/+666
| | |\ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ Merge branch 'friendika-master'fabrixxm2011-01-2916-105/+219
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'friendika-master'fabrixxm2011-01-2818-452/+666
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | / / / / / / / | | | |/ / / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'friendika-master'fabrixxm2011-01-2793-36/+7067
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'friendika-master'fabrixxm2011-01-2557-11/+2930
| |\ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | append jotplugin tools to current toolbar rowFriendika2011-02-026-18/+23
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
* | | | | | | | | | | silence php notices about $manual_id not being definedFriendika2011-02-021-5/+5
* | | | | | | | | | | don't try to parse non-xml in dfrn_deliverFriendika2011-02-021-0/+6
* | | | | | | | | | | be more forgiving about the order of link parameters in html->bbFriendika2011-02-021-2/+2
* | | | | | | | | | | get media-rss thumbnail if available and nothing else was found (e.g. github).Friendika2011-02-021-0/+6
* | | | | | | | | | | string update, allow js_upload file selection text to be localisedFriendika2011-02-022-0/+33
* | | | | | | | | | | suppress some scraping errors when confronted with hybrid/strangeFriendika2011-02-022-2/+21
* | | | | | | | | | | backward compatibilityFriendika2011-02-012-23/+20
* | | | | | | | | | | protocol reversal, roll dfrn_version to 2.1Friendika2011-02-013-22/+45
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
* | | | | | | | | | silence a few notice warningsFriendika2011-02-011-2/+2
* | | | | | | | | | trying to solve the double encoding issueFriendika2011-02-011-41/+22
* | | | | | | | | | make sure content is unalteredFriendika2011-02-011-15/+18
* | | | | | | | | | typoFriendika2011-02-011-1/+1
* | | | | | | | | | get correct article timestamp for feeds with no 'published' and with non-utc ...Friendika2011-02-011-3/+5
* | | | | | | | | | don't try to scrape atom/rss feeds. missing param in contact store (mod_follow)Friendika2011-02-013-1/+62
* | | | | | | | | | truncate long namesFriendika2011-02-012-2/+2
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | provide ability to survive transport mangling when travelling through html ne...Friendika2011-02-012-18/+36
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | it's a bbcode editor, not an html editorFriendika2011-01-312-2/+2
* | | | | | | | oembed contsant name, fix dfrnpubdeliver, add 'code' editor buttonFriendika2011-01-313-67/+69
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | let there be purple! ;-)Friendika2011-01-314-0/+27
* | | | | | | readjust name length limits - acl selectorFriendika2011-01-311-1/+1
* | | | | | | truncate names in acl selectorFriendika2011-01-311-2/+5
* | | | | | | email cc recipients (front end)Friendika2011-01-316-4/+26
* | | | | | | post to email recips (backend)Friendika2011-01-311-2/+29
* | | | | | | Merge branch 'fabrixxm-oembed'Friendika2011-01-319-48/+126
|\ \ \ \ \ \ \
| * | | | | | | cache oembed requestFabio Comuni2011-01-311-2/+14
| * | | | | | | delete old cache in poller.phpFabio Comuni2011-01-311-0/+4
| * | | | | | | add cache tableFabio Comuni2011-01-313-2/+14
| * | | | | | | use microformat to mark html from [embed] tag, convert html with oembed micro...Fabio Comuni2011-01-313-5/+44