| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 | ||||
| | | * | | 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" | ||||
| | | * | | | 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 | ||||
| | | * | | Merge pull request #1 from friendica/master | mrjive | 2015-01-06 | 2895 | -102490/+663457 |
| | | |\ \ | | | | | | | | | | | test pull request | ||||
| * | | | | | 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 |
| | | | | | | | | | | | | | | | | | role configured. | ||||
| * | | | | 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 |
| | |\ \ \ \ | | | | | | | | | | | | | Added a table of content as bbcode element [toc] for webpages | ||||
| | | * \ \ \ | Merge remote-tracking branch 'upstream/master' into toc | Einer von Vielen | 2015-01-14 | 22 | -116/+128 |
| | | |\ \ \ \ | |||||
| | | * | | | | | Added a table of content as bbcode element [toc] for webpages | 2015-01-14 | 6 | -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 | ||||
| | | * | | | | | Test | Einer von Vielen | 2015-01-13 | 4 | -0/+198 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...with table of content. jquery.tableofconent.js works bunt not properly | ||||
| * | | | | | | | correct some activity object types (for comments), also fix a foreach ↵ | friendica | 2015-01-14 | 2 | -16/+28 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | warning resulting from recent tag work | ||||
| * | | | | | | ignore bbcode open tag (left bracket) in hash and mention tag regexes and ↵ | friendica | 2015-01-14 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | turn it into a tag delimiter | ||||
| * | | | | | | some back-end code to support location activity objects. Work in progress. | friendica | 2015-01-14 | 2 | -0/+2 |
| | | | | | | | |||||
| * | | | | | | federate consensus items (in network only). Work in progress. | friendica | 2015-01-14 | 2 | -1/+8 |
| | | | | | | | |||||
| * | | | | | | honor disable_discover_tab in mod/home - it isn't a tab here but basically ↵ | friendica | 2015-01-14 | 2 | -1/+6 |
| | |/ / / / |/| | | | | | | | | | | | | | | block public content from showing if it's set. | ||||
| * | | | | | check mentions against the appropriate xchan_url and not a hard-coded ↵ | friendica | 2015-01-13 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | /channel/ string | ||||
| * | | | | | now that's useful... | friendica | 2015-01-13 | 1 | -2/+8 |
| | | | | | | |||||
| * | | | | | provide a setting to control ALLOWCODE permissions at the channel level - it ↵ | friendica | 2015-01-13 | 4 | -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 ↵ | friendica | 2015-01-13 | 1 | -30/+19 |
| | | | | | | | | | | | | | | | | | | | | | another branch and not destabilise core | ||||
| * | | | | | Merge branch 'pafcu-moretagging' | friendica | 2015-01-13 | 9 | -17/+32 |
| |\ \ \ \ \ | |||||
| | * | | | | | Merge branch 'moretagging' of git://github.com/pafcu/red into pafcu-moretagging | friendica | 2015-01-13 | 9 | -17/+32 |
| |/| | | | | | | |_|_|/ | |/| | | | | | | | | | | | | | Conflicts: mod/profiles.php | ||||
| | * | | | | Allow tags in event description and location | Stefan Parviainen | 2015-01-13 | 1 | -0/+4 |
| | | | | | | |||||
| | * | | | | Allow tags in mail, many profile fields, and admin info | Stefan Parviainen | 2015-01-13 | 8 | -17/+27 |
| | | | | | | |||||
| * | | | | | hide friends broken, add parameter for item search by verb | friendica | 2015-01-13 | 7 | -2/+9 |
| | | | | | | |||||
| * | | | | | uninitialised theme parent in mod/cloud | friendica | 2015-01-12 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | theme toggle issue when viewing mod/cloud of another channel | friendica | 2015-01-12 | 3 | -18/+9 |
| | | | | | | |||||
| * | | | | | document the pros and cons of the not-yet written hassle-free connection ↵ | friendica | 2015-01-12 | 1 | -0/+9 |
| | | | | | | | | | | | | | | | | | | | | | auto-permission setting. | ||||
| * | | | | | don't wipe out the item body of a linked item to a photo when doing a normal ↵ | friendica | 2015-01-12 | 1 | -7/+18 |
| | | | | | | | | | | | | | | | | | | | | | delete and not forced | ||||
| * | | | | | change deletion behaviour of linked photo items. Previously deleting the ↵ | friendica | 2015-01-12 | 2 | -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_merge | friendica | 2015-01-12 | 6 | -116/+98 |
| |\ \ \ \ | |||||
| | * | | | | Merge pull request #844 from pafcu/moretagging | pafcu | 2015-01-12 | 5 | -116/+96 |
| | |\| | | | | | | | | | | | | | Refactor mention code to make it more reusable | ||||
| | | * | | | Refactor mention code to make it more reusable | Stefan Parviainen | 2015-01-12 | 5 | -116/+96 |
| | | | | | | |||||
| | * | | | | Merge pull request #842 from pafcu/master | pafcu | 2015-01-12 | 1 | -0/+2 |
| | |\| | | | | | | | | | | | | | Possibly fix issue with readmore.js collapse | ||||
| | | * | | | Possibly fix issue with readmore.js collapse | Stefan Parviainen | 2015-01-12 | 1 | -0/+2 |
| | |/ / / | |||||
| * / / / | double perms msg | friendica | 2015-01-12 | 2 | -2/+2 |
| |/ / / | |||||
| * | | | another attempt to explain default permissions on connedit page | friendica | 2015-01-11 | 4 | -18/+46 |
| | | | | |||||
| * | | | remove extraneous debug file left over from postgres work. | friendica | 2015-01-11 | 1 | -1/+0 |
| | | | | |||||
| * | | | that was not intended to be merged with master yet. Put it under a define | friendica | 2015-01-11 | 1 | -2/+36 |
| | | | | |||||
| * | | | optionally use openssl encryption functions (higher performance over mcrypt, ↵ | friendica | 2015-01-11 | 1 | -2/+2 |
| | | | | | | | | | | | | | but potentially more likely to have been compromised) | ||||
| * | | | allow the use of openssl crypto | friendica | 2015-01-11 | 1 | -0/+6 |
| | | | | |||||
| * | | | basic backend work for creating consensus items | friendica | 2015-01-11 | 5 | -27/+84 |
| | | | | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |