aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* basic proof of concept file activity support - will send activity via the ↵marijus2015-01-188-7/+246
| | | | filestorage module and via attach_delete()
* Merge pull request #859 from einervonvielen/Issue_846_view_calendar_eventpafcu2015-01-182-1/+2
|\ | | | | Fixed #846 Viewing event from calendar displays event
| * Fixed #846 Viewing event from calendar displays eventEiner von Vielen2015-01-182-1/+2
| | | | | | See https://github.com/friendica/red/issues/846
* | Merge pull request #858 from pafcu/masterpafcu2015-01-171-0/+1
|\ \ | |/ |/| Fix bug with groups and autocomplete
| * 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.
| * 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 browsers
| | * | 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"
| | * | | 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/master
| | * | Merge pull request #1 from friendica/mastermrjive2015-01-062895-102490/+663457
| | |\ \ | | | | | | | | | | test pull request
* | | | | revupfriendica2015-01-151-1/+1
|/ / / /
* | | | provide correct permissions role default for old-timers that didn't have any ↵friendica2015-01-141-1/+4
| | | | | | | | | | | | | | | | role configured.
* | | | Merge https://github.com/friendica/red into pending_mergefriendica2015-01-145-1/+105
|\ \ \ \
| * \ \ \ Merge pull request #850 from einervonvielen/tocRedMatrix2015-01-155-1/+105
| |\ \ \ \ | | | | | | | | | | | | Added a table of content as bbcode element [toc] for webpages
| | * \ \ \ 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Included jquery.toc.js (http://www.apache.org/licenses/LICENSE-2.0) - Modified jquery.toc.js to work with the webpages of the red#matrix - Added info to the help
| | * | | | | TestEiner von Vielen2015-01-134-0/+198
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ...with table of content. jquery.tableofconent.js works bunt not properly
* | | | | | | correct some activity object types (for comments), also fix a foreach ↵friendica2015-01-142-16/+28
|/ / / / / / | | | | | | | | | | | | | | | | | | warning resulting from recent tag work
* | | | | | ignore bbcode open tag (left bracket) in hash and mention tag regexes and ↵friendica2015-01-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | turn it into a tag delimiter
* | | | | | 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
| | | | | |
* | | | | | honor disable_discover_tab in mod/home - it isn't a tab here but basically ↵friendica2015-01-142-1/+6
| |/ / / / |/| | | | | | | | | | | | | | block public content from showing if it's set.
* | | | | check mentions against the appropriate xchan_url and not a hard-coded ↵friendica2015-01-131-4/+4
| | | | | | | | | | | | | | | | | | | | /channel/ string
* | | | | now that's useful...friendica2015-01-131-2/+8
| | | | |
* | | | | provide a setting to control ALLOWCODE permissions at the channel level - it ↵friendica2015-01-134-9/+9
| | | | | | | | | | | | | | | | | | | | isn't always appropriate to apply this to all channels in an account.
* | | | | revert recent 3.0 changes to mod/cloud so we can work on this completely in ↵friendica2015-01-131-30/+19
| | | | | | | | | | | | | | | | | | | | another branch and not destabilise core
* | | | | Merge branch 'pafcu-moretagging'friendica2015-01-139-17/+32
|\ \ \ \ \
| * | | | | Merge branch 'moretagging' of git://github.com/pafcu/red into pafcu-moretaggingfriendica2015-01-139-17/+32
|/| | | | | | | |_|_|/ | |/| | | | | | | | | | | | | Conflicts: mod/profiles.php
| * | | | Allow tags in event description and locationStefan Parviainen2015-01-131-0/+4
| | | | |
| * | | | Allow tags in mail, many profile fields, and admin infoStefan Parviainen2015-01-138-17/+27
| | | | |
* | | | | hide friends broken, add parameter for item search by verbfriendica2015-01-137-2/+9
| | | | |
* | | | | uninitialised theme parent in mod/cloudfriendica2015-01-121-1/+1
| | | | |