aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fabrixxm-master'Friendika2011-02-024-12/+55
|\
| * IT string updatefabrixxm2011-02-031-0/+19
| * update jot-headersfabrixxm2011-02-013-12/+36
* | append jotplugin tools to current toolbar rowFriendika2011-02-026-18/+23
|/
* oembed contsant name, fix dfrnpubdeliver, add 'code' editor buttonFriendika2011-01-311-1/+1
* let there be purple! ;-)Friendika2011-01-314-0/+27
* email cc recipients (front end)Friendika2011-01-314-4/+22
* force text paste in editorFriendika2011-01-311-3/+11
* more ssl_policy cleanup, allow manual feed update per contact when hub is wha...Friendika2011-01-306-8/+19
* removed java photo uploader from mainline. Photo uploaders are now plugins, b...Friendika2011-01-274-32/+16
* 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-271-3/+32
* | | Revert "Revert "roll version - now in alpha 2.1""Friendika2011-01-271-32/+3
* | | Revert "roll version - now in alpha 2.1"Friendika2011-01-271-3/+32
* | | roll version - now in alpha 2.1Friendika2011-01-271-32/+3
* | | set update frequency to twice daily for 'feed' contacts, unable to set update...Friendika2011-01-264-9/+17
* | | search icons (?)Friendika2011-01-262-1/+6
* | | Merge branch 'oembed' of https://github.com/fabrixxm/friendika into fabrixxm-...Friendika2011-01-265-7/+49
|\ \ \
| * | | remove fixed width from wall-item-contentFabio Comuni2011-01-261-1/+1
| * | | Add 'jot_tool' hook, plugins can add tool icons.Fabio Comuni2011-01-265-2/+41
| * | | Merge remote branch 'friendika-master/master'Fabio Comuni2011-01-252-1/+7
| |\ \ \
| * | | | fixed width on wall-item-wrapperFabio Comuni2011-01-251-0/+2
| * | | | Bigger subject in messagesfabrixxm2011-01-241-4/+5
* | | | | 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 git://github.com/tobiasd/friendikaTobias Diekershoff2011-01-254-0/+1887
|\ \ \ \ \
| * | | | | a green variation of the duepuntozero themeTobias Diekershoff2011-01-254-0/+1887
* | | | | | some more strings translated into GermanTobias Diekershoff2011-01-251-73/+73
|/ / / / /
* | | | | Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-01-252-1/+7
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | leave room for vertical scrollbar (when needed)Friendika2011-01-242-9/+7
| * | | | allow a video and/or photo to fit with scrollbarsFriendika2011-01-242-2/+2
| * | | | restrict post height, we may back this out later and replace with [show all] ...Friendika2011-01-242-1/+9
| |/ / /
* | | | Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-01-241-46/+47
|\| | |
| * | | don't translate CR-LFFriendika2011-01-241-1/+0
| * | | Merge branch 'master' of github.com:fabrixxm/friendikaFabio Comuni2011-01-241-46/+48
| |\ \ \
| | * | | IT strings fixfabrixxm2011-01-231-46/+48
* | | | | Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-01-2451-0/+2901
|\| | | |
| * | | | sync template updates en => frFriendika2011-01-231-2/+2
| | |/ / | |/| |
| * | | Merge branch 'master' of https://github.com/omigeot/friendika into omigeot-ma...Friendika2011-01-2351-0/+2901
| |\ \ \ | | |/ / | |/| / | | |/
| | * Done timezones + marital statuses and a few time-related translationsolivierm2011-01-231-476/+476
| | * A little more...olivierm2011-01-211-10/+10
| | * More translation, added FIXME where not completely satisfying.olivierm2011-01-211-24/+24
| | * Translated more frencholivierm2011-01-211-41/+41
| | * More strings translated for french locale.olivierm2011-01-211-29/+29
| | * Started the french translation (up to the "TODO" comment in view/fr/strings.php)olivierm2011-01-2151-0/+2901
* | | updated profile_advanced.php from changes in view/enTobias Diekershoff2011-01-231-2/+2