aboutsummaryrefslogtreecommitdiffstats
path: root/include/text.php
Commit message (Expand)AuthorAgeFilesLines
* use zrl to get home againfriendica2012-03-291-0/+2
* Merge commit 'upstream/master'Michael Vogel2012-03-281-26/+28
|\
| * filer: info() on item filedFabio Comuni2012-03-281-0/+1
| * ability to change tags in edited postsfriendica2012-03-221-0/+13
| * support lowercase :-p smiliefriendica2012-03-211-0/+2
| * modified: include/text.phpThomas2012-03-191-3/+2
| * modified: include/text.phpThomas2012-03-191-21/+0
| * some openid fixes, use identity url from openid server and normalise it.friendica2012-03-191-0/+3
| * support "no_smilies"friendica2012-03-191-0/+5
| * bug #337, call template_unescape() only at the end of template processingfriendica2012-03-171-1/+1
| * bug #335 network search broken after new ssl policy settingsfriendica2012-03-161-1/+1
* | Quotes with author are now having an "open/close" linkMichael Vogel2012-03-171-2/+13
* | New bbcode element: "spoiler". Mail: Top post quotes are now embraced in "spo...Michael Vogel2012-03-171-0/+19
|/
* Merge commit 'upstream/master'Michael Vogel2012-03-151-0/+101
|\
| * more work on filer, comment level and file tag removalfriendica2012-03-131-4/+5
| * file as widget and basic filing implementation for duepuntozero,slackrfriendica2012-03-131-1/+1
| * initial tag display for categories and save-to-file - suitable for testing bu...friendica2012-03-131-0/+27
| * more save to file backendfriendica2012-03-111-1/+55
| * backend for "save to file" featurefriendica2012-03-111-0/+19
* | Cache: item cache now has an autodelete of old files. The pages plugin now se...Michael Vogel2012-03-111-1/+1
* | Caching improved.Michael Vogel2012-03-101-13/+11
* | Enabled Caching for items. Changed color of tags in diabook.Michael Vogel2012-03-101-1/+16
|/
* Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-061-2/+2
* Fixed...merged with mainline THEN added beards.Thomas2012-03-061-5/+36
* added beard smileysThomas2012-03-061-35/+8
* remove "smilie" expansion for Diaspora logofriendica2012-03-061-2/+2
* template proc: first optimizationFabio Comuni2012-03-021-1/+7
* expand multiple heart smilies e.g. <3333friendica2012-03-021-0/+12
* yet more work on notificationsfriendica2012-02-291-0/+13
* BugfixTobias Hößl2012-02-261-1/+1
* never enough documentationfriendica2012-02-221-0/+9
* escape smiley conversion in code and pre blocksfriendica2012-02-211-0/+17
* Merge branch 'pull'friendica2012-02-201-1/+1
|\
| * text.php - Friendika -> Friendica (just to prepare for deprecate the friendik...Abinoam P. Marques Jr2012-02-201-1/+1
* | fix twitter title showing up occasionallyfriendica2012-02-201-3/+1
|/
* add :headdesk and fix doc/Pages.md to remove the absolute URL to /Simon L'nu2012-02-191-0/+2
* deprecating two-char smiliesfriendica2012-02-171-10/+10
* facepalm smileyfriendica2012-02-161-0/+2
* 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-141-1/+4
* | 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
|/
* bug #281friendica2012-02-121-2/+4
* 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
|/
* kissing smilie may need escaping (thanks - Abinoam)friendica2012-02-111-1/+2
* :coffee extended smiliefriendica2012-02-071-1/+2
* beer smiliefriendica2012-02-071-3/+3