aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'upstream/master'Michael2012-02-268-64/+222
|\
| * show experimental and unsupported theme status on theme admin pagefriendica2012-02-261-1/+8
| * Comment notifications by e-mail now are threadedAbinoam P. Marques Jr2012-02-251-6/+50
| * include/items.php pass 'parent' to notificationAbinoam P. Marques Jr2012-02-251-3/+7
| * scale external imagesfriendica2012-02-253-37/+47
| * theme info (like plugin info)friendica2012-02-251-2/+66
| * string update for 2.38friendica2012-02-241-0/+3
| * update author name across items if changed.friendica2012-02-241-1/+17
| * attribution issue - don't take author name from contact if available from item.friendica2012-02-243-14/+24
* | poller.php: Test for moving to archive, vier-style: notifications fixedMichael2012-02-251-1/+11
* | "vier": The contacts are now working again. Line break before closing bbcodes...Michael2012-02-251-2/+2
* | 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 th...Michael2012-02-247-23/+411
* | GIT problems ...Michael2012-02-231-8/+1
* | Merge remote branch 'upstream/master'Michael2012-02-2313-46/+205
|\|
| * fix img tag with size attributeTobias Diekershoff2012-02-231-1/+1
| * Merge branch 'master' into notifyfriendica2012-02-231-2/+2
| |\
| | * Removed the export of markdown articles. That was for testing purposes only.Michael Vogel2012-02-231-2/+2
| * | more theme notify fixesfriendica2012-02-231-1/+1
| * | new notify sort of working in testbubblefriendica2012-02-222-2/+3
| * | Merge branch 'master' into notifyfriendica2012-02-228-190/+470
| |\|
| | * 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-225-182/+381
| | |\
| | * | allow forum posts by followers on Diasporafriendica2012-02-221-7/+19
| | * | never enough documentationfriendica2012-02-221-0/+9
| | * | waitman gobble media upload via api patchfriendica2012-02-211-1/+43
| | * | escape smiley conversion in code and pre blocksfriendica2012-02-211-0/+17
| | * | mark all notifications readfriendica2012-02-211-2/+3
| * | | add full email link to notificationfriendica2012-02-211-3/+3
| |/ /
| * | template: add support for variable filtersFabio Comuni2012-02-211-2/+26
| * | 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 di...friendica2012-02-201-4/+13
| * | email notify now redirected through mod_notify, weirdness in local deliver ca...friendica2012-02-202-5/+35
| * | Merge branch 'pull'friendica2012-02-206-8/+8
| |\ \
| | * | include/nav.php - Friendika -> FriendicaAbinoam P. Marques Jr2012-02-201-1/+1
| | * | include/api.php - Friendika -> FriendicaAbinoam P. Marques Jr2012-02-201-3/+3
| | * | poller.php - Friendika -> FriendicaAbinoam P. Marques Jr2012-02-201-1/+1
| | * | acl_selectors.php - Friendika -> FriendicaAbinoam P. Marques Jr2012-02-201-1/+1
| | * | text.php - Friendika -> Friendica (just to prepare for deprecate the friendik...Abinoam P. Marques Jr2012-02-201-1/+1
| | * | Scrape.php - Friendika -> FriendicaAbinoam P. Marques Jr2012-02-201-1/+1
| * | | fix twitter title showing up occasionallyfriendica2012-02-202-5/+3
| * | | include item links in web notification messagesfriendica2012-02-191-7/+8
| |/ /
* | / bbcode.php: A list or quote at the beginning wasn't detectedMichael2012-02-231-3/+3
| |/ |/|
* | German translation more gender friendly. Some more logging in poller.phpMichael2012-02-221-5/+20
* | Some testing stuffMichael2012-02-202-1/+2
* | API is now working on my nginx server.Michael2012-02-202-11/+19
* | New version of markdown. Playing with stylesheet. Testing line breaks.root2012-02-191-7/+6