Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'omigeot-master' | Friendika | 2011-01-27 | 4 | -337/+336 |
|\ | |||||
| * | Merge branch 'master' of https://github.com/omigeot/friendika into ↵ | Friendika | 2011-01-27 | 4 | -337/+336 |
| |\ | | | | | | | | | | omigeot-master | ||||
| | * | More translation | olivierm | 2011-01-27 | 1 | -1/+1 |
| | | | |||||
| | * | Done head.tpl | olivierm | 2011-01-27 | 1 | -1/+1 |
| | | | |||||
| | * | French translation : Done strings.php, started template files. | olivierm | 2011-01-27 | 2 | -335/+334 |
| | | | |||||
* | | | still not quite ready for the big photos rollover | Friendika | 2011-01-27 | 2 | -83/+61 |
| | | | |||||
* | | | Revert "Revert "roll version - now in alpha 2.1"" | Friendika | 2011-01-27 | 5 | -75/+227 |
| | | | | | | | | | | | | This reverts commit e8a3166fa9caa1bdff90526886ae705bc44c4ac8. | ||||
* | | | Revert "roll version - now in alpha 2.1" | Friendika | 2011-01-27 | 5 | -227/+75 |
| | | | | | | | | | | | | This reverts commit df4f77dadddc7bd756c3e4f72fa2fbe204cfff88. | ||||
* | | | roll version - now in alpha 2.1 | Friendika | 2011-01-27 | 5 | -75/+227 |
| | | | |||||
* | | | set update frequency to twice daily for 'feed' contacts, unable to set ↵ | Friendika | 2011-01-26 | 6 | -15/+26 |
| | | | | | | | | | | | | update frequency on contact edit form. | ||||
* | | | search icons (?) | Friendika | 2011-01-26 | 4 | -1/+6 |
| | | | |||||
* | | | Merge branch 'oembed' of https://github.com/fabrixxm/friendika into ↵ | Friendika | 2011-01-26 | 12 | -10/+178 |
|\ \ \ | | | | | | | | | | | | | fabrixxm-oembed | ||||
| * | | | Rewrite oembed plugin to use new bbcode tag [embed] and make discovery ↵ | Fabio Comuni | 2011-01-26 | 2 | -44/+48 |
| | | | | | | | | | | | | | | | | server-side | ||||
| * | | | remove fixed width from wall-item-content | Fabio Comuni | 2011-01-26 | 1 | -1/+1 |
| | | | | |||||
| * | | | oembed consumer plugin | Fabio Comuni | 2011-01-26 | 3 | -0/+107 |
| | | | | |||||
| * | | | add [img=wxh][/img] support in tinymce bbcode plugin | Fabio Comuni | 2011-01-26 | 1 | -0/+5 |
| | | | | |||||
| * | | | Add 'jot_tool' hook, plugins can add tool icons. | Fabio Comuni | 2011-01-26 | 8 | -5/+54 |
| | | | | |||||
| * | | | Merge remote branch 'friendika-master/master' | Fabio Comuni | 2011-01-25 | 7 | -12/+63 |
| |\ \ \ | |||||
| * | | | | fixed width on wall-item-wrapper | Fabio Comuni | 2011-01-25 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | Bigger subject in messages | fabrixxm | 2011-01-24 | 1 | -4/+5 |
| | | | | | |||||
* | | | | | Piwik plugin for Friendika | Tobias Diekershoff | 2011-01-26 | 2 | -0/+72 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This plugin allows you to enter the code necessary for Piwik analytics at the bottom of every page that Friendika produces. Displaying an opt-out link is possible (optional). For details about the configuration the the header of the PHP file. | ||||
* | | | | | dissolve relationship (new protocol) working | Friendika | 2011-01-26 | 3 | -11/+21 |
| | | | | | |||||
* | | | | | work in progress js_uploader plugin, turn java uploader into plugin - not ↵ | Friendika | 2011-01-26 | 68 | -0/+6768 |
| | | | | | | | | | | | | | | | | | | | | done yet | ||||
* | | | | | whitespace only | Friendika | 2011-01-26 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | no comment box if no notify, not no poll | Friendika | 2011-01-25 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | smilies on new item view | Friendika | 2011-01-25 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | greenzero stripped to bare essentials, imported from duepuntozero | Friendika | 2011-01-25 | 1 | -1865/+7 |
| | | | | | |||||
* | | | | | renamed theme - it was a bit too long | Friendika | 2011-01-25 | 4 | -0/+0 |
| | | | | | |||||
* | | | | | Merge branch 'master' of https://github.com/tobiasd/friendika into ↵ | Friendika | 2011-01-25 | 54 | -0/+4756 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | tobiasd-master | ||||
| * \ \ \ \ | Merge git://github.com/tobiasd/friendika | Tobias Diekershoff | 2011-01-25 | 4 | -0/+1887 |
| |\ \ \ \ \ | |||||
| | * | | | | | a green variation of the duepuntozero theme | Tobias Diekershoff | 2011-01-25 | 4 | -0/+1887 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for this variation of the theme the header image and the link colors were set to some tone of green that fit my current likings. | ||||
| | * | | | | | Merge branch 'master' of git://github.com/tobiasd/friendika | Tobias Diekershoff | 2011-01-25 | 7 | -12/+63 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'master' of git://github.com/tobiasd/friendika | root | 2011-01-24 | 5 | -52/+233 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch 'master' of git://github.com/tobiasd/friendika | root | 2011-01-24 | 63 | -10/+3047 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch 'master' of git://github.com/tobiasd/friendika | root | 2011-01-23 | 6 | -9/+10 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'master' of git://github.com/tobiasd/friendika | root | 2011-01-22 | 2 | -3/+2 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'master' of git://github.com/tobiasd/friendika | root | 2011-01-21 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of git://github.com/friendika/friendika | root | 2011-01-21 | 2 | -5/+9 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of git://github.com/tobiasd/friendika | root | 2011-01-21 | 2 | -22/+22 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of git://github.com/tobiasd/friendika | root | 2011-01-21 | 2 | -2/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of git://github.com/tobiasd/friendika | root | 2011-01-21 | 3 | -32/+32 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of git://github.com/tobiasd/friendika | root | 2011-01-21 | 1 | -2/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of git://github.com/tobiasd/friendika | root | 2011-01-21 | 1 | -0/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of git://github.com/tobiasd/friendika | root | 2011-01-21 | 1 | -23/+23 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of git://github.com/tobiasd/friendika | root | 2011-01-21 | 49 | -0/+2867 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of git://github.com/friendika/friendika | root | 2011-01-21 | 6 | -35/+59 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of git://github.com/friendika/friendika | root | 2011-01-20 | 10 | -31/+173 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of git://github.com/friendika/friendika | root | 2011-01-19 | 13 | -11/+67 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of git://github.com/friendika/friendika | root | 2011-01-18 | 17 | -60/+97 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of git://github.com/friendika/friendika | root | 2011-01-15 | 9 | -76/+136 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |