aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | |
* | | | | theme toggle issue when viewing mod/cloud of another channelfriendica2015-01-123-18/+9
| | | | |
* | | | | document the pros and cons of the not-yet written hassle-free connection ↵friendica2015-01-121-0/+9
| | | | | | | | | | | | | | | | | | | | auto-permission setting.
* | | | | don't wipe out the item body of a linked item to a photo when doing a normal ↵friendica2015-01-121-7/+18
| | | | | | | | | | | | | | | | | | | | delete and not forced
* | | | | change deletion behaviour of linked photo items. Previously deleting the ↵friendica2015-01-122-29/+13
| |/ / / |/| | | | | | | | | | | visible item in the conversation deleted the photo as well. Now photos must be deleted in the photos module. Deleting the linked item removes any attached conversation elements (likes, etc.) and sets the conversation item to hidden. This may create an issue in the future if we move the photo tags, title, or other photo elements to the linked item rather than the photo. Noting here so this can potentially be discovered and remembered at that time.
* | | | Merge https://github.com/friendica/red into pending_mergefriendica2015-01-126-116/+98
|\ \ \ \
| * | | | Merge pull request #844 from pafcu/moretaggingpafcu2015-01-125-116/+96
| |\| | | | | | | | | | | | | Refactor mention code to make it more reusable
| | * | | Refactor mention code to make it more reusableStefan Parviainen2015-01-125-116/+96
| | | | |
| * | | | Merge pull request #842 from pafcu/masterpafcu2015-01-121-0/+2
| |\| | | | | | | | | | | | | Possibly fix issue with readmore.js collapse
| | * | | Possibly fix issue with readmore.js collapseStefan Parviainen2015-01-121-0/+2
| |/ / /
* / / / double perms msgfriendica2015-01-122-2/+2
|/ / /
* | | another attempt to explain default permissions on connedit pagefriendica2015-01-114-18/+46
| | |
* | | remove extraneous debug file left over from postgres work.friendica2015-01-111-1/+0
| | |
* | | that was not intended to be merged with master yet. Put it under a definefriendica2015-01-111-2/+36
| | |
* | | optionally use openssl encryption functions (higher performance over mcrypt, ↵friendica2015-01-111-2/+2
| | | | | | | | | | | | but potentially more likely to have been compromised)