aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'mike/master'Olivier Migeot2011-03-2864-825/+1248
|\
| * author collapse: close off before paginationFriendika2011-03-282-0/+9
| |
| * tweaks to author collapsingFriendika2011-03-271-3/+2
| |
| * collapse posts by same author (but not you).Friendika2011-03-272-2/+21
| |
| * wrong date order profile pageFriendika2011-03-271-1/+1
| |
| * comment collapsing, pagination wasn't advancing past 16Friendika2011-03-273-20/+121
| |
| * info pageFriendika2011-03-272-1/+48
| |
| * Merge branch 'tobiasd-master'Friendika2011-03-252-2/+2
| |\
| | * fixed wrong colors for linksTobias Diekershoff2011-03-251-1/+1
| | |
| | * Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-03-2561-806/+1070
| | |\
| | * \ Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-03-221-2/+2
| | |\ \
| | * \ \ Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-03-2254-2348/+3691
| | |\ \ \
| | * \ \ \ Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-03-196-153/+282
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-03-1887-1356/+7987
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-03-1721-12/+184
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge github.com:tobiasd/friendikaTobias Diekershoff2011-03-161-4/+0
| | |\ \ \ \ \ \ \
| | | * | | | | | | resolved some local git quirksTobias Diekershoff2011-03-131-4/+0
| | | | | | | | | |
| | * | | | | | | | Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-03-1628-65/+380
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-03-1341-128/+1675
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: addon/twitter/twitter.php
| | * | | | | | | | | fixed wrong library pathTobias Diekershoff2011-03-081-1/+1
| | | | | | | | | | |
| * | | | | | | | | | revupFriendika2011-03-251-1/+1
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: view/sv/insecure_net.tpl view/sv/jot-header.tpl view/sv/msg-header.tpl view/sv/profile_edit.tpl view/sv/profile_tabs.tpl view/sv/strings.php
| | * \ \ \ \ \ \ \ \ 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
| | | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 21:05:17 +0000