aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'friendika/master' into newuiFabio Comuni2011-09-0546-1273/+2988
|\
| * custom attagsFriendika2011-09-044-7/+19
| * bookmarks + bug #140Friendika2011-09-049-9/+48
| * saved searches on network pageFriendika2011-09-048-7/+108
| * set max height of acl names to avoid wrapFriendika2011-09-043-3/+3
| * truncate overflow text on acl selector items (3 themes)Friendika2011-09-044-5/+5
| * scrape_url - use feed url if no name can be foundFriendika2011-09-043-6/+30
| * Merge branch 'pull'Friendika2011-09-041-2/+2
| |\
| | * diaspora has no timezone - use UTC for eventsFriendika2011-09-031-2/+2
| * | add timezone convert module, several other minor or in progress fixesFriendika2011-09-046-7/+56
| |/
| * format events for diasporaFriendika2011-09-031-8/+50
| * no plink on imported D* postsFriendika2011-09-031-0/+3
| * match bbcode multilineFriendika2011-09-031-41/+41
| * provide option to block Facebook wall but still allow social streamFriendika2011-09-031-12/+16
| * Merge branch 'pull'Friendika2011-09-028-1132/+2222
| |\
| | * Merge pull request #169 from michal-s/masterFriendika2011-09-028-1132/+2222
| | |\
| | | * minor changes of czech translationsMichal Supler2011-09-038-1132/+2222
| * | | Merge branch 'pull'Friendika2011-09-022-1/+5
| |\| |
| | * | Merge pull request #168 from Erkan-Yilmaz/masterFriendika2011-09-022-1/+5
| | |\ \
| | | * | inital info for Facebook + CC by licenceErkan Yilmaz2011-09-031-0/+4
| | | * | Merge remote branch 'upstream/master'Erkan Yilmaz2011-09-032-11/+48
| | | |\ \ | | | |/ / | | |/| |
| | | * | typo in German admin log pageErkan Yilmaz2011-09-021-1/+1
| * | | | revupFriendika2011-09-021-1/+1
| |/ / /
| * | | zot: dealing with foreign messagesFriendika2011-09-021-2/+14
| * | | completely enclose ~f hashtags so they don't get hijacked by D*Friendika2011-09-021-1/+2
| * | | protocol update, require a recipient encrypted envelope or it cannot beFriendika2011-09-021-8/+32
| |/ /
| * | Merge pull request #167 from Erkan-Yilmaz/masterFriendika2011-09-011-4/+4
| |\ \
| | * | typos + adaptErkan Yilmaz2011-09-021-4/+4
| |/ /
| * | Merge pull request #166 from Erkan-Yilmaz/masterfabrixxm2011-09-013-13/+13
| |\ \
| | * | typos in README files of plugins: impressum + statusnetErkan Yilmaz2011-09-022-12/+12
| | * | typo in widget plugin textErkan Yilmaz2011-09-021-1/+1
| |/ /
| * | Merge pull request #165 from Erkan-Yilmaz/masterFriendika2011-09-011-6/+6
| |\ \
| | * | fix README for twitter plugin: typos + change to new menu structureErkan Yilmaz2011-09-021-6/+6
| |/ /
| * | error viewing logfiles over 2GbFriendika2011-09-011-1/+1
| * | infrastructure for personalised @ tags (no UI/settings form yet), allow own c...Friendika2011-09-017-9/+19
| * | Merge branch 'pull'Friendika2011-09-013-4/+21
| |\ \
| | * \ Merge pull request #164 from fabrixxm/masterfabrixxm2011-09-012-3/+3
| | |\ \
| | | * | small fix to IT stringsFabio Comuni2011-09-012-3/+3
| | |/ /
| | * | Add some links to external resourcesfabrixxm2011-09-011-1/+18
| * | | login_hookFriendika2011-09-013-6/+13
| |/ /
| * | save plink for diaspora items so likes will point to right postFriendika2011-08-311-1/+23
| * | more clarification w/r/t sender|fromFriendika2011-08-311-5/+7
| * | sender verificationFriendika2011-08-311-0/+10
| * | allow browser cookies to avoid multiple redirectsFriendika2011-08-311-0/+3
| * | xml+atom was backwardsFriendika2011-08-311-2/+2
| * | change MUST to SHOULD w/r/t data formatsFriendika2011-08-311-4/+4
| * | add new cut of zot/zid protocolFriendika2011-08-312-1/+237
| * | translate D* images (markdown) before links, they overlap and conflictFriendika2011-08-301-1/+1
| * | youtube redirect fixesFriendika2011-08-303-5/+5
| * | This *might* fix Diaspora @ tags - or it might not.Friendika2011-08-301-0/+2