aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* 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
|/
* 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
* | preliminary qcomment support, [nosmile] tag to disable smiley processingfriendica2012-02-144-4/+13
* | localise links to private photos inside messagesfriendica2012-02-141-0/+22
* | refactor smilie code to allow for extensions and generation of a table of the...friendica2012-02-141-13/+58
* | cry, foot in mouth, cool, undecided and embarassed smiley's are mappedVasudev Kamath2012-02-141-2/+7
* | make hr bbtag shareable, stray quote in duepuntozero wall_itemfriendica2012-02-131-1/+0
* | Merge branch 'pull'friendica2012-02-131-3/+9
|\|
| * Merge remote-tracking branch 'friendica/master' into mobileFabio Comuni2012-02-139-85/+201
| |\
| * | hidden jot in "display" to allow reshareFabio Comuni2012-02-101-3/+9
* | | hr bbcode tagfriendica2012-02-131-0/+1
| |/ |/|
* | finish translation of 'xxxxx wrote:'friendica2012-02-121-2/+4
* | Merge branch 'master' into bbcodeAbinoam P. Marques Jr2012-02-124-7/+13
|\ \
| * | make 'x minutes ago' fully translateable with argument ordering. string update.friendica2012-02-122-5/+6
| * | bug #281friendica2012-02-122-2/+7
* | | Added [th] bbcode tag support.Abinoam P. Marques Jr2012-02-121-0/+1
* | | Fixed bbcode [li] and [*] handling.Abinoam P. Marques Jr2012-02-121-7/+2
* | | Added [quote=Name] bbcode support.Abinoam P. Marques Jr2012-02-121-1/+7
* | | Added [center] bbcode support.Abinoam P. Marques Jr2012-02-121-0/+3
* | | BBCode [size=50] --> font-size: 50px (with the unit px).Abinoam P. Marques Jr2012-02-121-0/+2
* | | Added support to [noparse], [nobb] and [pre] as bbcode escape tags.Abinoam P. Marques Jr2012-02-121-0/+34
* | | Added support for [ol] standard ordered list bbcode.Abinoam P. Marques Jr2012-02-121-0/+2
* | | Added support for [ul] standard unordered list bbcode.Abinoam P. Marques Jr2012-02-121-1/+3
* | | Regexp fix for [LIST=i], [list=i], [LIST=I] and [LIST=i] bbcodesAbinoam P. Marques Jr2012-02-121-4/+8
|/ /
* | Merge branch 'master' of git://github.com/friendica/friendicaVasudev Kamath2012-02-121-1/+3
|\ \
| * | do not display contact_block if config for num shown is 0friendica2012-02-111-1/+3
* | | ;) :D and :-O are also enabled for wink laugh and surprised smiley'sVasudev Kamath2012-02-121-3/+7
|/ /