aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'omigeot-master'Friendika2011-01-274-337/+336
|\
| * Merge branch 'master' of https://github.com/omigeot/friendika into omigeot-ma...Friendika2011-01-274-337/+336
| |\
| | * More translationolivierm2011-01-271-1/+1
| | * Done head.tplolivierm2011-01-271-1/+1
| | * French translation : Done strings.php, started template files.olivierm2011-01-272-335/+334
* | | still not quite ready for the big photos rolloverFriendika2011-01-272-83/+61
* | | Revert "Revert "roll version - now in alpha 2.1""Friendika2011-01-275-75/+227
* | | Revert "roll version - now in alpha 2.1"Friendika2011-01-275-227/+75
* | | roll version - now in alpha 2.1Friendika2011-01-275-75/+227
* | | set update frequency to twice daily for 'feed' contacts, unable to set update...Friendika2011-01-266-15/+26
* | | search icons (?)Friendika2011-01-264-1/+6
* | | Merge branch 'oembed' of https://github.com/fabrixxm/friendika into fabrixxm-...Friendika2011-01-2612-10/+178
|\ \ \
| * | | Rewrite oembed plugin to use new bbcode tag [embed] and make discovery server...Fabio Comuni2011-01-262-44/+48
| * | | remove fixed width from wall-item-contentFabio Comuni2011-01-261-1/+1
| * | | oembed consumer pluginFabio Comuni2011-01-263-0/+107
| * | | add [img=wxh][/img] support in tinymce bbcode pluginFabio Comuni2011-01-261-0/+5
| * | | Add 'jot_tool' hook, plugins can add tool icons.Fabio Comuni2011-01-268-5/+54
| * | | Merge remote branch 'friendika-master/master'Fabio Comuni2011-01-257-12/+63
| |\ \ \
| * | | | fixed width on wall-item-wrapperFabio Comuni2011-01-251-0/+2
| * | | | Bigger subject in messagesfabrixxm2011-01-241-4/+5
* | | | | Piwik plugin for FriendikaTobias Diekershoff2011-01-262-0/+72
* | | | | dissolve relationship (new protocol) workingFriendika2011-01-263-11/+21
* | | | | work in progress js_uploader plugin, turn java uploader into plugin - not don...Friendika2011-01-2668-0/+6768
* | | | | whitespace onlyFriendika2011-01-261-1/+1
* | | | | no comment box if no notify, not no pollFriendika2011-01-251-2/+2
* | | | | smilies on new item viewFriendika2011-01-251-1/+1
* | | | | greenzero stripped to bare essentials, imported from duepuntozeroFriendika2011-01-251-1865/+7
* | | | | renamed theme - it was a bit too longFriendika2011-01-254-0/+0
* | | | | Merge branch 'master' of https://github.com/tobiasd/friendika into tobiasd-ma...Friendika2011-01-2554-0/+4756
|\ \ \ \ \
| * \ \ \ \ Merge git://github.com/tobiasd/friendikaTobias Diekershoff2011-01-254-0/+1887
| |\ \ \ \ \
| | * | | | | a green variation of the duepuntozero themeTobias Diekershoff2011-01-254-0/+1887
| | * | | | | Merge branch 'master' of git://github.com/tobiasd/friendikaTobias Diekershoff2011-01-257-12/+63
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' of git://github.com/tobiasd/friendikaroot2011-01-245-52/+233
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' of git://github.com/tobiasd/friendikaroot2011-01-2463-10/+3047
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/tobiasd/friendikaroot2011-01-236-9/+10
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/tobiasd/friendikaroot2011-01-222-3/+2
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/tobiasd/friendikaroot2011-01-211-1/+1
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/friendika/friendikaroot2011-01-212-5/+9
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/tobiasd/friendikaroot2011-01-212-22/+22
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/tobiasd/friendikaroot2011-01-212-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/tobiasd/friendikaroot2011-01-213-32/+32
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/tobiasd/friendikaroot2011-01-211-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/tobiasd/friendikaroot2011-01-211-0/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/tobiasd/friendikaroot2011-01-211-23/+23
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/tobiasd/friendikaroot2011-01-2149-0/+2867
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/friendika/friendikaroot2011-01-216-35/+59
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/friendika/friendikaroot2011-01-2010-31/+173
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/friendika/friendikaroot2011-01-1913-11/+67
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/friendika/friendikaroot2011-01-1817-60/+97
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/friendika/friendikaroot2011-01-159-76/+136
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \