aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* first apd filesfriendica2014-05-153-0/+10
* the app menu takes formfriendica2014-05-153-15/+59
* apps: provide a default photo if none was set. For now it's the default profi...friendica2014-05-151-1/+14
* some backend stuff for appsfriendica2014-05-154-9/+77
* clear the jot-nets floatfriendica2014-05-142-2/+2
* doc updatesfriendica2014-05-142-0/+2
* major cleanup of choklet+bannertwofriendica2014-05-141-1/+5
* Merge branch 'navbacker'friendica2014-05-147-13/+51
|\
| * fix fluid layout for choklet_bannertwofriendica2014-05-147-18/+43
| * this doesn't really workfriendica2014-05-143-3/+16
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-05-141-5/+6
|\ \
| * | whitespacemarijus2014-05-141-6/+6
| * | colorpicker: enable rgba for for item and comment colorsmarijus2014-05-141-1/+2
| |/
* / explain default permissions choices betterfriendica2014-05-141-2/+13
|/
* fix author delete (non-owner)friendica2014-05-141-3/+3
* xss preventionfriendica2014-05-143-1/+8
* more choklet workfriendica2014-05-131-0/+48
* choklet tweaksfriendica2014-05-132-2/+3
* add photo widgetfriendica2014-05-132-10/+57
* add activity_received hookfriendica2014-05-131-0/+3
* zrlify (turn into zmg) any relevant img tags in a post.friendica2014-05-132-0/+30
* allow jgrowl 'close all' message to be translatedfriendica2014-05-133-0/+3
* fix ca anomalyfriendica2014-05-131-1/+1
* missing parenfriendica2014-05-1312-12/+12
* forbid redefinition of language plural_select functionfriendica2014-05-1313-14/+26
* update the tagging docofriendica2014-05-121-5/+50
* try to fix random logoutsfriendica2014-05-123-3/+7
* Docu update: https://redmatrix.nl/channel/jeroenpraat/?f=&mid=00eeea0d6df910a...jeroenpraat2014-05-121-1/+1
* make comment_indent an option and removeitem_opacity as it is not working pro...marijus2014-05-123-7/+6
* fix bootstrap override position issue with dropdown menumarijus2014-05-121-17/+0
* Typomarijus2014-05-121-2/+2
* Merge pull request #458 from pixelroot/masterRedMatrix2014-05-122-5308/+5945
|\
| * modified: view/ru/messages.popixelroot2014-05-122-5308/+5945
* | log IP mis-matches even if paranoia isn't set.friendica2014-05-111-7/+8
* | a bit more progress on using shred to pick through API results. Commented out...friendica2014-05-112-6/+20
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-05-117-17/+103
|\ \
| * \ Merge pull request #456 from cvogeley/masterRedMatrix2014-05-123-8/+59
| |\ \
| | * | grrrChristian Vogeley2014-05-111-1/+1
| | * | For the moment last changeChristian Vogeley2014-05-111-5/+7
| | * | saved 2Christian Vogeley2014-05-111-1/+1
| | * | savedChristian Vogeley2014-05-111-0/+9
| | * | some corrections and cleanupChristian Vogeley2014-05-112-5/+8
| | * | Move "boxy" conversation design into a schema fileChristian Vogeley2014-05-113-8/+41
| | * | another experimentChristian Vogeley2014-05-101-5/+9
| * | | Merge pull request #455 from encyclomundi/masterRedMatrix2014-05-111-1/+1
| |\ \ \
| | * | | correct minor typoCharles2014-05-101-1/+1
| * | | | Merge pull request #454 from chriswinstead/masterRedMatrix2014-05-114-8/+43
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Removed some unnecessary changes.root2014-05-102-2/+2
| | * | | Changed some comments.root2014-05-101-2/+1
| | * | | Made code changes to serve higher resolution images in displays with high pix...root2014-05-102-1/+37