Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | cleaned up photo_menu check and explanation | Friendika | 2011-04-04 | 1 | -16/+14 |
| | |||||
* | Merge branch 'erikl-master' | Friendika | 2011-04-04 | 6 | -192/+166 |
|\ | | | | | | | | | Conflicts: view/sv/settings.tpl | ||||
| * | Merge branch 'master' of https://github.com/erikl/friendika into erikl-master | Friendika | 2011-04-04 | 6 | -190/+180 |
| |\ | |||||
| | * | Edited view/sv/pagetypes.tpl via GitHub | erik | 2011-04-04 | 1 | -6/+5 |
| | | | |||||
| | * | Edited view/sv/strings.php via GitHub | erik | 2011-04-04 | 1 | -139/+116 |
| | | | |||||
| | * | Edited view/sv/strings.php via GitHub | erik | 2011-04-03 | 1 | -1/+1 |
| | | | |||||
| | * | Edited view/sv/strings.php via GitHub | erik | 2011-04-01 | 1 | -64/+64 |
| | | | |||||
| | * | Edited view/sv/settings.tpl via GitHub | erik | 2011-03-29 | 1 | -1/+1 |
| | | | |||||
| | * | Edited view/sv/profile_edit.tpl via GitHub | erik | 2011-03-29 | 1 | -1/+1 |
| | | | |||||
| | * | Edited view/sv/settings.tpl via GitHub | erik | 2011-03-29 | 1 | -3/+18 |
| | | | |||||
| | * | Edited view/sv/register_open_eml.tpl via GitHub | erik | 2011-03-29 | 1 | -1/+1 |
| | | | |||||
| | * | Edited view/sv/register_verify_eml.tpl via GitHub | erik | 2011-03-26 | 1 | -1/+1 |
| | | | |||||
| | * | Edited view/sv/register_verify_eml.tpl via GitHub | erik | 2011-03-26 | 1 | -2/+1 |
| | | | |||||
* | | | revup | Friendika | 2011-04-04 | 1 | -1/+1 |
| | | | |||||
* | | | make photo menu work better on remote profile logins | Friendika | 2011-04-04 | 2 | -3/+9 |
| | | | |||||
* | | | remote profile photo menu fix | Friendika | 2011-04-04 | 1 | -2/+2 |
| | | | |||||
* | | | Merge branch 'fabrixxm-iconpopup' | Friendika | 2011-04-04 | 1 | -5/+9 |
|\ \ \ | |||||
| * \ \ | Merge branch 'iconpopup' of https://github.com/fabrixxm/friendika into ↵ | Friendika | 2011-04-04 | 1 | -5/+9 |
| |\ \ \ | | | | | | | | | | | | | | | | fabrixxm-iconpopup | ||||
| | * | | | show "edit contact" and "sent PM" only to local user | Fabio Comuni | 2011-04-04 | 1 | -5/+9 |
| | | | | | |||||
* | | | | | item_photo_menu to display page | Friendika | 2011-04-04 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | missed merge conflict tag | Friendika | 2011-04-04 | 1 | -4/+0 |
|/ / / / | |||||
* | | | | Merge branch 'iconpopup' of https://github.com/fabrixxm/friendika into ↵ | Friendika | 2011-04-04 | 12 | -7/+163 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | fabrixxm-iconpopup Conflicts: mod/dfrn_poll.php | ||||
| * | | | add popupmenu links to status, profile and photos if contact is in dfrn | Fabio Comuni | 2011-04-04 | 1 | -3/+16 |
| | | | | |||||
| * | | | fix profile redirect url in dfrn_poll | Fabio Comuni | 2011-04-04 | 1 | -2/+3 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'friendika-master/master' into iconpopup | Fabio Comuni | 2011-04-04 | 21 | -130/+401 |
| |\ \ \ | |||||
| * | | | | put popupmenu above all | Fabio Comuni | 2011-04-04 | 2 | -0/+2 |
| | | | | | |||||
| * | | | | \"View profile\" send to user profile page and not to tab. | Fabio Comuni | 2011-04-01 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | fix typo | Fabio Comuni | 2011-04-01 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | popup styles to loozah theme | Fabio Comuni | 2011-03-31 | 2 | -0/+29 |
| | | | | | |||||
| * | | | | url \"/message/new/<id>\" preselect contact <id> in \"To\" select box | Fabio Comuni | 2011-03-31 | 1 | -1/+3 |
| | | | | | |||||
| * | | | | Moved popup logic in boot.php, added 'item_photo_menu' hook | Fabio Comuni | 2011-03-31 | 7 | -12/+72 |
| | | | | | |||||
| * | | | | first work | Fabio Comuni | 2011-03-30 | 4 | -3/+50 |
| | | | | | |||||
| * | | | | Merge remote-tracking branch 'friendika-master/master' | Fabio Comuni | 2011-03-30 | 55 | -2022/+1506 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge remote-tracking branch 'origin/master' | Fabio Comuni | 2011-03-30 | 1 | -3/+3 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge remote-tracking branch 'friendika-master/master' | Fabio Comuni | 2011-03-29 | 34 | -353/+608 |
| |\ \ \ \ \ \ | |||||
* | | | | | | | | profile not set | Friendika | 2011-04-04 | 3 | -3/+5 |
| |_|_|_|/ / / |/| | | | | | | |||||
* | | | | | | | Public exposure warning on affected network group pages. config-able so a ↵ | Friendika | 2011-04-03 | 4 | -7/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | plugin can shut it up. | ||||
* | | | | | | | user language storage | Friendika | 2011-04-01 | 3 | -3/+5 |
| | | | | | | | |||||
* | | | | | | | allow other destinations according to protocol | Friendika | 2011-04-01 | 2 | -4/+6 |
| | | | | | | | |||||
* | | | | | | | redirect to symbolic rather than absolute URL locations | Friendika | 2011-04-01 | 2 | -4/+19 |
| | | | | | | | |||||
* | | | | | | | translateable time formats (PM & birthdays) | Friendika | 2011-03-31 | 2 | -5/+3 |
| | | | | | | | |||||
* | | | | | | | change language dynamically - bound to F8 key | Friendika | 2011-03-31 | 6 | -0/+64 |
| | | | | | | | |||||
* | | | | | | | remote deletion - check contact-id | Friendika | 2011-03-30 | 1 | -2/+5 |
| | | | | | | | |||||
* | | | | | | | bug #29 - commas not linkified | Friendika | 2011-03-30 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | dfrn remote profile protocol revision | Friendika | 2011-03-30 | 5 | -13/+87 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'omigeot-master' | Friendika | 2011-03-30 | 3 | -99/+194 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Some corrections to PO workflow, and integrated latest templates ↵ | Olivier Migeot | 2011-03-30 | 3 | -99/+194 |
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | "stringization" for french. | ||||
* / | | | | | | revup | Friendika | 2011-03-30 | 1 | -1/+1 |
|/ / / / / / | |||||
* | | | | | | undo last commit | Friendika | 2011-03-30 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | increase suhosin $_GET length limit | Friendika | 2011-03-30 | 1 | -0/+2 |
| | | | | | |