aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* don't unset a directory server which has no active channels and hence will ne...friendica2015-01-181-9/+24
* Merge pull request #863 from einervonvielen/Fix_bbcode_toc_for_help_pagesRedMatrix2015-01-196-79/+93
|\
| * Added table of contents for FAQs doc Einer von Vielen2015-01-184-54/+61
| * Fixed bbode element toc for webpagesEiner von Vielen2015-01-182-25/+32
* | Merge pull request #862 from pafcu/helpRedMatrix2015-01-1965-12/+1699
|\ \
| * | Database schema documentationStefan Parviainen2015-01-1864-0/+1686
| * | Don't try to open unexisting files in helpStefan Parviainen2015-01-181-12/+13
* | | Merge pull request #864 from git-marijus/masterRedMatrix2015-01-198-7/+246
|\ \ \ | |_|/ |/| |
| * | fix linkmarijus2015-01-181-2/+2
| * | fix goaway linkmarijus2015-01-181-2/+2
| * | fix profile tabs linkmarijus2015-01-181-1/+1
| * | basic proof of concept file activity support - will send activity via the fil...marijus2015-01-188-7/+246
|/ /
* | Merge pull request #859 from einervonvielen/Issue_846_view_calendar_eventpafcu2015-01-182-1/+2
|\ \
| * | Fixed #846 Viewing event from calendar displays eventEiner von Vielen2015-01-182-1/+2
* | | Merge pull request #858 from pafcu/masterpafcu2015-01-171-0/+1
|\ \ \ | |/ / |/| / | |/
| * Remove accidental loggingStefan Parviainen2015-01-171-1/+0
| * Fix bug with groups and autocompleteStefan Parviainen2015-01-171-0/+2
* | Merge pull request #856 from pafcu/masterpafcu2015-01-161-16/+13
|\|
| * Fix some issues with tagging.Stefan Parviainen2015-01-161-16/+13
* | more doc updatesfriendica2015-01-1635-0/+2759
* | mod_prep usability enhancements, doc updatesfriendica2015-01-16134-3736/+4250
* | validate poco chatrooms before storingfriendica2015-01-151-0/+3
* | fix to poco chatroomsfriendica2015-01-151-4/+4
* | errors in mod_pocofriendica2015-01-151-2/+2
* | more heavy lifting on poco repfriendica2015-01-156-24/+51
* | document the poco reputation kill switchfriendica2015-01-151-1/+2
* | make sure mod/prep follows the poco_rating allow preferencefriendica2015-01-151-0/+9
* | Merge branch 'pocorate'friendica2015-01-1511-6/+156
|\ \
| * | poco rating - add a test module for pulling out ratingsfriendica2015-01-154-5/+90
| * | editing stuff for poco reputationfriendica2015-01-154-3/+33
| * | more backend work on poco ratingfriendica2015-01-158-5/+40
* | | backend for mailhost addonfriendica2015-01-151-0/+8
* | | Merge https://github.com/friendica/red into pending_mergefriendica2015-01-151-14/+2
|\ \ \ | | |/ | |/|
| * | Merge pull request #854 from pafcu/fixcollapsepafcu2015-01-151-14/+2
| |\ \
| | * | Actually fix problem with post collapsing in webkit-based browsersStefan Parviainen2015-01-151-14/+2
| * | | Merge pull request #853 from friendica/revert-852-mastermrjive2015-01-150-0/+0
| |\ \ \
| | * | | Revert "Merge pull request #1 from friendica/master"mrjive2015-01-150-0/+0
| |/ / /
| * | | Merge pull request #852 from mrjive/mastermrjive2015-01-150-0/+0
| |\ \ \ | | |_|/ | |/| |
| | * | Merge pull request #1 from friendica/mastermrjive2015-01-062895-102490/+663457
| | |\ \
* | | | | revupfriendica2015-01-151-1/+1
|/ / / /
* | | | provide correct permissions role default for old-timers that didn't have any ...friendica2015-01-141-1/+4
* | | | Merge https://github.com/friendica/red into pending_mergefriendica2015-01-145-1/+105
|\ \ \ \
| * \ \ \ Merge pull request #850 from einervonvielen/tocRedMatrix2015-01-155-1/+105
| |\ \ \ \
| | * \ \ \ Merge remote-tracking branch 'upstream/master' into tocEiner von Vielen2015-01-1422-116/+128
| | |\ \ \ \
| | * | | | | Added a table of content as bbcode element [toc] for webpages2015-01-146-195/+101
| | * | | | | TestEiner von Vielen2015-01-134-0/+198
* | | | | | | correct some activity object types (for comments), also fix a foreach warning...friendica2015-01-142-16/+28
|/ / / / / /
* | | | | | ignore bbcode open tag (left bracket) in hash and mention tag regexes and tur...friendica2015-01-141-2/+2
* | | | | | some back-end code to support location activity objects. Work in progress.friendica2015-01-142-0/+2
* | | | | | federate consensus items (in network only). Work in progress.friendica2015-01-142-1/+8