aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* doc updatefriendica2014-03-1675-866/+1665
* contact_block() not being shown to unauthenticated visitors - even if perms a...friendica2014-03-132-4/+7
* 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 re...marijus2014-03-136-9/+25
* | | remove allowed friend domains and allowed email domains from admin settings -...friendica2014-03-132-3/+1
| |/ |/|
* | 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 templateThomas Willingham2014-03-122-3/+10
| |/
* / fix colors on input elements which bootstrap set to "inherit" and doesn't pla...friendica2014-03-122-1/+6
|/
* file had wrong extensionfriendica2014-03-113-16/+7
* update acl internal list whenever there is a change - the submit handler seem...friendica2014-03-111-10/+20
* protect filed conversations from expiration - we check the parent to see if i...friendica2014-03-112-1/+15
* 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 quote...friendica2014-03-111-4/+4
* version updatefriendica2014-03-112-2/+2
* failed experiment - revert the directory to 80 results per page until somebod...friendica2014-03-101-1/+1
* nb-no language updatefriendica2014-03-102-8867/+7302
* Merge pull request #363 from git-marijus/masterfriendica2014-03-119-51/+50
|\
| * 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 scree...marijus2014-03-109-43/+45
|/
* The README is getting a bit tired and really needs a re-write, but in the mea...friendica2014-03-102-3/+1
* 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
| |\
| | * zrl and zmg are backChristian Vogeley2014-03-091-2/+1
| | * mergeChristian Vogeley2014-03-09335-4412/+11486
| | |\ | | |/ | |/|
| | * .Christian Vogeley2014-03-091-1/+2
| | * allow again zrl and zmg in apiChristian Vogeley2014-03-091-1/+1
| | * Typocvogeley2014-02-271-1/+1
| | * more tweaksChristian Vogeley2014-02-221-2/+1
* | | HOWTO create a derived theme lesson 1. Do not attempt to do anything more com...friendica2014-03-082-0/+79
|/ /
* | collapse the advanced directory search so that folks who think they're advanc...friendica2014-03-082-2/+6
* | 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 unlessThomas Willingham2014-03-081-1/+10
| * | | Merge pull request #358 from git-marijus/masterfriendica2014-03-093-3/+19
| |\ \ \ | | |/ / | |/| |
| | * | 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
|\ \