aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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: ↵jeroenpraat2014-05-121-1/+1
| | | | https://redmatrix.nl/channel/jeroenpraat/?f=&mid=00eeea0d6df910aa92a02bcd292cf0b9e5f918281e34a771eddc485085e4ba0a@redmatrix.nl&zid=jeroenpraat%40redmatrix.nl
* make comment_indent an option and removeitem_opacity as it is not working ↵marijus2014-05-123-7/+6
| | | | properly at the current state - we have got item background opacity now (allthough not yet for custom colors because the colorpicker does not work with rgba colors). Reset left comment border width to 3px as it is barely visible otherwise.
* 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.po
| * modified: view/ru/messages.popixelroot2014-05-122-5308/+5945
| | | | | | | | modified: view/ru/strings.php
* | 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 ↵friendica2014-05-112-6/+20
| | | | | | | | out because the array storage is kindof weird so the first try (assuming simple arrays) didn't work out. I'll have to rethink how to index these things and may have to rewrite the js() function to do the kinds of things I want.
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-05-117-17/+103
|\ \
| * \ Merge pull request #456 from cvogeley/masterRedMatrix2014-05-123-8/+59
| |\ \ | | | | | | | | Move "boxy" conversation design into a schema file
| | * | 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
| | | | | | | | | | | | | | | | Default design is now again basically the previous one
| | * | another experimentChristian Vogeley2014-05-101-5/+9
| | | |
| * | | Merge pull request #455 from encyclomundi/masterRedMatrix2014-05-111-1/+1
| |\ \ \ | | | | | | | | | | correct minor typo
| | * | | correct minor typoCharles2014-05-101-1/+1
| | | | |
| * | | | Merge pull request #454 from chriswinstead/masterRedMatrix2014-05-114-8/+43
| |\ \ \ \ | | |_|/ / | |/| | | Detect high-resolution displays (like retina) and serve higher resolution photo thumbnails
| | * | | 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 ↵root2014-05-102-1/+37
| | | | | | | | | | | | | | | | | | | | pixel density.
| | * | | Merge branch 'master' of https://github.com/chriswinstead/redroot2014-05-1026-6154/+6313
| | |\ \ \ | | |/ / / | |/| | |
| | * | | Made some changes to img tags to enforce max-width everywhere, and to the ↵root2014-05-073-8/+8
| | | | | | | | | | | | | | | | | | | | page headers to allow user scaling.
* | | | | button styling mitemlistfriendica2014-05-113-2/+6
| | | | |
* | | | | Merge https://github.com/friendica/red into pending_mergefriendica2014-05-101-0/+24
|\| | | |
| * | | | Merge pull request #453 from unary/bbcodeRedMatrix2014-05-101-0/+24
| |\ \ \ \ | | | | | | | | | | | | add support for h1, h2, etc. to bbcode
| | * | | | add support for h1, h2, etc. to bbcodeMichael Johnston2014-05-101-0/+24
| |/ / / /