aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge https://github.com/friendica/red into pending_mergefriendica2014-07-032-62/+62
|\
| * fix nljeroenpraat2014-07-032-62/+62
| |
* | visage tracking opt-in/opt-outfriendica2014-07-033-0/+29
|/
* session DNT - if you want it use it.friendica2014-07-031-0/+4
|
* move code out of templates - not sure how this even worked.friendica2014-07-033-11/+19
|
* Merge https://github.com/friendica/red into pending_mergefriendica2014-07-0215-12456/+11854
|\
| * Red Matrix default instead of global default. Is more clear. Update nl to ↵jeroenpraat2014-07-024-6077/+5878
| | | | | | | | 99%. Update util/messages.po
| * Merge branch 'master' of https://github.com/friendica/redjeroenpraat2014-07-0221-6408/+6018
| |\
| | * Merge pull request #526 from zzottel/masterzzottel2014-07-029-305/+101
| | |\ | | | | | | | | update German docs
| | | * update German docszottel2014-07-029-305/+101
| | |/
| | * Merge pull request #525 from tuscanhobbit/masterPaolo T2014-07-022-6074/+5875
| | |\ | | | | | | | | IT: strings updated
| | | * IT: strings updatedPaolo Tacconi2014-07-022-6074/+5875
| | | |
| * | | Changed Default to Light (global default). So if hub owners want to change ↵jeroenpraat2014-07-021-1/+1
| | | | | | | | | | | | | | | | the default, they don't get two defaults. Please revert when not needed/wanted.
* | | | turn that into a featurefriendica2014-07-023-3/+3
| |/ / |/| |
* | | Merge pull request #524 from zzottel/masterRedMatrix2014-07-021-1/+1
|\ \ \ | | | | | | | | Fix for #510: $a->poi wasn't set for tabs actions with commands, so conn...
| * | | Fix for #510: $a->poi wasn't set for tabs actions with commands, so ↵zottel2014-07-021-1/+1
|/ / / | | | | | | | | | connedit_clone wasn't executed.
* | | use a better hashtag replacement when preventing tag hijackingfriendica2014-07-011-2/+2
| | |
* | | minor adjustmentsfriendica2014-07-012-1/+6
| | |
* | | minor optimisationfriendica2014-07-012-9/+5
| | |
* | | optionally allow zrl usage from specific markdown sourcesfriendica2014-07-013-12/+19
| | |
* | | easter eggfriendica2014-07-013-5/+10
|/ /
* | updated util/messages.pojeroenpraat2014-07-011-3747/+3585
| |
* | fix 1 error in nl that somehow sneaked injeroenpraat2014-07-012-3/+3
| |
* | update/approve nl to 98%git statusjeroenpraat2014-07-012-99/+99
| |
* | Doco - better wording. Unless it was intended to block indexing, butThomas Willingham2014-07-011-1/+1
| | | | | | | | | | it never did that - it always just blocked search (which seems to be a sane default).
* | Merge branch 'master' of https://github.com/friendica/redThomas Willingham2014-07-015-141/+159
|\ \
| * | update nljeroenpraat2014-07-012-117/+117
| | |
| * | for non-post items (e.g. photos, events, whatever) add mention tags ↵friendica2014-06-301-0/+25
| | | | | | | | | | | | explicitly to the output rendering since they may not be present in the post body.
| * | Merge https://github.com/friendica/red into pending_mergefriendica2014-06-301-9/+1
| |\ \
| * | | much better fix to problem yesterday of updates with the wrong ud_addr ↵friendica2014-06-302-24/+17
| | | | | | | | | | | | | | | | | | | | | | | | getting updated. Now we'll pass in the update table row to import_xchan so we know exactly which ud_addr applies. We still need ud_flags passed in separately.
* | | | Doco - update raspberry pi install, mostly trivial, only real changeThomas Willingham2014-07-011-29/+23
| |/ / |/| | | | | | | | | | | is to block search properly without relying on robots.txt which doesn't really work.
* | | Doco - couple of extra features that aren't anymore.Thomas Willingham2014-07-011-9/+1
|/ /
* | more doco on mod/ping - plus fix a birthday notification which was a day off.friendica2014-06-301-6/+52
| |
* | Merge pull request #520 from pixelroot/masterRedMatrix2014-07-012-694/+769
|\ \ | | | | | | Updated Russian translation
| * | Updated Russian translationpixelroot2014-06-302-694/+769
| | |
* | | Merge pull request #521 from tuscanhobbit/masterRedMatrix2014-07-011-22/+30
|\ \ \ | | |/ | |/| Changed the lock icon behaviour
| * | Changed the lock icon behaviourPaolo Tacconi2014-06-301-22/+30
| | |
* | | Merge pull request #522 from dawnbreak/masterRedMatrix2014-07-012-154/+147
|\ \ \ | | | | | | | | Some documentation, less default debugging, bit styleguide
| * | | Documented include/plugin.php a bit and removed an annoying defaultKlaus Weidenbach2014-07-011-107/+114
| | | | | | | | | | | | | | | | logging. Changed it to LOGGER_DEBUG.
| * | | Some documentation in mod/ping.php an reduced default logging.Klaus Weidenbach2014-06-301-47/+33
| | | | | | | | | | | | | | | | It is now LOGGER_DATA as it returns the json data contents.
* | | | update nljeroenpraat2014-06-302-35/+35
|/ / /
* | | Doco - update Debian install. That link is out of date, and the git moved too.Thomas Willingham2014-06-301-3/+4
| | |
* | | Doco - move existing FAQ to new sub-FAQsThomas Willingham2014-06-303-46/+47
| | |
* | | Make [observer.baseurl] more reliable using connurl which will changeThomas Willingham2014-06-3016-290/+22
| | | | | | | | | | | | | | | less often than xchan_url, which can break the regex and might not even contain the baseurl at all, plus a bit of doco clean up.
* | | control chars crept in.friendica2014-06-301-1/+1
| | |
* | | ensure we have a unique guid for each address if one is generated.friendica2014-06-301-1/+1
| | |
* | | update the update records for all addresses attached to this channel, not ↵friendica2014-06-301-7/+19
| | | | | | | | | | | | just the primary.
* | | one more...friendica2014-06-302-2/+3
| | |
* | | minor changesfriendica2014-06-292-3/+9
| | |
* | | very minor, we don't like the word "user" - it's downgrading. Everybody here ↵friendica2014-06-291-2/+2
| | | | | | | | | | | | is a "member".