aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | 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.
* | | | | | Merge pull request #446 from tuscanhobbit/masterPaolo T2014-05-082-5666/+5705
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | IT: strings updated
| * | | | | IT: strings updatedPaolo Tacconi2014-05-082-5666/+5705
| | | | | |
* | | | | | fix events until the new event subscription mechanism goes in, as shared ↵friendica2014-05-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | events have been broken
* | | | | | ok *now* shred works with alternate config filesfriendica2014-05-072-10/+16
| | | | | |
* | | | | | shred: perhaps alternate configs will work now - unable to test at the ↵friendica2014-05-072-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | moment. Was a typo in FriendicaOAuth.sh so it's unlikely anybody has been using this recently. We'll probably need it for apps.
* | | | | | 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 ↵friendica2014-05-061-0/+6
| | | | | | | | | | | | | | | | | | | | fuck off and not block pages from the free web just because they use cookies.
* | | | | 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
| |/ / / |/| | | | | | | | | | | use http. Also a bit more word-smithing on the resultant error text but it's still not perfect.
* | | | 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 ↵friendica2014-05-051-1/+13
| | | | | | | | | | | | | | | | optional or a plugin.
* | | | 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 ↵friendica2014-05-052-1/+8
| | | | | | | | | | | | | | | | original poster via an activity that their item was shared.
* | | | 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 ↵jeroenpraat2014-05-053-23/+27
| | | | | | | | | | | | | | | | | | | | some UI love for the file permissions page (as requested by Mike ;) and changed the position of the file properties link on the cloud page.
* | | | | minor text change.friendica2014-05-052-2/+2
|/ / / /
* | | | UI for deleting chatroomsfriendica2014-05-046-7/+37
| | | |