aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'friendika-master'fabrixxm2011-02-0832-227/+397
|\
| * tweaks to reworked remote deletion, which also fixes some comment box odditiesFriendika2011-02-082-3/+3
| |
| * rework remote deletionFriendika2011-02-082-76/+94
| |
| * fix del_pconfigFriendika2011-02-081-1/+1
| |
| * close tag on favicon link missingFriendika2011-02-074-4/+4
| |
| * at least one server is giving CURL a second set of headers (and it isn't a ↵Friendika2011-02-071-0/+17
| | | | | | | | 100 continue which we've already accounted for)
| * don't change photo visibility if only album name was changedFriendika2011-02-072-3/+11
| |
| * feed cleanupFriendika2011-02-074-63/+68
| |
| * one less parenFriendika2011-02-061-1/+1
| |
| * don't show logout link on 'home' link if remote_userFriendika2011-02-061-7/+7
| |
| * functionise birthdayFriendika2011-02-063-40/+50
| |
| * fix contact photo updates - a result of baseurl being wrong for cmdline ↵Friendika2011-02-063-13/+44
| | | | | | | | processes
| * theme name cleanup - rename default to loozah, provide sane fallbacks and ↵Friendika2011-02-0623-26/+107
| | | | | | | | | | | | | | change system primary theme. Provide indication on contact edit page of last update success/failure - can be extended later to show actual timestamp of last successful update.
| * 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
* | | | Merge branch 'friendika-master'fabrixxm2011-02-0614-57/+146
|\| | | | |_|/ |/| |
| * | 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
| | | | | | |
* | | | | | | fixed missing close parenthesisfabrixxm2011-02-061-1/+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
|\ \ \ \