aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'friendika/master' into newuifabrixxm2011-09-0820-45/+5733
|\
| * Merge pull request #171 from fabrixxm/masterfabrixxm2011-09-081-3/+4
| |\
| | * deal with messages without comments or likesFabio Comuni2011-09-081-3/+4
| * | Merge pull request #170 from fabrixxm/masterfabrixxm2011-09-082-9/+44
| |\|
| | * global lang array in templatesFabio Comuni2011-09-081-2/+24
| | * Show conversations in network default view ordered by activityFabio Comuni2011-09-081-7/+20
| |/
| * speed up friend requests and avoid parse errors by using hcard address instea...Friendika2011-09-071-1/+1
| * typo fb connectorFriendika2011-09-072-2/+2
| * part of bug #143Friendika2011-09-071-1/+6
| * clarification of signature details for foreign messages,Friendika2011-09-061-2/+2
| * faster friend requests (DFRN)Friendika2011-09-063-11/+19
| * Russian translation (80% complete)Friendika2011-09-062-0/+5604
| * view bookmarksFriendika2011-09-063-1/+20
| * updated documentationFriendika2011-09-054-12/+16
| * bug #127, add Diaspora notes to Connect (dfrn_request) page, get rid of secur...Friendika2011-09-055-8/+23
* | Merge branch 'newui' of github.com:fabrixxm/friendika into newuifabrixxm2011-09-084-3/+9
|\ \
| * | light notifications menu icon on new notifsFabio Comuni2011-09-081-1/+3
| * | style vcard infosFabio Comuni2011-09-083-2/+6
* | | Merge branch 'newui' of github.com:fabrixxm/friendika into newuifabrixxm2011-09-05159-2284/+5000
|\| |
| * | profiles popup menu in sidebarFabio Comuni2011-09-054-6/+53
| * | add *~ to gitignoreFabio Comuni2011-09-051-0/+1
| * | Load infos and notices via ping and show them with js popupFabio Comuni2011-09-0522-12/+222
| * | Add tipTip js tooltipsFabio Comuni2011-09-055-2/+175
| * | fix profile edit link and d* photo urlsFabio Comuni2011-09-051-4/+4
| * | fix aside contact block, add edit profiles iconFabio Comuni2011-09-053-5/+20
| * | move js to js folderFabio Comuni2011-09-0511-7/+9
| * | move icons style in new fileFabio Comuni2011-09-054-43/+146
| * | More iconsFabio Comuni2011-09-0554-0/+14
| * | 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