aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | Moved popup logic in boot.php, added 'item_photo_menu' hookFabio Comuni2011-03-317-12/+72
| * | | | first workFabio Comuni2011-03-304-3/+50
| * | | | Merge remote-tracking branch 'friendika-master/master'Fabio Comuni2011-03-3055-2022/+1506
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/master'Fabio Comuni2011-03-301-3/+3
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'friendika-master/master'Fabio Comuni2011-03-2934-353/+608
| |\ \ \ \ \ \
* | | | | | | | profile not setFriendika2011-04-043-3/+5
| |_|_|_|/ / / |/| | | | | |
* | | | | | | Public exposure warning on affected network group pages. config-able so a plu...Friendika2011-04-034-7/+26
* | | | | | | user language storageFriendika2011-04-013-3/+5
* | | | | | | allow other destinations according to protocolFriendika2011-04-012-4/+6
* | | | | | | redirect to symbolic rather than absolute URL locationsFriendika2011-04-012-4/+19
* | | | | | | translateable time formats (PM & birthdays)Friendika2011-03-312-5/+3
* | | | | | | change language dynamically - bound to F8 keyFriendika2011-03-316-0/+64
* | | | | | | remote deletion - check contact-idFriendika2011-03-301-2/+5
* | | | | | | bug #29 - commas not linkifiedFriendika2011-03-301-1/+1
* | | | | | | dfrn remote profile protocol revisionFriendika2011-03-305-13/+87
* | | | | | | Merge branch 'omigeot-master'Friendika2011-03-303-99/+194
|\ \ \ \ \ \ \
| * | | | | | | Some corrections to PO workflow, and integrated latest templates "stringizati...Olivier Migeot2011-03-303-99/+194
| | |_|_|/ / / | |/| | | | |
* / | | | | | revupFriendika2011-03-301-1/+1
|/ / / / / /
* | | | | | undo last commitFriendika2011-03-301-1/+1
* | | | | | increase suhosin $_GET length limitFriendika2011-03-301-0/+2
* | | | | | placeholder arg in dfrn conversationsFriendika2011-03-304-5/+5