| Commit message (Expand) | Author | Age | Files | Lines |
... | |
* | | remove unrecognised code comment from markdown text. | friendica | 2015-01-18 | 1 | -1/+2 |
* | | Merge pull request #866 from redswede/dev_redswede | RedMatrix | 2015-01-19 | 14 | -18/+173 |
|\ \ |
|
| * \ | Merge branch 'master' of git://github.com/friendica/red into dev_redswede | RedSwede | 2015-01-19 | 83 | -115/+2054 |
| |\ \ |
|
| * | | | translation of 2 helpfiles to swedish | RedSwede | 2015-01-19 | 2 | -0/+143 |
| * | | | Looked through the whole doc/-folder more or less. Added and commented a few ... | RedSwede | 2015-01-17 | 12 | -15/+27 |
| * | | | edited the text to better reflect how the system works from a user perspective. | RedSwede | 2015-01-16 | 1 | -3/+3 |
* | | | | don't unset a directory server which has no active channels and hence will ne... | friendica | 2015-01-18 | 1 | -9/+24 |
| |/ /
|/| | |
|
* | | | Merge pull request #863 from einervonvielen/Fix_bbcode_toc_for_help_pages | RedMatrix | 2015-01-19 | 6 | -79/+93 |
|\ \ \ |
|
| * | | | Added table of contents for FAQs doc | Einer von Vielen | 2015-01-18 | 4 | -54/+61 |
| * | | | Fixed bbode element toc for webpages | Einer von Vielen | 2015-01-18 | 2 | -25/+32 |
* | | | | Merge pull request #862 from pafcu/help | RedMatrix | 2015-01-19 | 65 | -12/+1699 |
|\ \ \ \ |
|
| * | | | | Database schema documentation | Stefan Parviainen | 2015-01-18 | 64 | -0/+1686 |
| * | | | | Don't try to open unexisting files in help | Stefan Parviainen | 2015-01-18 | 1 | -12/+13 |
| | |_|/
| |/| | |
|
* | | | | Merge pull request #864 from git-marijus/master | RedMatrix | 2015-01-19 | 8 | -7/+246 |
|\ \ \ \
| |_|/ /
|/| | | |
|
| * | | | fix link | marijus | 2015-01-18 | 1 | -2/+2 |
| * | | | fix goaway link | marijus | 2015-01-18 | 1 | -2/+2 |
| * | | | fix profile tabs link | marijus | 2015-01-18 | 1 | -1/+1 |
| * | | | basic proof of concept file activity support - will send activity via the fil... | marijus | 2015-01-18 | 8 | -7/+246 |
|/ / / |
|
* | | | Merge pull request #859 from einervonvielen/Issue_846_view_calendar_event | pafcu | 2015-01-18 | 2 | -1/+2 |
|\ \ \ |
|
| * | | | Fixed #846 Viewing event from calendar displays event | Einer von Vielen | 2015-01-18 | 2 | -1/+2 |
* | | | | Merge pull request #858 from pafcu/master | pafcu | 2015-01-17 | 1 | -0/+1 |
|\ \ \ \
| |/ / /
|/| / /
| |/ / |
|
| * | | Remove accidental logging | Stefan Parviainen | 2015-01-17 | 1 | -1/+0 |
| * | | Fix bug with groups and autocomplete | Stefan Parviainen | 2015-01-17 | 1 | -0/+2 |
* | | | Merge pull request #856 from pafcu/master | pafcu | 2015-01-16 | 1 | -16/+13 |
|\| |
| |/
|/| |
|
| * | Fix some issues with tagging. | Stefan Parviainen | 2015-01-16 | 1 | -16/+13 |
* | | more doc updates | friendica | 2015-01-16 | 35 | -0/+2759 |
* | | mod_prep usability enhancements, doc updates | friendica | 2015-01-16 | 134 | -3736/+4250 |
* | | validate poco chatrooms before storing | friendica | 2015-01-15 | 1 | -0/+3 |
* | | fix to poco chatrooms | friendica | 2015-01-15 | 1 | -4/+4 |
* | | errors in mod_poco | friendica | 2015-01-15 | 1 | -2/+2 |
* | | more heavy lifting on poco rep | friendica | 2015-01-15 | 6 | -24/+51 |
* | | document the poco reputation kill switch | friendica | 2015-01-15 | 1 | -1/+2 |
* | | make sure mod/prep follows the poco_rating allow preference | friendica | 2015-01-15 | 1 | -0/+9 |
* | | Merge branch 'pocorate' | friendica | 2015-01-15 | 11 | -6/+156 |
|\ \ |
|
| * | | poco rating - add a test module for pulling out ratings | friendica | 2015-01-15 | 4 | -5/+90 |
| * | | editing stuff for poco reputation | friendica | 2015-01-15 | 4 | -3/+33 |
| * | | more backend work on poco rating | friendica | 2015-01-15 | 8 | -5/+40 |
* | | | backend for mailhost addon | friendica | 2015-01-15 | 1 | -0/+8 |
* | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-01-15 | 1 | -14/+2 |
|\ \ \
| | |/
| |/| |
|
| * | | Merge pull request #854 from pafcu/fixcollapse | pafcu | 2015-01-15 | 1 | -14/+2 |
| |\ \ |
|
| | * | | Actually fix problem with post collapsing in webkit-based browsers | Stefan Parviainen | 2015-01-15 | 1 | -14/+2 |
| * | | | Merge pull request #853 from friendica/revert-852-master | mrjive | 2015-01-15 | 0 | -0/+0 |
| |\ \ \ |
|
| | * | | | Revert "Merge pull request #1 from friendica/master" | mrjive | 2015-01-15 | 0 | -0/+0 |
| |/ / / |
|
| * | | | Merge pull request #852 from mrjive/master | mrjive | 2015-01-15 | 0 | -0/+0 |
| |\ \ \
| | |_|/
| |/| | |
|
| | * | | Merge pull request #1 from friendica/master | mrjive | 2015-01-06 | 2895 | -102490/+663457 |
| | |\ \ |
|
* | | | | | revup | friendica | 2015-01-15 | 1 | -1/+1 |
|/ / / / |
|
* | | | | provide correct permissions role default for old-timers that didn't have any ... | friendica | 2015-01-14 | 1 | -1/+4 |
* | | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-01-14 | 5 | -1/+105 |
|\ \ \ \ |
|
| * \ \ \ | Merge pull request #850 from einervonvielen/toc | RedMatrix | 2015-01-15 | 5 | -1/+105 |
| |\ \ \ \ |
|
| | * \ \ \ | Merge remote-tracking branch 'upstream/master' into toc | Einer von Vielen | 2015-01-14 | 22 | -116/+128 |
| | |\ \ \ \ |
|