aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* 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
* | Handling nested bbcodes. Some small design changes in html2bbcode. Change in ...Michael2012-02-193-23/+35
* | Brand new html2bbcode. Some other changes in diaspora to bbcode handlingMichael2012-02-193-158/+322
|/
* add :headdesk and fix doc/Pages.md to remove the absolute URL to /Simon L'nu2012-02-191-0/+2
* change notify messages for webfriendica2012-02-181-3/+12
* new notifications - implement storagefriendica2012-02-183-6/+31
* deprecating two-char smiliesfriendica2012-02-171-10/+10
* oembed: revert changes from 48f5bd492dFabio Comuni2012-02-171-5/+0
* naked link with no protocol being passed from Diasporafriendica2012-02-161-0/+5
* a few fixes for offsite community membersfriendica2012-02-163-6/+35
* facepalm smileyfriendica2012-02-161-0/+2
* another sql typofriendica2012-02-161-1/+1
* sql typo in auto-friend with D*friendica2012-02-152-2/+2
* quick commentsfriendica2012-02-151-2/+3
* encode email headers on message deliveriesfriendica2012-02-152-7/+8
* Merge pull request #36 from fabrixxm/masterfabrixxm2012-02-151-2/+2
|\
| * quattro: icons for attachmentsFabio Comuni2012-02-151-2/+2