aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* IT string updatefabrixxm2011-02-031-0/+19
* Merge branch 'friendika-master'fabrixxm2011-02-039-30/+114
|\
| * 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
* | Merge branch 'friendika-master'fabrixxm2011-02-027-37/+84
|\|
| * 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
* | update jot-headersfabrixxm2011-02-013-12/+36
* | Merge branch 'friendika-master'fabrixxm2011-02-012-18/+36
|\|
| * provide ability to survive transport mangling when travelling through html ne...Friendika2011-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
| |\|
| | * 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
| * | 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
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| |
| * | | 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
| | * | | Add 'system''no_oembed' config optionFabio Comuni2011-01-312-4/+8
| | * | | Move [embed] bbtag from oembed plugin to coreFabio Comuni2011-01-313-45/+52
| | | |/ | | |/|
| * | | force text paste in editorFriendika2011-01-311-3/+11
| * | | deliver up to 150 contacts per person using dfrn - in case hub is whackedFriendika2011-01-311-1/+49
| |/ /
| * | limit privacy ACL's to networks which can handle privacyFriendika2011-01-302-8/+10
| * | disable "take me home" hotkey, different on FF (shift-home), IE ($).Friendika2011-01-301-6/+7
| * | more ssl_policy cleanup, allow manual feed update per contact when hub is wha...Friendika2011-01-3010-12/+42
| * | wrong ref in ssl policyFriendika2011-01-304-5/+5
| * | more debugging to see if the google push hub is even trying to publish our co...Friendika2011-01-302-0/+2
| * | identify email-only contactsFriendika2011-01-291-1/+8
| * | even more cleanup prior to pushFriendika2011-01-291-3/+1
| * | cleanup ssl_policy implementationFriendika2011-01-291-4/+4