aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'fabrixxm-master'Friendika2011-02-061-1/+1
|\
| * Merge branch 'master' of https://github.com/fabrixxm/friendika into ↵Friendika2011-02-064-72/+101
| |\ | | | | | | | | | fabrixxm-master
| | * fixed missing close parenthesisfabrixxm2011-02-061-1/+1
| | |
* | | kill orphansFriendika2011-02-063-3/+17
| | |
* | | Merge branch 'tobiasd-master'Friendika2011-02-062-4/+4
|\ \ \
| * | | german choose existing pic for the avatarTobias Diekershoff2011-02-061-2/+2
| | | |
| * | | Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-02-068-43/+116
| |\ \ \
| * \ \ \ Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-02-058-78/+130
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | wordingTobias Diekershoff2011-02-041-2/+2
| | | | |
* | | | | ensure that jot_plugins inherit '$visitor' correctlyFriendika2011-02-062-9/+11
| |_|/ / |/| | |
* | | | Merge branch 'fabrixxm-master'Friendika2011-02-057-42/+115
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'ph2pr' of https://github.com/fabrixxm/friendika into ↵Friendika2011-02-057-42/+115
| |\ \ \ | | | | | | | | | | | | | | | fabrixxm-master
| | * | | Add a link to user photos in Upload Profile Photo pageFabio Comuni2011-02-047-6/+28
| | | | |
| | * | | Allow to set a photo from albums as profile photoFabio Comuni2011-02-042-37/+92
| | | | |
* | | | | Merge branch 'omigeot-master'Friendika2011-02-051-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | Conflicts: view/fr/strings.php
| * | | | Merge branch 'master' of https://github.com/omigeot/friendika into ↵Friendika2011-02-051-0/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | omigeot-master
| | * | | | 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 ↵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
| | | |
* | | | 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
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |