aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * Merge branch 'master' of https://github.com/friendica/friendicaTobias Diekershoff2012-02-081-3/+1
| |\
| * | added theme "vier" by Michael VogelTobias Diekershoff2012-02-0811-0/+4204
* | | begin cmin, cmaxfriendica2012-02-082-2/+8
| |/ |/|
* | browser being sent to update_communityfriendica2012-02-081-3/+1
|/
* make individual advanced profile items addressable via script or pluginfriendica2012-02-071-19/+19
* :coffee extended smiliefriendica2012-02-072-1/+2
* beer smiliefriendica2012-02-072-4/+4
* don't link tags enclosed inside Diaspora linksfriendica2012-02-071-0/+26
* more fixes for textmodefriendica2012-02-074-24/+126
* basic support for plaintext editor configuration (disable tinymce), currently...friendica2012-02-062-95/+121
* add toggle to choose sending "friends with" activity even if contact is not h...friendica2012-02-064-47/+54
* beerfriendica2012-02-062-0/+4
* style missing on crepair-namefriendica2012-02-051-0/+2
* Merge branch 'master' into spamfriendica2012-02-052-4/+5
|\
| * roll update 1118 forward, enable update 1119friendica2012-02-052-4/+5
* | Merge branch 'master' into spamfriendica2012-02-042-3/+3
|\|