Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #525 from tuscanhobbit/master | Paolo T | 2014-07-02 | 2 | -6074/+5875 |
|\ | | | | | IT: strings updated | ||||
| * | IT: strings updated | Paolo Tacconi | 2014-07-02 | 2 | -6074/+5875 |
| | | |||||
* | | Merge pull request #524 from zzottel/master | RedMatrix | 2014-07-02 | 1 | -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 ↵ | zottel | 2014-07-02 | 1 | -1/+1 |
|/ / | | | | | | | connedit_clone wasn't executed. | ||||
* | | use a better hashtag replacement when preventing tag hijacking | friendica | 2014-07-01 | 1 | -2/+2 |
| | | |||||
* | | minor adjustments | friendica | 2014-07-01 | 2 | -1/+6 |
| | | |||||
* | | minor optimisation | friendica | 2014-07-01 | 2 | -9/+5 |
| | | |||||
* | | optionally allow zrl usage from specific markdown sources | friendica | 2014-07-01 | 3 | -12/+19 |
| | | |||||
* | | easter egg | friendica | 2014-07-01 | 3 | -5/+10 |
| | | |||||
* | | updated util/messages.po | jeroenpraat | 2014-07-01 | 1 | -3747/+3585 |
| | | |||||
* | | fix 1 error in nl that somehow sneaked in | jeroenpraat | 2014-07-01 | 2 | -3/+3 |
| | | |||||
* | | update/approve nl to 98%git status | jeroenpraat | 2014-07-01 | 2 | -99/+99 |
| | | |||||
* | | Doco - better wording. Unless it was intended to block indexing, but | Thomas Willingham | 2014-07-01 | 1 | -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/red | Thomas Willingham | 2014-07-01 | 5 | -141/+159 |
|\ \ | |||||
| * | | update nl | jeroenpraat | 2014-07-01 | 2 | -117/+117 |
| | | | |||||
| * | | for non-post items (e.g. photos, events, whatever) add mention tags ↵ | friendica | 2014-06-30 | 1 | -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_merge | friendica | 2014-06-30 | 1 | -9/+1 |
| |\ \ | |||||
| * | | | much better fix to problem yesterday of updates with the wrong ud_addr ↵ | friendica | 2014-06-30 | 2 | -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 change | Thomas Willingham | 2014-07-01 | 1 | -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 Willingham | 2014-07-01 | 1 | -9/+1 |
|/ / | |||||
* | | more doco on mod/ping - plus fix a birthday notification which was a day off. | friendica | 2014-06-30 | 1 | -6/+52 |
| | | |||||
* | | Merge pull request #520 from pixelroot/master | RedMatrix | 2014-07-01 | 2 | -694/+769 |
|\ \ | | | | | | | Updated Russian translation | ||||
| * | | Updated Russian translation | pixelroot | 2014-06-30 | 2 | -694/+769 |
| | | | |||||
* | | | Merge pull request #521 from tuscanhobbit/master | RedMatrix | 2014-07-01 | 1 | -22/+30 |
|\ \ \ | | |/ | |/| | Changed the lock icon behaviour | ||||
| * | | Changed the lock icon behaviour | Paolo Tacconi | 2014-06-30 | 1 | -22/+30 |
| | | | |||||
* | | | Merge pull request #522 from dawnbreak/master | RedMatrix | 2014-07-01 | 2 | -154/+147 |
|\ \ \ | | | | | | | | | Some documentation, less default debugging, bit styleguide | ||||
| * | | | Documented include/plugin.php a bit and removed an annoying default | Klaus Weidenbach | 2014-07-01 | 1 | -107/+114 |
| | | | | | | | | | | | | | | | | logging. Changed it to LOGGER_DEBUG. | ||||
| * | | | Some documentation in mod/ping.php an reduced default logging. | Klaus Weidenbach | 2014-06-30 | 1 | -47/+33 |
| | | | | | | | | | | | | | | | | It is now LOGGER_DATA as it returns the json data contents. | ||||
* | | | | update nl | jeroenpraat | 2014-06-30 | 2 | -35/+35 |
|/ / / | |||||
* | | | Doco - update Debian install. That link is out of date, and the git moved too. | Thomas Willingham | 2014-06-30 | 1 | -3/+4 |
| | | | |||||
* | | | Doco - move existing FAQ to new sub-FAQs | Thomas Willingham | 2014-06-30 | 3 | -46/+47 |
| | | | |||||
* | | | Make [observer.baseurl] more reliable using connurl which will change | Thomas Willingham | 2014-06-30 | 16 | -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. | friendica | 2014-06-30 | 1 | -1/+1 |
| | | | |||||
* | | | ensure we have a unique guid for each address if one is generated. | friendica | 2014-06-30 | 1 | -1/+1 |
| | | | |||||
* | | | update the update records for all addresses attached to this channel, not ↵ | friendica | 2014-06-30 | 1 | -7/+19 |
| | | | | | | | | | | | | just the primary. | ||||
* | | | one more... | friendica | 2014-06-30 | 2 | -2/+3 |
| | | | |||||
* | | | minor changes | friendica | 2014-06-29 | 2 | -3/+9 |
| | | | |||||
* | | | very minor, we don't like the word "user" - it's downgrading. Everybody here ↵ | friendica | 2014-06-29 | 1 | -2/+2 |
| | | | | | | | | | | | | is a "member". | ||||
* | | | log the offending dir server | friendica | 2014-06-29 | 1 | -0/+2 |
| | | | |||||
* | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-06-29 | 2 | -566/+641 |
|\ \ \ | |||||
| * \ \ | Merge branch 'master' of https://github.com/friendica/red | jeroenpraat | 2014-06-29 | 2 | -2/+3 |
| |\ \ \ | |||||
| * | | | | update nl | jeroenpraat | 2014-06-29 | 2 | -566/+641 |
| | | | | | |||||
* | | | | | limit updates from new dir servers to avoid exhausting memory. | friendica | 2014-06-29 | 2 | -2/+7 |
| | | | | | |||||
* | | | | | keep dirsync from exhausting memory | friendica | 2014-06-29 | 1 | -1/+1 |
| |/ / / |/| | | | |||||
* | | | | add zottel dir server | friendica | 2014-06-29 | 2 | -2/+3 |
|/ / / | |||||
* | | | Merge pull request #518 from tluther/master | RedMatrix | 2014-06-30 | 40 | -45/+239 |
|\ \ \ | | | | | | | | | Doco work | ||||
| * | | | delete my original doc working backup folder | Tobias Luther | 2014-06-29 | 1272 | -143663/+0 |
| | | | | |||||
| * | | | Tidied the folder from old backups | Tobias Luther | 2014-06-29 | 8 | -9/+99 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | created new files for a quick explanation of the use of accounts, profiles, channels added FAQ for users, admins and developers (the last one might not be exactly necessary?) created a file to explain posting for new users created new file to explain nomadic identities for users modified main.bb | ||||
| * | | | Some doco work. Changed main.bb and added a return link to all .bb files and ↵ | root | 2014-06-29 | 1306 | -40/+143807 |
| | | | | | | | | | | | | | | | | began planning new entries for user orientated documentation. | ||||
| * | | | Merge remote-tracking branch 'upstream/master' | root | 2014-06-29 | 342 | -117060/+3939 |
| |\ \ \ |