aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-03-2561-806/+1070
|\
| * change link to project websiteFriendika2011-03-241-1/+1
| * repair duplicate nickname accounts caused by race conditionFriendika2011-03-242-1/+19
| * Merge branch 'erikl-master'Friendika2011-03-2440-497/+502
| |\
| | * Merge branch 'master' of https://github.com/erikl/friendika into erikl-masterFriendika2011-03-2444-503/+507
| | |\
| | | * Edited view/sv/strings.php via GitHuberik2011-03-221-56/+119
| | | * Edited view/sv/wall_received_eml.tpl via GitHuberik2011-03-221-7/+5
| | | * Edited view/sv/settings_nick_unset.tpl via GitHuberik2011-03-221-6/+4
| | | * Edited view/sv/settings_nick_subdir.tpl via GitHuberik2011-03-221-3/+3
| | | * Edited view/sv/settings_nick_set.tpl via GitHuberik2011-03-221-2/+1
| | | * Edited view/sv/settings.tpl via GitHuberik2011-03-221-31/+29
| | | * Edited view/sv/request_notify_eml.tpl via GitHuberik2011-03-221-11/+7
| | | * Edited view/sv/registrations.tpl via GitHuberik2011-03-221-1/+1
| | | * Edited view/sv/registrations-top.tpl via GitHuberik2011-03-221-3/+1
| | | * Edited view/sv/register_verify_eml.tpl via GitHuberik2011-03-221-16/+8
| | | * Edited view/sv/register_open_eml.tpl via GitHuberik2011-03-221-15/+11
| | | * Edited view/sv/pwdreset.tpl via GitHuberik2011-03-221-5/+5
| | | * Edited view/sv/profile-in-netdir.tpl via GitHuberik2011-03-221-4/+4
| | | * Edited view/sv/profile-in-directory.tpl via GitHuberik2011-03-221-4/+4
| | | * Edited view/sv/profile-hide-friends.tpl via GitHuberik2011-03-221-4/+4
| | | * Edited view/sv/profile_tabs.tpl via GitHuberik2011-03-221-1/+1
| | | * Edited view/sv/profile_photo.tpl via GitHuberik2011-03-221-4/+4
| | | * Edited view/sv/profile_listing_header.tpl via GitHuberik2011-03-221-2/+1
| | | * Edited view/sv/profile_entry_default.tpl via GitHuberik2011-03-221-0/+1
| | | * Edited view/sv/profile_edit.tpl via GitHuberik2011-03-221-38/+38
| | | * Edited view/sv/profile_advanced.php via GitHuberik2011-03-221-20/+18
| | | * Edited view/sv/profile.php via GitHuberik2011-03-221-72/+71
| | | * Edited view/sv/passchanged_eml.tpl via GitHuberik2011-03-221-13/+11
| | | * Edited view/sv/pagetypes.tpl via GitHuberik2011-03-221-8/+8
| | | * Edited view/sv/msg-header.tpl via GitHuberik2011-03-221-1/+0
| | | * Edited view/sv/mail_received_text_body_eml.tpl via GitHuberik2011-03-221-4/+4
| | | * Edited view/sv/mail_received_html_body_eml.tpl via GitHuberik2011-03-221-5/+5
| | | * Edited view/sv/lostpass_eml.tpl via GitHuberik2011-03-221-20/+17
| | | * Edited view/sv/lostpass.tpl via GitHuberik2011-03-221-5/+4
| | | * Edited view/sv/jot-header.tpl via GitHuberik2011-03-221-1/+0
| | | * Edited view/sv/intros-top.tpl via GitHuberik2011-03-221-2/+1
| | | * Edited view/sv/intro_complete_eml.tpl via GitHuberik2011-03-221-15/+12
| | | * Edited view/sv/install_db.tpl via GitHuberik2011-03-221-9/+7
| | | * Edited view/sv/insecure_net.tpl via GitHuberik2011-03-221-3/+3
| | | * Edited view/sv/head.tpl via GitHuberik2011-03-221-3/+1
| | | * Edited view/sv/group_new.tpl via GitHuberik2011-03-221-3/+1
| | | * Edited view/sv/group_edit.tpl via GitHuberik2011-03-221-4/+4
| | | * Edited view/sv/friend_complete_eml.tpl via GitHuberik2011-03-221-15/+10
| | | * Edited view/sv/follow_notify_eml.tpl via GitHuberik2011-03-221-3/+3
| | | * Edited view/sv/directory_header.tpl via GitHuberik2011-03-221-1/+1
| | | * Edited view/sv/dfrn_req_confirm.tpl via GitHuberik2011-03-221-2/+2
| | | * Edited view/sv/cropbody.tpl via GitHuberik2011-03-221-2/+2
| | | * Edited view/sv/contact_edit.tpl via GitHuberik2011-03-221-4/+3
| | | * Edited view/sv/cmnt_received_eml.tpl via GitHuberik2011-03-221-0/+3
| | | * Edited view/sv/follow_notify_eml.tpl via GitHuberik2011-03-221-8/+6