aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* preliminary qcomment support, [nosmile] tag to disable smiley processingfriendica2012-02-147-4/+45
* 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
* Merge branch 'pull'friendica2012-02-141-2/+7
|\
| * Merge pull request #35 from copyninja/masterVasudev Kamath2012-02-141-2/+7
| |\
| | * cry, foot in mouth, cool, undecided and embarassed smiley's are mappedVasudev Kamath2012-02-141-2/+7
| |/
* | revupfriendica2012-02-141-1/+1
* | delete mail message icon not brightening on hoverfriendica2012-02-141-1/+1
|/
* more contacts categorisation, page cleanupfriendica2012-02-132-5/+21
* proper tab selection when network or search is in effectfriendica2012-02-131-1/+1
* tabs and total count for contacts pagefriendica2012-02-133-26/+63
* updates to plugin docsfriendica2012-02-131-10/+30
* more stray quotesfriendica2012-02-137-7/+7
* make hr bbtag shareable, stray quote in duepuntozero wall_itemfriendica2012-02-133-2/+3
* poll structuresfriendica2012-02-133-2/+58
* Merge branch 'pull'friendica2012-02-1311-5/+1554
|\
| * green variation of the quattro themeTobias Diekershoff2012-02-135-0/+1503
| * Merge pull request #34 from fabrixxm/masterfabrixxm2012-02-136-5/+51
| |\
| | * Fix 'item not found' messageFabio Comuni2012-02-131-1/+1
| | * Merge remote-tracking branch 'friendica/master' into mobileFabio Comuni2012-02-1346-2785/+7678
| | |\ | | |/ | |/|
| | * quattro: pause iconFabio Comuni2012-02-132-0/+12
| | * reshare in "display" viewFabio Comuni2012-02-132-3/+16
| | * hidden jot in "display" to allow reshareFabio Comuni2012-02-103-3/+16
| | * quattro: add "view in context" link in search resultsFabio Comuni2012-02-101-1/+9
* | | hr bbcode tagfriendica2012-02-132-1/+2
* | | POST should be lowercase these daysfriendica2012-02-131-1/+1
|/ /
* | finish translation of 'xxxxx wrote:'friendica2012-02-121-2/+4
* | Merge pull request #33 from friendica/bbcodefriendica2012-02-121-13/+62
|\ \
| * \ Merge branch 'master' into bbcodeAbinoam P. Marques Jr2012-02-126-2673/+2887
| |\ \ | |/ / |/| |
* | | make 'x minutes ago' fully translateable with argument ordering. string update.friendica2012-02-123-2670/+2879
* | | bug #281friendica2012-02-123-3/+8
| * | 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 pull request #32 from copyninja/mastertobiasd2012-02-121-3/+7
|\ \
| * \ 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
|/ /
* | refresh contact record after setting changefriendica2012-02-111-0/+8
* | kissing smilie may need escaping (thanks - Abinoam)friendica2012-02-111-1/+2
* | bug #279, add network selector widget to contacts pagefriendica2012-02-111-1/+6
* | fix link/bookmark resharesfriendica2012-02-113-1/+17
* | bug #278 show only blocked contactsfriendica2012-02-112-6/+16
* | Merge branch 'pull'friendica2012-02-115-5/+153
|\ \