aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | Merge pull request #222 from git-marijus/masterfriendica2013-12-043-548/+715
| |\ \
| | * | split conversation.css out of style.cssmarijus2013-12-043-548/+715
| |/ /
* / / include re-organisation and more doco, post_to_red fix ampersands in categoriesfriendica2013-12-047-59/+62
|/ /
* | add hooks to zot-finger and import_xchanfriendica2013-12-032-0/+4
* | more documentation workfriendica2013-12-031-75/+106
* | on successful magic-auth, put remote_service_class and remote_hub into the se...friendica2013-12-032-4/+23
* | reorganise a few included functions - notably identity related functionsfriendica2013-12-035-768/+770
* | rev updatefriendica2013-12-031-1/+1
* | Merge pull request #221 from git-marijus/masterfriendica2013-12-033-96/+114
|\ \
| * | should fix typos the right way...marijus2013-12-031-1/+1
| * | this should remain in style.cssmarijus2013-12-032-2/+7
| * | split out mod_message and a typomarijus2013-12-033-96/+109
| * | Merge branch 'master' of https://github.com/friendica/redmarijus2013-12-0311-364/+161
| |\ \ | |/ / |/| |
* | | undo last change to comment_email - these are checked for validityfriendica2013-12-021-1/+1
* | | ensure that every imported channel has a primary hublocfriendica2013-12-023-2/+18
* | | clear floats on the connect buttonfriendica2013-12-021-0/+1
* | | Merge https://github.com/friendica/red into zpullfriendica2013-12-022-1365/+1827
|\ \ \
* | | | more work on magic-authfriendica2013-12-022-4/+17
* | | | magic-auth re-factorfriendica2013-12-022-173/+122
* | | | refactor magic-authfriendica2013-12-028-194/+12
| | * | Revert "update spin.js to latest version"marijus2013-12-021-11/+5
| | * | Revert "only show user-photo if not local user"marijus2013-12-021-1/+1
| | * | Revert "some jot tools structuring and styling"marijus2013-12-023-96/+54
| | * | 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