aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | 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
| |/ / / / /
* / / / / / issue #452friendica2014-05-091-1/+2
|/ / / / /
* | | | | Merge https://github.com/friendica/red into pending_mergefriendica2014-05-092-11/+11
|\ \ \ \ \
| * \ \ \ \ Merge pull request #450 from tuscanhobbit/masterPaolo T2014-05-092-11/+11
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | IT: strings updated
| | * | | | IT: strings updatedPaolo Tacconi2014-05-092-11/+11
| |/ / / /
* | | | | better button theming on oauth connected apps pagefriendica2014-05-093-413/+420
| | | | |
* | | | | doc updatesfriendica2014-05-095-6/+6
|/ / / /
* | | | Merge https://github.com/friendica/red into pending_mergefriendica2014-05-083-24/+37
|\ \ \ \
| * \ \ \ Merge branch 'master' of https://github.com/friendica/redmarijus2014-05-0913-5695/+5781
| |\ \ \ \
| * | | | | add some more bs fumarijus2014-05-081-1/+1
| | | | | |
| * | | | | like indicator rewritemarijus2014-05-083-23/+36
| | | | | |
* | | | | | shred: ability to execute somewhat arbitrary API functions and echo resultsfriendica2014-05-082-1/+23
| |/ / / / |/| | | |
* | | | | move the event "unknown finish time" checkbox up so it actually precedes ↵friendica2014-05-081-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | entering the finish time. TODO: we should probably disable the finish time selector with jquery if this is checked.
* | | | | event form hard-wired tinymce=on, made selectablefriendica2014-05-084-4/+18
| | | | |
* | | | | better checking for SSL servers, even though it probably doesn't fix the ↵friendica2014-05-082-1/+3
| | | | | | | | | | | | | | | | | | | | cookie bug
* | | | | show hidden connections in contact block if and only if the observer is the ↵friendica2014-05-082-8/+26
| | | | | | | | | | | | | | | | | | | | profile owner
* | | | | Merge https://github.com/friendica/red into pending_mergefriendica2014-05-081-1/+3
|\ \ \ \ \
| * \ \ \ \ Merge pull request #449 from cvogeley/mastercvogeley2014-05-081-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | another one
| | * | | | | another oneChristian Vogeley2014-05-081-1/+1
| | | | | | |
| * | | | | | Merge pull request #448 from cvogeley/mastercvogeley2014-05-081-1/+3
| |\| | | | | | | | | | | | | | | | | | | Small adjustment
| | * | | | | Small adjustmentChristian Vogeley2014-05-081-1/+3
| | | | | | |
* | | | | | | remove the redundant install checkfriendica2014-05-081-1/+1
| | | | | | |
* | | | | | | turn off ssl cookie protection by default since nobody that has problems ↵friendica2014-05-082-10/+12
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with it is apparently able to debug it. PLEASE turn it on by util/config system ssl_cookie_protection 1 if you use SSL. Please debug it if you have a problem and have any basic technical skills at all and tell us why it doesn't work so we can fix it and turn this on by default because it is very very very important.
* | | | | | Merge pull request #447 from cvogeley/masterRedMatrix2014-05-092-4/+9
|\| | | | | | | | | | | | | | | | | Trying to make the conversation better readable
| * | | | | Trying to make the conversation better readableChristian Vogeley2014-05-082-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | by adding borders and adding more space between the threads. If you don’t like it feel free to revert it.