aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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 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 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 ente...friendica2014-05-081-3/+7
* | 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 cook...friendica2014-05-082-1/+3
* | show hidden connections in contact block if and only if the observer is the p...friendica2014-05-082-8/+26
* | 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 oneChristian Vogeley2014-05-081-1/+1
| * | | Merge pull request #448 from cvogeley/mastercvogeley2014-05-081-1/+3
| |\| |
| | * | 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 with...friendica2014-05-082-10/+12
|/ / /
* | | Merge pull request #447 from cvogeley/masterRedMatrix2014-05-092-4/+9
|\| |
| * | Trying to make the conversation better readableChristian Vogeley2014-05-082-4/+9
* | | Merge pull request #446 from tuscanhobbit/masterPaolo T2014-05-082-5666/+5705
|\ \ \ | |_|/ |/| |
| * | IT: strings updatedPaolo Tacconi2014-05-082-5666/+5705
* | | fix events until the new event subscription mechanism goes in, as shared even...friendica2014-05-071-1/+1
* | | ok *now* shred works with alternate config filesfriendica2014-05-072-10/+16
* | | shred: perhaps alternate configs will work now - unable to test at the moment...friendica2014-05-072-4/+5
* | | Do our best to provide sane cookie defaults.friendica2014-05-072-6/+6
* | | make it easier to plug into .well_known, for instance to tell the EFF to fuck...friendica2014-05-061-0/+6
* | | core fixes to allow statusnet connector to workfriendica2014-05-061-4/+4
* | | setup: check for open https port with an invalid cert, even if configured to ...friendica2014-05-062-12/+26
| |/ |/|
* | log pickupsfriendica2014-05-051-0/+2
* | You wouldn't think we need this text, but we really do.friendica2014-05-051-10/+13
* | added text on concensus building and hints on when to make a feature optional...friendica2014-05-051-1/+13
* | try againfriendica2014-05-051-2/+9
* | revertfriendica2014-05-051-1/+2
* | improved cookie securityfriendica2014-05-051-0/+1
* | add message_id to reshared items so that we can eventually notify the origina...friendica2014-05-052-1/+8
* | put permissions dialog inside the form element - should fix issue #444friendica2014-05-051-2/+2
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-05-054-34/+47
|\ \
| * | fix some issues with nav-tabs overrides and make their background transparentmarijus2014-05-052-11/+20
| * | Height auto or mini-height 120px. The latter.jeroenpraat2014-05-051-2/+2
| * | Fixed some wrapping problems when the user has set a larger font size. And so...jeroenpraat2014-05-053-23/+27
* | | minor text change.friendica2014-05-052-2/+2
|/ /