aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/friendika/friendika.gitFabio Comuni2011-02-042-4/+23
|\
| * Merge branch 'photos' of https://github.com/fabrixxm/friendika into ↵Friendika2011-02-032-4/+23
| |\ | | | | | | | | | fabrixxm-photos
| | * remove an erroneously pasted linefabrixxm2011-02-031-6/+1
| | |
| | * Fix tabsFabio Comuni2011-02-031-14/+14
| | |
| | * Show lock info on photosFabio Comuni2011-02-031-1/+9
| | |
| | * Extend lockview to show info on items, photos and eventsFabio Comuni2011-02-031-4/+20
| | |
* | | small fix to IT stringsfabrixxm2011-02-041-1/+1
|/ /
* | warn folks that changing your domain name after making friends is not ↵Friendika2011-02-031-0/+5
| | | | | | | | supported at this time.
* | found the issue - remove the extra tracing stuffFriendika2011-02-031-7/+1
| |
* | allow parentless items from SN - add more tracing on notify failuresFriendika2011-02-032-8/+28
| |
* | allow changing album name in photo edit pageFriendika2011-02-039-13/+34
| |
* | don't parse garbage in phase2 of dfrn_deliver eitherFriendika2011-02-031-0/+7
| |
* | remove selfFriendika2011-02-037-5/+79
| |
* | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feeds that provide insufficient content-type and choke the html parser.
* | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stamps
* | | | | | | | | | 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
| |_|_|_|_|_|_|_|/ |/| | | | | | | |