Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | removed java photo uploader from mainline. Photo uploaders are now plugins, ↵ | Friendika | 2011-01-27 | 4 | -32/+16 |
| | | | | but a single item upload is available by default. | ||||
* | 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 | 1 | -3/+32 |
| | | | |||||
* | | | Revert "Revert "roll version - now in alpha 2.1"" | Friendika | 2011-01-27 | 1 | -32/+3 |
| | | | | | | | | | | | | This reverts commit e8a3166fa9caa1bdff90526886ae705bc44c4ac8. | ||||
* | | | Revert "roll version - now in alpha 2.1" | Friendika | 2011-01-27 | 1 | -3/+32 |
| | | | | | | | | | | | | This reverts commit df4f77dadddc7bd756c3e4f72fa2fbe204cfff88. | ||||
* | | | roll version - now in alpha 2.1 | Friendika | 2011-01-27 | 1 | -32/+3 |
| | | | |||||
* | | | set update frequency to twice daily for 'feed' contacts, unable to set ↵ | Friendika | 2011-01-26 | 4 | -9/+17 |
| | | | | | | | | | | | | update frequency on contact edit form. | ||||
* | | | search icons (?) | Friendika | 2011-01-26 | 2 | -1/+6 |
| | | | |||||
* | | | Merge branch 'oembed' of https://github.com/fabrixxm/friendika into ↵ | Friendika | 2011-01-26 | 5 | -7/+49 |
|\ \ \ | | | | | | | | | | | | | fabrixxm-oembed | ||||
| * | | | remove fixed width from wall-item-content | Fabio Comuni | 2011-01-26 | 1 | -1/+1 |
| | | | | |||||
| * | | | Add 'jot_tool' hook, plugins can add tool icons. | Fabio Comuni | 2011-01-26 | 5 | -2/+41 |
| | | | | |||||
| * | | | Merge remote branch 'friendika-master/master' | Fabio Comuni | 2011-01-25 | 2 | -1/+7 |
| |\ \ \ | |||||
| * | | | | 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 |
| | | | | | |||||
* | | | | | 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 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. | ||||
* | | | | | | some more strings translated into German | Tobias Diekershoff | 2011-01-25 | 1 | -73/+73 |
|/ / / / / | |||||
* | | | | | Merge branch 'master' of git://github.com/friendika/friendika | Tobias Diekershoff | 2011-01-25 | 2 | -1/+7 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | leave room for vertical scrollbar (when needed) | Friendika | 2011-01-24 | 2 | -9/+7 |
| | | | | | |||||
| * | | | | allow a video and/or photo to fit with scrollbars | Friendika | 2011-01-24 | 2 | -2/+2 |
| | | | | | |||||
| * | | | | restrict post height, we may back this out later and replace with [show all] ↵ | Friendika | 2011-01-24 | 2 | -1/+9 |
| |/ / / | | | | | | | | | | | | | toggles | ||||
* | | | | Merge branch 'master' of git://github.com/friendika/friendika | Tobias Diekershoff | 2011-01-24 | 1 | -46/+47 |
|\| | | | |||||
| * | | | don't translate CR-LF | Friendika | 2011-01-24 | 1 | -1/+0 |
| | | | | |||||
| * | | | Merge branch 'master' of github.com:fabrixxm/friendika | Fabio Comuni | 2011-01-24 | 1 | -46/+48 |
| |\ \ \ | |||||
| | * | | | IT strings fix | fabrixxm | 2011-01-23 | 1 | -46/+48 |
| | | | | | |||||
* | | | | | Merge branch 'master' of git://github.com/friendika/friendika | Tobias Diekershoff | 2011-01-24 | 51 | -0/+2901 |
|\| | | | | |||||
| * | | | | sync template updates en => fr | Friendika | 2011-01-23 | 1 | -2/+2 |
| | |/ / | |/| | | |||||
| * | | | Merge branch 'master' of https://github.com/omigeot/friendika into ↵ | Friendika | 2011-01-23 | 51 | -0/+2901 |
| |\ \ \ | | |/ / | |/| / | | |/ | omigeot-master | ||||
| | * | Done timezones + marital statuses and a few time-related translations | olivierm | 2011-01-23 | 1 | -476/+476 |
| | | | |||||
| | * | A little more... | olivierm | 2011-01-21 | 1 | -10/+10 |
| | | | |||||
| | * | More translation, added FIXME where not completely satisfying. | olivierm | 2011-01-21 | 1 | -24/+24 |
| | | | |||||
| | * | Translated more french | olivierm | 2011-01-21 | 1 | -41/+41 |
| | | | |||||
| | * | More strings translated for french locale. | olivierm | 2011-01-21 | 1 | -29/+29 |
| | | | |||||
| | * | Started the french translation (up to the "TODO" comment in view/fr/strings.php) | olivierm | 2011-01-21 | 51 | -0/+2901 |
| | | | |||||
* | | | updated profile_advanced.php from changes in view/en | Tobias Diekershoff | 2011-01-23 | 1 | -2/+2 |
| | | | |||||
* | | | Merge branch 'master' of git://github.com/friendika/friendika | Tobias Diekershoff | 2011-01-23 | 2 | -4/+4 |
|\| | | |||||
| * | | birthday timezone is absolute | Friendika | 2011-01-22 | 2 | -4/+4 |
| |/ | |||||
* | | wording in email template adjusted | Tobias Diekershoff | 2011-01-22 | 1 | -2/+1 |
| | | |||||
* | | variable name spelling mistake in template corrected | Tobias Diekershoff | 2011-01-21 | 1 | -1/+1 |
| | | |||||
* | | more strings | Tobias Diekershoff | 2011-01-21 | 2 | -21/+21 |
| | | |||||
* | | spelling ;-) | Tobias Diekershoff | 2011-01-21 | 1 | -1/+1 |
| | | |||||
* | | minor wordening | Tobias Diekershoff | 2011-01-21 | 1 | -1/+1 |
| | | |||||
* | | minor wording correction | Tobias Diekershoff | 2011-01-21 | 1 | -1/+1 |
| | | |||||
* | | minor correction to profile_edit.tpl more strings | Tobias Diekershoff | 2011-01-21 | 2 | -31/+31 |
| | |