aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* "vier": The contacts are now working again. Line break before closing ↵Michael2012-02-255-22/+289
| | | | bbcodes removed.
* Bug fixed where mails where nearly empty. HTML mails can now be received.Michael2012-02-251-62/+78
|
* multipart messages complete, message-id conversion done.Michael2012-02-254-20/+29
|
* Sending mail as multipart/alternative (html and plain text) (very basic by now)Michael2012-02-243-27/+51
|
* Encoding for incoming mails. Fixed invalid message id (with side effect at ↵Michael2012-02-247-23/+411
| | | | the moment). Sending mail as text mail. Encoding name when importing mail contact.
* GIT problems ...Michael2012-02-231-8/+1
|
* Merge remote branch 'upstream/master'Michael2012-02-2367-286/+871
|\ | | | | | | | | Conflicts: include/bbcode.php
| * Merge pull request #47 from fabrixxm/masterSimon2012-02-232-4/+5
| |\ | | | | | | quattro: fix typos
| | * Merge remote-tracking branch 'friendica/master'Fabio Comuni2012-02-231-21/+0
| | |\ | | |/ | |/|
| * | quattro-green: removed contact_template.tplTobias Diekershoff2012-02-231-21/+0
| | |
| | * Merge remote-tracking branch 'friendica/master'Fabio Comuni2012-02-233-23/+43
| | |\ | | |/ | |/|
| * | green-quattro: applied a color for shiny class and previewTobias Diekershoff2012-02-232-22/+42
| | |
| * | Merge pull request #46 from fabrixxm/masterfabrixxm2012-02-2315-134/+273
| |\ \ | | | | | | | | more work on quattro theme and less html in php
| * | | fix img tag with size attributeTobias Diekershoff2012-02-231-1/+1
| | | |
| | | * quattro: fix typosFabio Comuni2012-02-232-4/+5
| | |/
| | * quattro post preview, style contacts pages, style for "shiny" class, fix ↵Fabio Comuni2012-02-2315-134/+273
| |/ | | | | | | | | | | | | contacts list in profile aside. remove html from viewcontacts.php and contacts.php use contact_template.tpl to print contacts also in viewcontacts
| * Merge branch 'master' into notifyfriendica2012-02-235-5/+155
| |\
| | * Merge branch 'master' of https://github.com/friendica/friendicaTobias Diekershoff2012-02-232-5/+2
| | |\
| | | * README file shortened because this was for my branch only.Michael Vogel2012-02-231-3/+0
| | | |
| | | * Removed the export of markdown articles. That was for testing purposes only.Michael Vogel2012-02-231-2/+2
| | | |
| | * | quattro: added styling to pivate message viewTobias Diekershoff2012-02-233-0/+153
| | |/
| * | more theme notify fixesfriendica2012-02-232-1/+2
| | |
| * | new notify sort of working in testbubblefriendica2012-02-226-3/+52
| | |
| * | Merge branch 'master' into notifyfriendica2012-02-2223-704/+1377
| |\|
| | * nested quote check fails to account for strpos returning position 0friendica2012-02-221-2/+2
| | |
| | * restore poller normal operationfriendica2012-02-221-2/+2
| | |
| | * Merge pull request #45 from annando/masterfriendica2012-02-2216-689/+1257
| | |\ | | | | | | | | New HTML to BBCode converter, changes to BBCode, nginx support, ...
| | * \ Merge branch 'pull'friendica2012-02-221-1/+1
| | |\ \
| | | * \ Merge pull request #44 from simonlnu/masterfriendica2012-02-221-1/+1
| | | |\ \ | | | | | | | | | | | | minor doc fix. there will be more ;)
| | | | * | clean up Groups help file. there was a stray 'Freindika' in itSimon L'nu2012-02-221-1/+1
| | | |/ / | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | * | | allow forum posts by followers on Diasporafriendica2012-02-222-8/+20
| | | | |
| | * | | never enough documentationfriendica2012-02-221-0/+9
| | |/ /
| | * | waitman gobble media upload via api patchfriendica2012-02-212-5/+61
| | | |
| | * | escape smiley conversion in code and pre blocksfriendica2012-02-211-0/+17
| | | |
| | * | mark all notifications readfriendica2012-02-213-3/+14
| | | |
| * | | some cleanup of tb notificationsfriendica2012-02-212-1/+6
| | | |
| * | | new notificationsfriendica2012-02-211-0/+25
| | | |
| * | | add full email link to notificationfriendica2012-02-211-3/+3
| |/ /
| * | Merge branch 'pull'friendica2012-02-211-2/+26
| |\ \
| | * \ Merge pull request #43 from fabrixxm/masterfabrixxm2012-02-211-2/+26
| | |\ \ | | | | | | | | | | Add support for variable filters in template
| | | * | template: add support for variable filtersFabio Comuni2012-02-211-2/+26
| | |/ /
| * / / logger_debug was used as string instead of constantfriendica2012-02-212-6/+6
| |/ /
| * | fill in notify msg with redirect link after we get the idfriendica2012-02-211-9/+16
| | |
| * | more cleanup of community followup detection. Remote worked well but local ↵friendica2012-02-201-4/+13
| | | | | | | | | | | | didn't.
| * | email notify now redirected through mod_notify, weirdness in local deliver ↵friendica2012-02-206-7/+72
| | | | | | | | | | | | caused by community page changes
| * | Merge branch 'pull'friendica2012-02-2027-51/+50
| |\ \
| | * \ Merge pull request #42 from friendica/ka2ca-rebasedfriendica2012-02-2025-45/+45
| | |\ \ | | | | | | | | | | Replaced some ocurrences of Friendika --> Friendica
| | | * | view/admin_remoteupdate.tpl - Friendika -> FriendicaAbinoam P. Marques Jr2012-02-201-2/+2
| | | | |
| | | * | util/README - Friendika -> FriendicaAbinoam P. Marques Jr2012-02-201-1/+1
| | | | |
| | | * | htconfig.tpl - Friendika -> FriendicaAbinoam P. Marques Jr2012-02-208-15/+15
| | | | |