aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Collapse)AuthorAgeFilesLines
* german choose existing pic for the avatarTobias Diekershoff2011-02-061-2/+2
|
* Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-02-066-6/+24
|\
| * Merge branch 'fabrixxm-master'Friendika2011-02-055-5/+23
| |\
| | * Merge branch 'ph2pr' of https://github.com/fabrixxm/friendika into ↵Friendika2011-02-055-5/+23
| | |\ | | | | | | | | | | | | fabrixxm-master
| | | * Add a link to user photos in Upload Profile Photo pageFabio Comuni2011-02-046-5/+27
| | | |
| * | | Merge branch 'omigeot-master'Friendika2011-02-051-1/+1
| |\ \ \ | | |/ / | |/| | | | | | | | | | Conflicts: view/fr/strings.php
| | * | Merge branch 'master' of https://github.com/omigeot/friendika into ↵Friendika2011-02-051-0/+1
| | |\ \ | | | | | | | | | | | | | | | omigeot-master
| | | * | Fixed some typo (prevented Friendika to load with french locale)olivierm2011-02-051-0/+1
| | | | |
* | | | | Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-02-052-2/+6
|\| | | |
| * | | | Upload profile photo page it titleFabio Comuni2011-02-041-1/+5
| | |_|/ | |/| |
| * | | small fix to IT stringsfabrixxm2011-02-041-1/+1
| | | |
* | | | wordingTobias Diekershoff2011-02-041-2/+2
|/ / /
* | | allow changing album name in photo edit pageFriendika2011-02-036-6/+15
| | |
* | | remove selfFriendika2011-02-035-4/+24
| | |
* | | Merge branch 'tobiasd-master'Friendika2011-02-021-1/+1
|\ \ \
| * | | double $ in de/strings.php correctedTobias Diekershoff2011-02-031-1/+1
| | | |
* | | | Merge branch 'tobiasd-master'Friendika2011-02-021-7/+55
|\| | |
| * | | updates to the German strings.php fileTobias Diekershoff2011-02-031-7/+55
| | | |
* | | | 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 ↵Friendika2011-01-306-8/+19
| | | | | | | | | | | | whacked, log feed parse errors
* | | removed java photo uploader from mainline. Photo uploaders are now plugins, ↵Friendika2011-01-274-32/+16
| | | | | | | | | | | | but a single item upload is available by default.
* | | Merge branch 'omigeot-master'Friendika2011-01-274-337/+336
|\| |
| * | Merge branch 'master' of https://github.com/omigeot/friendika into ↵Friendika2011-01-274-337/+336
| |\| | | | | | | | | | omigeot-master
| | * 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
| | | | | | | | | | | | This reverts commit e8a3166fa9caa1bdff90526886ae705bc44c4ac8.
* | | Revert "roll version - now in alpha 2.1"Friendika2011-01-271-3/+32
| | | | | | | | | | | | This reverts commit df4f77dadddc7bd756c3e4f72fa2fbe204cfff88.
* | | roll version - now in alpha 2.1Friendika2011-01-271-32/+3
| | |
* | | set update frequency to twice daily for 'feed' contacts, unable to set ↵Friendika2011-01-264-9/+17
| | | | | | | | | | | | update frequency on contact edit form.
* | | search icons (?)Friendika2011-01-262-1/+6
| | |
* | | Merge branch 'oembed' of https://github.com/fabrixxm/friendika into ↵Friendika2011-01-265-7/+49
|\ \ \ | | | | | | | | | | | | fabrixxm-oembed
| * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 GermanTobias Diekershoff2011-01-251-73/+73
|/ / / / /