| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-27 | 8 | -15/+130 |
| |\ | | | | | | | | | Conflicts: mod/impel.php | ||||
| | * | some high-level stuff we may need for shareable menus. Also make the client ↵ | redmatrix | 2015-05-27 | 1 | -11/+1 |
| | | | | | | | | | register function do the right thing even though I refuse to make it work. If **you** want service federation with things like pumpio and openid connect, it's time for **you** to put your own skin in the game and quit treating project volunteers like excrement just because you can't get up off your lazy buttocks. | ||||
| | * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-05-27 | 2 | -0/+81 |
| | |\ | |||||
| | | * | Merge branch 'master' of https://github.com/redmatrix/redmatrix | Mario Vavti | 2015-05-27 | 1 | -1/+1 |
| | | |\ | |||||
| | | * | | define some custom attributes and html5 elements for htmlpurifier | Mario Vavti | 2015-05-27 | 1 | -0/+66 |
| | | | | | |||||
| | | * | | make it possible to include menus in blocks - this will only work in html ↵ | Mario Vavti | 2015-05-27 | 1 | -0/+15 |
| | | | | | | | | | | | | | | | | | blocks of course | ||||
| | * | | | fix for forked thread on diaspora | redmatrix | 2015-05-27 | 2 | -11/+5 |
| | | | | | |||||
| | * | | | revert for now | redmatrix | 2015-05-27 | 1 | -5/+5 |
| | | | | | |||||
| | * | | | Comments need to have some kind of routing instructions. | redmatrix | 2015-05-26 | 1 | -0/+13 |
| | | |/ | |/| | |||||
| | * | | Update api.php | jeroenpraat | 2015-05-26 | 1 | -1/+1 |
| | |/ | | | | | one comma to much | ||||
| | * | placeholder for dynamic rego | redmatrix | 2015-05-25 | 2 | -10/+2 |
| | | | |||||
| | * | slow but forward progress on dynamic client registration | redmatrix | 2015-05-25 | 1 | -0/+42 |
| | | | |||||
| | * | some work on issue #329 | redmatrix | 2015-05-25 | 3 | -7/+10 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-24 | 4 | -18/+27 |
| |\| | | | | | | | | | | | Conflicts: index.php mod/setup.php | ||||
| | * | one more | Habeas Codice | 2015-05-24 | 1 | -2/+2 |
| | | | |||||
| | * | avoid db compatibility issues | Habeas Codice | 2015-05-24 | 1 | -2/+2 |
| | | | |||||
| | * | logic has changed - this is not needed anymore | Mario Vavti | 2015-05-24 | 1 | -6/+1 |
| | | | |||||
| | * | should not call prepare text here anymore | Mario Vavti | 2015-05-24 | 1 | -1/+1 |
| | | | |||||
| | * | Merge pull request #332 from solstag/zotfeedcleanup | Klaus | 2015-05-24 | 1 | -3/+1 |
| | |\ | | | | | | | Import security only when necessary, use correct variable in log | ||||
| | | * | Import security only when necessary, use correct variable in log | Alexandre Hannud Abdo | 2015-05-22 | 1 | -3/+1 |
| | | | | | | | | | | | | | Just some cleanup, seemed like the intent of previous changes was so | ||||
| | * | | federation problem from diaspora comments relayed through red channels due ↵ | redmatrix | 2015-05-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | to typo | ||||
| | * | | add channel_id to local_dir_update hook | redmatrix | 2015-05-23 | 1 | -1/+1 |
| | | | | |||||
| | * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-05-23 | 1 | -4/+17 |
| | |\ \ | |||||
| | | * | | use $a->data instead of $a->page for $content and ad another library for use ↵ | Mario Vavti | 2015-05-23 | 1 | -4/+17 |
| | | |/ | | | | | | | | | | with webpages - foundation | ||||
| | * / | add local_dir_update hook | redmatrix | 2015-05-23 | 1 | -1/+4 |
| | |/ | |||||
| * | | more migration of page types | redmatrix | 2015-05-21 | 2 | -3/+3 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-20 | 5 | -34/+50 |
| |\| | | | | | | | | | | | | | | | Conflicts: include/items.php include/text.php mod/item.php view/nl/messages.po | ||||
| | * | cloning abook entries was broken in several ways if the target xchan wasn't ↵ | redmatrix | 2015-05-20 | 2 | -16/+13 |
| | | | | | | | | | available on the clone site. This should make it less broken. | ||||
| | * | don't allow item_id to update without a valid post id | redmatrix | 2015-05-20 | 1 | -0/+5 |
| | | | |||||
| | * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-05-20 | 1 | -1/+18 |
| | |\ | |||||
| | | * | make design elements translateable | Mario Vavti | 2015-05-20 | 1 | -1/+18 |
| | | | | |||||
| | * | | PRIVACY: possible privacy leakage under a defined set of circumstances | redmatrix | 2015-05-20 | 3 | -20/+13 |
| | |/ | |||||
| * | | re-arrange the html cache a bit | redmatrix | 2015-05-20 | 3 | -12/+19 |
| | | | |||||
| * | | more db structure | redmatrix | 2015-05-19 | 1 | -10/+1 |
| | | | |||||
| * | | add rot47 to the mix. This shouldn't affect the speed to any measurable degree. | redmatrix | 2015-05-19 | 4 | -20/+26 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-19 | 1 | -1/+2 |
| |\| | | | | | | | | | | | Conflicts: view/nl/messages.po view/nl/strings.php | ||||
| | * | remove dbg code | Mario Vavti | 2015-05-19 | 1 | -1/+1 |
| | | | |||||
| | * | be verbose about what type of element (block, layout, webpage) is beeing ↵ | Mario Vavti | 2015-05-19 | 1 | -1/+2 |
| | | | | | | | | | installed | ||||
| * | | mail_obscure - AES-256 is way too slow, simplify. Ideally a substitution ↵ | redmatrix | 2015-05-19 | 4 | -33/+29 |
| | | | | | | | | | cipher would be adequate for our requirements. | ||||
| * | | vsprintf error | redmatrix | 2015-05-18 | 1 | -1/+1 |
| | | | |||||
| * | | consensus items not working correctly and make the collections widget abide ↵ | redmatrix | 2015-05-18 | 2 | -4/+8 |
| | | | | | | | | | by the corresponding feature setting. This needs to be backported as it is borken in redmatrix. Also provide the ability to change the number of most recent expanded comments to conversations on a site-wide basis, increase it to 3 by default. We may also want this as a personal setting. | ||||
| * | | bring the new photo schema into play | redmatrix | 2015-05-18 | 2 | -24/+16 |
| | | | |||||
| * | | fix some merge errors | redmatrix | 2015-05-18 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-18 | 1 | -2/+9 |
| |\| | | | | | | | | | | | Conflicts: view/nl/messages.po view/nl/strings.php | ||||
| | * | if block title contains $content but $content title is empty do not show an ↵ | Mario Vavti | 2015-05-18 | 1 | -1/+1 |
| | | | | | | | | | empty <h3> tag | ||||
| | * | remove dbg code | Mario Vavti | 2015-05-18 | 1 | -2/+0 |
| | | | |||||
| | * | allow block title to contain $content title | Mario Vavti | 2015-05-18 | 1 | -2/+11 |
| | | | |||||
| * | | Merge branch 'master' into tres | redmatrix | 2015-05-17 | 9 | -45/+216 |
| |\ \ | |||||
| | * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-17 | 9 | -45/+216 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/bb2diaspora.php include/diaspora.php include/enotify.php mod/admin.php mod/cloud.php mod/dav.php mod/home.php mod/invite.php mod/like.php mod/mitem.php mod/p.php mod/pubsites.php mod/setup.php mod/siteinfo.php util/messages.po | ||||
| | | * | missing $ | redmatrix | 2015-05-17 | 1 | -1/+1 |
| | | | | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |