aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* mergeChristian Vogeley2014-03-1534-9425/+7932
|\
| * contact_block() not being shown to unauthenticated visitors - even if perms ↵friendica2014-03-132-4/+7
| | | | | | | | allow. Also separate the permissions logic for this function so that we can have a mini-profile widget and a separate contact_block widget instead of always lumping them together. We probably also should move contact_block() outside of include/text.php as it doesn't really belong there. Just not sure where it belongs - perhaps contact_widgets wouold be a good place.
| * Merge https://github.com/friendica/red into zpullfriendica2014-03-136-9/+25
| |\
| | * Merge branch 'master' of https://github.com/friendica/redmarijus2014-03-135-6/+18
| | |\
| | * | move region_1 to off instead of removing it and dont squelch region_2 when ↵marijus2014-03-136-9/+25
| | | | | | | | | | | | | | | | region_1 moves in again
| * | | remove allowed friend domains and allowed email domains from admin settings ↵friendica2014-03-132-3/+1
| | |/ | |/| | | | | | | - as they are not implemented
| * | json_return_and_dir isn't a thingThomas Willingham2014-03-131-1/+1
| | |
| * | json_return_and_dir is a typofriendica2014-03-121-1/+1
| | |
| * | Merge https://github.com/friendica/red into zpullfriendica2014-03-122-3/+10
| |\ \
| | * \ Merge pull request #366 from beardy-unixer/masterfriendica2014-03-132-3/+10
| | |\ \ | | | |/ | | |/| Stick help in a template
| | | * Stick help in a templateThomas Willingham2014-03-122-3/+10
| | |/
| * / fix colors on input elements which bootstrap set to "inherit" and doesn't ↵friendica2014-03-122-1/+6
| |/ | | | | | | play nicely with dark themes.
| * file had wrong extensionfriendica2014-03-113-16/+7
| |
| * update acl internal list whenever there is a change - the submit handler ↵friendica2014-03-111-10/+20
| | | | | | | | seems to be unreliable or is getting into a race condition.
| * protect filed conversations from expiration - we check the parent to see if ↵friendica2014-03-112-1/+15
| | | | | | | | it is filed, but one may have filed a comment and that will vanish when the parent expires unless the parent is protected.
| * get rid of fancybox for photos upload, not just photo editfriendica2014-03-112-1/+6
| |
| * norwegian strings updatefriendica2014-03-112-3/+3
| |
| * revert recent changes to cmtBbClose which removed the ability to insert ↵friendica2014-03-111-4/+4
| | | | | | | | quotes into an empty comment box
| * version updatefriendica2014-03-112-2/+2
| |
| * failed experiment - revert the directory to 80 results per page until ↵friendica2014-03-101-1/+1
| | | | | | | | somebody implements endless scroll on the thing. 300 takes far too long to load all the images.
| * nb-no language updatefriendica2014-03-102-8867/+7302
| |
| * Merge pull request #363 from git-marijus/masterfriendica2014-03-119-51/+50
| |\ | | | | | | this commit is an attempt to make conv items better scalable on smaller screens. also save some horizontal space.
| | * 10px is probably to closemarijus2014-03-101-2/+2
| | |
| | * fix lock positionmarijus2014-03-102-7/+4
| | |
| | * fixes locations with a linkmarijus2014-03-101-1/+1
| | |
| | * this commit is an attempt to make conv items better scalable on smaller ↵marijus2014-03-109-43/+45
| |/ | | | | | | screens. also save some horizontal space.
| * The README is getting a bit tired and really needs a re-write, but in the ↵friendica2014-03-102-3/+1
| | | | | | | | meanitme there's a link to donations that had to be cleaned up until we figure out how to do that without paypal.
| * update cacert.pem , don't hide url link for rmagicfriendica2014-03-094-463/+352
| |
| * describe the known flawsfriendica2014-03-081-1/+3
| |
| * advanced directory search help filefriendica2014-03-082-0/+56
| |
| * Merge https://github.com/friendica/red into zpullfriendica2014-03-081-3/+2
| |\
| | * Merge pull request #361 from cvogeley/masterfriendica2014-03-091-3/+2
| | |\ | | | | | | | | allow again zrl and zmg in api
| * | | HOWTO create a derived theme lesson 1. Do not attempt to do anything more ↵friendica2014-03-082-0/+79
| |/ / | | | | | | | | | complicated until you have successfully completed this exercise.
* | / API: statusnet_html:trim was trimming too muchChristian Vogeley2014-03-151-1/+2
| |/ |/|
* | zrl and zmg are backChristian Vogeley2014-03-091-2/+1
| |
* | mergeChristian Vogeley2014-03-09335-4412/+11486
|\|
| * collapse the advanced directory search so that folks who think they're ↵friendica2014-03-082-2/+6
| | | | | | | | advanced but really aren't don't whinge about it.
| * advanced search front-endfriendica2014-03-084-2/+19
| |
| * back-end for advanced directory searchfriendica2014-03-081-15/+98
| |
| * Merge https://github.com/friendica/red into zpullfriendica2014-03-084-4/+29
| |\
| | * Merge pull request #359 from beardy-unixer/masterfriendica2014-03-091-1/+10
| | |\ | | | | | | | | is_developer() for those awkward "Don't touch this yet unless
| | | * is_developer() for those awkward "Don't touch this yet unlessThomas Willingham2014-03-081-1/+10
| | | | | | | | | | | | | | | | | | | | you know what you're doing" commits - especially the ones with UI components.
| | * | Merge pull request #358 from git-marijus/masterfriendica2014-03-093-3/+19
| | |\ \ | | | |/ | | |/| style fixes
| | | * style fixesmarijus2014-03-083-3/+19
| | |/
| * / incorrect webfinger link per fabrixxmfriendica2014-03-082-2/+2
| |/
| * missing quotefriendica2014-03-071-1/+1
| |
| * Merge pull request #357 from beardy-unixer/masterfriendica2014-03-082-0/+10
| |\ | | | | | | Create sys channels
| | * Create a sys chan for hubs that already exist too.Thomas Willingham2014-03-071-0/+7
| | |
| | * Merge remote-tracking branch 'upstream/master'Thomas Willingham2014-03-076-35/+51
| | |\
| | * | Actually create syschan during installThomas Willingham2014-03-071-0/+3
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 09:40:30 +0000