aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | Merge branch 'omigeot-master'Friendika2011-02-051-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Merge branch 'master' of https://github.com/omigeot/friendika into omigeot-ma...Friendika2011-02-051-0/+1
| |\ \ \ \
| | * | | | Fixed some typo (prevented Friendika to load with french locale)olivierm2011-02-051-0/+1
* | | | | | found it - typoFriendika2011-02-041-1/+1
* | | | | | more error checking on postsFriendika2011-02-042-13/+23
* | | | | | Merge branch 'fabrixxm-master'Friendika2011-02-042-2/+6
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Upload profile photo page it titleFabio Comuni2011-02-041-1/+5
| | |_|/ / | |/| | |
| * | | | Merge branch 'master' of https://github.com/friendika/friendika.gitFabio Comuni2011-02-042-4/+23
| |\ \ \ \
| * | | | | small fix to IT stringsfabrixxm2011-02-041-1/+1
| | |_|_|/ | |/| | |
* | | | | prevent runaway notifications when parent=0 due to race conditionFriendika2011-02-043-59/+78
| |/ / / |/| | |
* | | | Merge branch 'photos' of https://github.com/fabrixxm/friendika into fabrixxm-...Friendika2011-02-032-4/+23
|\ \ \ \ | |/ / / |/| | |
| * | | 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
* | | | warn folks that changing your domain name after making friends is not support...Friendika2011-02-031-0/+5
* | | | 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
* | | | | | | | | | | | | backward compatibilityFriendika2011-02-012-23/+20