| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 |
| | | | | |||||
| | | * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-05-17 | 2 | -32/+105 |
| | | |\ | |||||
| | | | * | Merge pull request #322 from dawnbreak/master | redmatrix | 2015-05-18 | 1 | -0/+66 |
| | | | |\ | | | | | | | | | | | Add functions to parse and get some values from php.ini. | ||||
| | | | | * | Add functions to parse and get some values from php.ini. | Klaus Weidenbach | 2015-05-16 | 1 | -0/+66 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Get upload limits from php.ini. These functions will be used for checking against upload limits and to give information in the frontend. Wasn't sure in which file to put these functions, so I created a new one include/environment.php. | ||||
| | | | * | | Merge pull request #323 from dawnbreak/docu | redmatrix | 2015-05-18 | 1 | -32/+39 |
| | | | |\ \ | | | | | | | | | | | | | Add some more documentation to attach_store() | ||||
| | | | | * | | Add some more documentation to attach_store() | Klaus Weidenbach | 2015-05-17 | 1 | -32/+39 |
| | | | | |/ | |||||
| | | * | / | Implement permission checking for OAuth clients using the xperm table. ↵ | redmatrix | 2015-05-17 | 3 | -5/+95 |
| | | |/ / | | | | | | | | | | | | | Currently 'all' permissions are applied to OAuth clients which gives them the same rights as the channel owner and full access to API functions as the channel owner. However, individual permissions can now be created. These mirror the permission names from the normal permission table (although it isn't required that they do so). Lack of an xp_perm entry for the specified permission and lack of an 'all' override indicates permission denied. | ||||
| | | * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-05-17 | 1 | -1/+8 |
| | | |\| | |||||
| | | | * | allow a block to contain $content | Mario Vavti | 2015-05-15 | 1 | -1/+8 |
| | | | | | |||||
| | | * | | more work isolating the projectname from core. | redmatrix | 2015-05-17 | 3 | -7/+7 |
| | | |/ | |||||
| * | | | Merge branch 'master' into tres | redmatrix | 2015-05-14 | 24 | -119/+234 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/Import/refimport.php include/activities.php include/attach.php include/event.php include/externals.php include/identity.php include/items.php include/notifier.php include/photos.php include/taxonomy.php include/zot.php mod/channel.php mod/connedit.php mod/events.php mod/item.php mod/like.php mod/manage.php mod/mood.php mod/ping.php mod/poke.php mod/subthread.php mod/tagger.php mod/thing.php | ||||
| | * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-13 | 6 | -9/+9 |
| | |\| | | | | | | | | | | | | | | | | | | | Conflicts: boot.php include/api.php include/enotify.php | ||||
| | | * | product was a bad string to use because we may require it for e-commerce, ↵ | redmatrix | 2015-05-13 | 6 | -9/+9 |
| | | | | | | | | | | | | | and RED_PLATFORM is equally problematic for other reasons. | ||||
| | * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-12 | 4 | -4/+23 |
| | |\| | | | | | | | | | | | | | | | | Conflicts: mod/mitem.php view/nl/strings.php | ||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |