| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | more heavy lifting on poco rep | friendica | 2015-01-15 | 1 | -0/+1 |
| | | |||||
| * | Merge branch 'pocorate' | friendica | 2015-01-15 | 1 | -2/+5 |
| |\ | |||||
| | * | more backend work on poco rating | friendica | 2015-01-15 | 1 | -2/+5 |
| | | | |||||
| * | | backend for mailhost addon | friendica | 2015-01-15 | 1 | -0/+8 |
| |/ | |||||
| * | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-01-14 | 1 | -0/+4 |
| |\ | |||||
| | * | Merge pull request #850 from einervonvielen/toc | RedMatrix | 2015-01-15 | 1 | -0/+4 |
| | |\ | | | | | | | 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 | 4 | -56/+48 |
| | | |\ | |||||
| | | * | | Added a table of content as bbcode element [toc] for webpages | 2015-01-14 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | - 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 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | ...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 | 1 | -2/+7 |
| |/ / / | | | | | | | | | | 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 | ||||
| * | | | federate consensus items (in network only). Work in progress. | friendica | 2015-01-14 | 1 | -0/+7 |
| | |/ |/| | |||||
| * | | check mentions against the appropriate xchan_url and not a hard-coded ↵ | friendica | 2015-01-13 | 1 | -4/+4 |
| | | | | | | | | | /channel/ string | ||||
| * | | provide a setting to control ALLOWCODE permissions at the channel level - it ↵ | friendica | 2015-01-13 | 1 | -4/+4 |
| | | | | | | | | | isn't always appropriate to apply this to all channels in an account. | ||||
| * | | Merge branch 'moretagging' of git://github.com/pafcu/red into pafcu-moretagging | friendica | 2015-01-13 | 2 | -14/+2 |
| |\ \ | | | | | | | | | | | | | Conflicts: mod/profiles.php | ||||
| | * | | Allow tags in mail, many profile fields, and admin info | Stefan Parviainen | 2015-01-13 | 2 | -14/+2 |
| | |/ | |||||
| * | | 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 | 1 | -0/+9 |
| | | | |||||
| * | | 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 | 1 | -28/+12 |
| |/ | | | | 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. | ||||
| * | Refactor mention code to make it more reusable | Stefan Parviainen | 2015-01-12 | 2 | -0/+61 |
| | | |||||
| * | 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 | 3 | -27/+60 |
| | | |||||
| * | Merge remote-tracking branch 'upstream/master' | Christian Vogeley | 2015-01-11 | 21 | -154/+169 |
| |\ | | | | | | | | | | | Conflicts: doc/html/classRedmatrix_1_1Import_1_1Import-members.html doc/html/classRedmatrix_1_1Import_1_1Import.js | ||||
| | * | connection clone issues | friendica | 2015-01-10 | 1 | -0/+3 |
| | | | |||||
| | * | basic changes for file activity | marijus | 2015-01-09 | 2 | -1/+6 |
| | | | |||||
| | * | clean up some url anomalies in dir_sort_links after security fix | friendica | 2015-01-08 | 1 | -1/+3 |
| | | | |||||
| | * | double q argument could also cause issues | friendica | 2015-01-08 | 1 | -1/+4 |
| | | | |||||
| | * | SECURITY: dir_sort_links() exposes session cookie | friendica | 2015-01-08 | 1 | -2/+2 |
| | | | |||||
| | * | include channel clones in PM deliveries (also some whitespace edits) | friendica | 2015-01-08 | 3 | -16/+17 |
| | | | |||||
| | * | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-01-07 | 1 | -9/+1 |
| | |\ | |||||
| | | * | Merge autocomplete caching, show more results in navbar search | Stefan Parviainen | 2015-01-07 | 4 | -42/+56 |
| | | |\ | |||||
| | | * | | Make nav search use textcomplete | Stefan Parviainen | 2015-01-07 | 1 | -9/+1 |
| | | | | | |||||
| | * | | | syncing connections issue, incorrect return_url after deleting connection | friendica | 2015-01-07 | 1 | -0/+2 |
| | | |/ | |/| | |||||
| | * | | don't update locally deleted items | friendica | 2015-01-06 | 1 | -3/+8 |
| | | | | |||||
| | * | | don't let dns_get_record() "write to screen" if it errors. | friendica | 2015-01-06 | 1 | -2/+2 |
| | | | | |||||
| | * | | lines reversed in handle_tag() | friendica | 2015-01-06 | 1 | -2/+2 |
| | | | | |||||
| | * | | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-01-06 | 1 | -1/+1 |
| | |\| | |||||
| | | * | Add title to bb_observer tags to further clarify a bit what's going on | Stefan Parviainen | 2015-01-06 | 1 | -1/+1 |
| | | | | |||||
| | * | | regression: need float clear on manage page so footer doesn't end up floated, | friendica | 2015-01-05 | 1 | -35/+44 |
| | |/ | | | | | | | add default value to features so that features can be created that are default enabled, or modified later to default enabled without requiring a system config to accomplish this. | ||||
| | * | detect https coming through reverse proxy or load balancer using ↵ | friendica | 2015-01-05 | 1 | -0/+2 |
| | | | | | | | | | x-forwarded-proto instead of (actually in addition to testing) $_SERVER['HTTPS'] and/or $_SERVER['SERVER_PORT'] to indicate ssl is enabled | ||||
| | * | Replace jslider with jRange | Stefan Parviainen | 2015-01-05 | 1 | -1/+1 |
| | | | |||||
| | * | Use grouped select field for role selection | Stefan Parviainen | 2015-01-01 | 1 | -29/+9 |
| | | | |||||
| | * | Use grouped select field for timezone selection | Stefan Parviainen | 2015-01-01 | 1 | -38/+9 |
| | | | |||||
| | * | Revert "Revert "Language names via intl library."" | Stefan Parviainen | 2014-12-31 | 2 | -7/+25 |
| | | | | | | | | | This reverts commit 4f35efa0bad4ae6489b63f3eebafe6542d654094. | ||||
| | * | Revert "Language names via intl library." | RedMatrix | 2014-12-31 | 2 | -25/+7 |
| | | | |||||
| | * | Merge pull request #796 from pafcu/profeditfix | RedMatrix | 2014-12-31 | 1 | -1/+4 |
| | |\ | | | | | | | Don't show links to edit alternate profiles if multi_profiles is disable... | ||||
| | | * | Don't show links to edit alternate profiles if multi_profiles is disabled | Stefan Parviainen | 2014-12-30 | 1 | -1/+4 |
| | | | | |||||
| | * | | Merge pull request #794 from pafcu/lang | RedMatrix | 2014-12-31 | 2 | -7/+25 |
| | |\ \ | | | | | | | | | Language names via intl library. | ||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |