aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* the rest of the english html templates except for htconfigFriendika2011-04-0761-3818/+955
* more templatesFriendika2011-04-0730-302/+123
* Merge branch 'tobiasd-master'Friendika2011-04-072-1123/+3914
|\
| * some more German translationsTobias Diekershoff2011-04-071-59/+59
| * German translation updatedTobias Diekershoff2011-04-072-1123/+3914
* | comment open/close anomolies in non-English languagesFriendika2011-04-076-3/+11
|/
* Add some text suggesting that new folks add some basic profile information if...Friendika2011-04-061-1/+14
* more templatesFriendika2011-04-0614-186/+107
* more templates converted to string filesFriendika2011-04-0625-544/+356
* attachment storageFriendika2011-04-061-0/+1
* xmlify enclosure itemsFriendika2011-04-061-2/+2
* some fixes to attachment output in feedFriendika2011-04-061-3/+3
* support feed attachments/enclosures, and fix for bug #30Friendika2011-04-0612-11/+61
* if base url changes radically, save the change.Friendika2011-04-061-4/+7
* ostatus doesn't accept activitystreams stop-follow verb or multiple verbs, in...Friendika2011-04-053-5/+4
* profile edit link missing in photo menu for non-dfrn contactsFriendika2011-04-051-19/+16
* atom categories and tag importFriendika2011-04-052-2/+48
* revert to regex search when < 3 charsFriendika2011-04-051-2/+10
* better twitter follow supportFriendika2011-04-042-8/+31
* better handling of troublesome feeds.Friendika2011-04-047-28/+63
* cleaned up photo_menu check and explanationFriendika2011-04-041-16/+14
* Merge branch 'erikl-master'Friendika2011-04-046-192/+166
|\
| * Merge branch 'master' of https://github.com/erikl/friendika into erikl-masterFriendika2011-04-046-190/+180
| |\
| | * Edited view/sv/pagetypes.tpl via GitHuberik2011-04-041-6/+5
| | * Edited view/sv/strings.php via GitHuberik2011-04-041-139/+116
| | * Edited view/sv/strings.php via GitHuberik2011-04-031-1/+1
| | * Edited view/sv/strings.php via GitHuberik2011-04-011-64/+64
| | * Edited view/sv/settings.tpl via GitHuberik2011-03-291-1/+1
| | * Edited view/sv/profile_edit.tpl via GitHuberik2011-03-291-1/+1
| | * Edited view/sv/settings.tpl via GitHuberik2011-03-291-3/+18
| | * Edited view/sv/register_open_eml.tpl via GitHuberik2011-03-291-1/+1
| | * Edited view/sv/register_verify_eml.tpl via GitHuberik2011-03-261-1/+1
| | * Edited view/sv/register_verify_eml.tpl via GitHuberik2011-03-261-2/+1
* | | revupFriendika2011-04-041-1/+1
* | | make photo menu work better on remote profile loginsFriendika2011-04-042-3/+9
* | | remote profile photo menu fixFriendika2011-04-041-2/+2
* | | Merge branch 'fabrixxm-iconpopup'Friendika2011-04-041-5/+9
|\ \ \
| * \ \ Merge branch 'iconpopup' of https://github.com/fabrixxm/friendika into fabrix...Friendika2011-04-041-5/+9
| |\ \ \
| | * | | show "edit contact" and "sent PM" only to local userFabio Comuni2011-04-041-5/+9
* | | | | item_photo_menu to display pageFriendika2011-04-041-0/+1
* | | | | missed merge conflict tagFriendika2011-04-041-4/+0
|/ / / /
* | | | Merge branch 'iconpopup' of https://github.com/fabrixxm/friendika into fabrix...Friendika2011-04-0412-7/+163
|\| | |
| * | | add popupmenu links to status, profile and photos if contact is in dfrnFabio Comuni2011-04-041-3/+16
| * | | fix profile redirect url in dfrn_pollFabio Comuni2011-04-041-2/+3
| * | | Merge remote-tracking branch 'friendika-master/master' into iconpopupFabio Comuni2011-04-0421-130/+401
| |\ \ \
| * | | | put popupmenu above allFabio Comuni2011-04-042-0/+2
| * | | | \"View profile\" send to user profile page and not to tab.Fabio Comuni2011-04-011-1/+1
| * | | | fix typoFabio Comuni2011-04-011-1/+1
| * | | | popup styles to loozah themeFabio Comuni2011-03-312-0/+29
| * | | | url \"/message/new/<id>\" preselect contact <id> in \"To\" select boxFabio Comuni2011-03-311-1/+3