Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | 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 | |
| |\ \ \ | ||||||
| * | | | | Corrected minor typo | root | 2014-06-27 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Merge pull request #517 from tokudan/master | RedMatrix | 2014-06-30 | 2 | -1/+29 | |
|\ \ \ \ \ | | | | | | | | | | | | | Some german translations | |||||
| * | | | | | German translation for channels.md | Daniel Frank | 2014-06-29 | 1 | -0/+28 | |
| | | | | | | ||||||
| * | | | | | Update Profile.md | Daniel Frank | 2014-06-29 | 1 | -1/+1 | |
| | |/ / / | |/| | | | | | | | | added missing word | |||||
* | | | | | Merge pull request #516 from dawnbreak/master | RedMatrix | 2014-06-30 | 4 | -90/+172 | |
|\ \ \ \ \ | | | | | | | | | | | | | Fixed a wrong timestamp update when adding a file. | |||||
| * | | | | | Add rename support for DAV directories. | Klaus Weidenbach | 2014-06-30 | 2 | -15/+63 | |
| | | | | | | | | | | | | | | | | | | | | | | | | This works only over DAV right now, no GUI yet. | |||||
| * | | | | | Return a correct timestamp when a folder is empty. | Klaus Weidenbach | 2014-06-29 | 2 | -36/+50 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a folder was empty a zero timestamp was returned. Now it will return the timestamp of the folder itself. | |||||
| * | | | | | Fixed some more timestamp bugs in RedDAV. | Klaus Weidenbach | 2014-06-29 | 3 | -32/+46 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Fixed an SQL-query in RedFile::put(), where parameters where in wrong order. | |||||
| * | | | | | Fixed a wrong timestamp update when adding a file. | Klaus Weidenbach | 2014-06-29 | 2 | -7/+13 | |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a file was uploaded the timestamp of the containing folder should get updated, but the timestamp of the first file in the folder was mistakenly updated. There are some more wrong timestamps, but still looking for the bug. | |||||
* | | | | | Merge pull request #519 from cvogeley/master | RedMatrix | 2014-06-30 | 3 | -5/+7 | |
|\ \ \ \ \ | |/ / / / |/| | | | | Remove Remove Account link from account settings | |||||
| * | | | | Remove Remove Account link from account settings | Christian Vogeley | 2014-06-29 | 3 | -5/+7 | |
|/ / / / | | | | | | | | | | | | | | | | | because it doesn’t remove the account. Move channel removal link to channel page | |||||
* | | | | Merge pull request #515 from tuscanhobbit/master | Paolo T | 2014-06-29 | 2 | -488/+563 | |
|\ \ \ \ | | |/ / | |/| | | IT:updated strings | |||||
| * | | | IT:updated strings | tuscanhobbit | 2014-06-29 | 2 | -488/+563 | |
| | | | |