aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix 'item not found' messageFabio Comuni2012-02-131-1/+1
* Merge remote-tracking branch 'friendica/master' into mobileFabio Comuni2012-02-1346-2785/+7678
|\
| * 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
| |\
| | * fpostit by Devlon Duthied added to utilsTobias Diekershoff2012-02-114-0/+148
| | * bug #270 - solvedAbinoam P. Marques Jr2012-02-101-5/+5
| * | show tags (pub_keywords) in advanced profilefriendica2012-02-113-2/+21
| |/
| * db installation syncfriendica2012-02-104-3/+22
| * send notify emails to community pages as well as peoplefriendica2012-02-101-30/+32
| * bug #274friendica2012-02-091-17/+21
| * item tag notificationsfriendica2012-02-093-23/+43
| * add render_location hook to both sets of conversationsfriendica2012-02-091-11/+5
| * Merge branch 'pull'friendica2012-02-091-1/+31
| |\
| | * Merge pull request #30 from Keith2/masterKeith Fernie2012-02-091-1/+31
| | |\
| | | * modified: library/slinky.php Set up tabs in code correctly.Keith Fernie2012-02-091-16/+16
| | | * modified: library/slinky.php Added a custom YourLS shortener to the availa...Keith Fernie2012-02-091-1/+31
| * | | edit post not working after plaintext editor fixes, missing some recent edito...friendica2012-02-093-7/+16
| * | | bug #273 - no $baseurl variable expansion in install templatefriendica2012-02-091-0/+1
| |/ /
| * | render_location hookfriendica2012-02-091-8/+17
| * | add tag notifications to enotifyfriendica2012-02-092-9/+28
| |/
| * Merge branch 'pull'friendica2012-02-081-0/+5
| |\
| | * Install note about PHP path.Abinoam P. Marques Jr2012-02-081-0/+5
| * | if removing a contact after viewing the third page of contacts, go back to pa...friendica2012-02-081-2/+5
| |/
| * fix apps sub-menu on quattro and vierfriendica2012-02-082-1/+1
| * Merge branch 'pull'friendica2012-02-0813-1/+4297
| |\
| | * quattro: added delete button to mail list overviewTobias Diekershoff2012-02-082-34/+13
| | * quattro: added delete buttons to groups and contactsTobias Diekershoff2012-02-082-0/+44
| | * quattro: group member selection stylingTobias Diekershoff2012-02-082-0/+69