aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/friendica/redmarijus2013-12-0218-2780/+3269
|\
| * Merge pull request #220 from tobiasd/20131202tobiasd2013-12-022-1365/+1827
| |\
| | * DE: update to the stringsTobias Diekershoff2013-12-022-1365/+1827
| |/
| * some work on events permissionsfriendica2013-12-012-7/+18
| * trimmed style.css by a few hundred lines. Needs many more such effortsfriendica2013-12-015-363/+190
| * get rid of deprecated post_url() functionfriendica2013-12-012-106/+10
| * file corruptionfriendica2013-12-011-122/+0
| * document the ping packet - and remove the ancient rusty brown square default ...friendica2013-12-014-10/+165
| * don't magic-auth against a deleted channelfriendica2013-12-011-9/+14
| * magic auth fix plus docofriendica2013-12-011-2/+75
| * zot documentation inline in the code where we need it most.friendica2013-12-011-0/+120
| * add categories and optional backlink to exported WP postsfriendica2013-12-011-7/+28
| * Merge https://github.com/friendica/red into zpullfriendica2013-12-012-927/+960
| |\
| | * Merge pull request #219 from tuscanhobbit/masterPaolo T2013-12-012-927/+960
| | |\
| | | * italian translationtuscanhobbit2013-12-010-0/+0
| | | |\
| | | | * italian translationp.tacconi2013-11-272-422/+417
| | | * | italian translationtuscanhobbit2013-12-012-927/+960
| | | |/
| * | / remove hook logging - too noisyfriendica2013-12-011-1/+1
| |/ /
* | | update spin.js to latest versionmarijus2013-12-011-5/+11
* | | only show user-photo if not local usermarijus2013-12-011-1/+1
* | | some jot tools structuring and stylingmarijus2013-12-013-54/+96
|/ /
* | get rid of fetch_url - post_url will be a bit harder as several plugins need ...friendica2013-12-012-154/+7
* | deprecate a->get_curl_code() and $a->get_curl_headers()friendica2013-12-015-400/+20
* | hooks getting called twicefriendica2013-11-302-2/+4
* | quite a bit of work on default acl permissions and various acl quirksfriendica2013-11-298-36/+86
* | channel wasn't getting savedfriendica2013-11-291-0/+2
* | allow zot-info to return results for address= with webbies or naked nicknamesfriendica2013-11-294-3450/+3483
* | doc updatesfriendica2013-11-2914-25/+73
* | allow themes to mess with the navbar contents without a custom template. It's...friendica2013-11-283-5/+42
* | doc updatesfriendica2013-11-28508-741/+3529
* | make the template processor (e.g. replace_macros) pluggablefriendica2013-11-282-2/+5
* | docofriendica2013-11-281-6/+21
* | item store hooksfriendica2013-11-282-0/+24
* | docofriendica2013-11-281-6/+41
* | only list undeleted hublocs in zot_fingerfriendica2013-11-281-4/+7
* | Merge https://github.com/friendica/red into zpullfriendica2013-11-282-3488/+3481
|\ \
| * \ Merge pull request #217 from omigeot/masterfriendica2013-11-282-3488/+3481
| |\ \
| | * | Plurals for conversation.phpOlivier Migeot2013-11-282-3488/+3481
| |/ /
* / / zot docofriendica2013-11-281-17/+96
|/ /
* | Merge https://github.com/friendica/red into zpullfriendica2013-11-281-2/+14
|\ \
| * \ Merge pull request #216 from omigeot/masterfriendica2013-11-271-2/+14
| |\ \
| | * \ Merge branch 'master' of https://github.com/friendica/redOlivier Migeot2013-11-281-0/+101
| | |\ \ | | |/ / | |/| |
| | * | Merge branch 'master' of https://github.com/friendica/redOlivier Migeot2013-11-272-23/+10
| | |\ \
| | * | | Quick hack to allow themes/modules to use different CSS classes for the ACL s...Olivier Migeot2013-11-271-2/+14
* | | | | synchronise deletion of comments between red and wpfriendica2013-11-283-1/+44
|/ / / /
* | | | add photos to red-to-wordpress commentsfriendica2013-11-271-0/+20
* | | | add xmlrpc method for importing red commentsfriendica2013-11-271-0/+81
| |/ / |/| |
* | | reduce the likelihood that a given channel will have 30-40 valid hublocs with...friendica2013-11-272-23/+10
|/ /
* | re-enable jquery migration tool until we sort out all the issuesfriendica2013-11-272-3/+3
* | more loop preventionfriendica2013-11-261-0/+8