| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-24 | 2 | -3/+3 |
| |\ | |||||
| | * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-05-24 | 6 | -274/+322 |
| | |\ | |||||
| | * | | search result heading not translatable | redmatrix | 2015-05-24 | 2 | -3/+3 |
| | | | | |||||
| * | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-24 | 29 | -799/+19945 |
| |\ \ \ | | |/ | |/| | | | | | | | | | | 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 #331 from solstag/jqueryprop | redmatrix | 2015-05-24 | 1 | -2/+2 |
| | |\ \ | | | | | | | | | Fix accepting contacts by using correct jquery calls. | ||||
| | | * | | Fix accepting contacts by using correct jquery calls. | Alexandre Hannud Abdo | 2015-05-22 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not sure what the operation on disabled is supposed to do, but it also seemed to requier prop instead of attr. See for reference: http://api.jquery.com/prop/ """ The checked attribute value does not change with the state of the checkbox, while the checked property does. """ | ||||
| | * | | | Merge pull request #333 from dawnbreak/docu | redmatrix | 2015-05-24 | 2 | -258/+313 |
| | |\ \ \ | | | | | | | | | | | Add PHP's xml module check and upload limits to setup. | ||||
| | | * | | | Add PHP's xml module check and upload limits to setup. | Klaus Weidenbach | 2015-05-24 | 2 | -258/+313 |
| | | | |/ | | |/| | | | | | | | | | And some documentation. | ||||
| | * | | | 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 | 21 | -4/+19094 |
| | |\ \ | |||||
| | | * | | use $a->data instead of $a->page for $content and ad another library for use ↵ | Mario Vavti | 2015-05-23 | 21 | -4/+19094 |
| | | |/ | | | | | | | | | | with webpages - foundation | ||||
| | * / | add local_dir_update hook | redmatrix | 2015-05-23 | 3 | -523/+529 |
| | |/ | |||||
| * | | more migration of page types | redmatrix | 2015-05-21 | 8 | -42/+40 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-21 | 2 | -2/+5 |
| |\| | |||||
| | * | preserve lock on edited comments | redmatrix | 2015-05-21 | 2 | -2/+5 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-20 | 13 | -118/+151 |
| |\| | | | | | | | | | | | | | | | 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. | ||||
| | * | check for success before updating remote id | redmatrix | 2015-05-20 | 1 | -8/+9 |
| | | | |||||
| | * | 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 | 3 | -72/+89 |
| | |\ | |||||
| | | * | Another update for Dutch with complete $Projectname substitutions (and ↵ | jeroenpraat | 2015-05-20 | 2 | -71/+71 |
| | | | | | | | | | | | | | channel activity as suggested on previous discussion) | ||||
| | | * | 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 | 8 | -26/+32 |
| | |/ | |||||
| * | | re-arrange the html cache a bit | redmatrix | 2015-05-20 | 3 | -12/+19 |
| | | | |||||
| * | | more db structure | redmatrix | 2015-05-19 | 2 | -16/+32 |
| | | | |||||
| * | | add rot47 to the mix. This shouldn't affect the speed to any measurable degree. | redmatrix | 2015-05-19 | 4 | -20/+26 |
| | | | |||||
| * | | merge redmatrix fix | redmatrix | 2015-05-19 | 1 | -2/+2 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-19 | 1 | -1/+9 |
| |\| | |||||
| | * | issue with deleting imported design elements and re-installing them | redmatrix | 2015-05-19 | 1 | -1/+9 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-19 | 6 | -57/+80 |
| |\| | | | | | | | | | | | Conflicts: view/nl/messages.po view/nl/strings.php | ||||
| | * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-05-19 | 6 | -108/+127 |
| | |\ | |||||
| | | * | Merge pull request #327 from solstag/help | redmatrix | 2015-05-20 | 3 | -3/+21 |
| | | |\ | | | | | | | | | Document php-xml requirement for webdav and widget creation. | ||||
| | | | * | Document widget creation. | Alexandre Hannud Abdo | 2015-05-19 | 2 | -1/+17 |
| | | | | | |||||
| | | | * | Document php-xml requirement for webdav. | Alexandre Hannud Abdo | 2015-05-19 | 1 | -2/+4 |
| | | | | | |||||
| | | * | | 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 | ||||
| | | * | New update Dutch | jeroenpraat | 2015-05-19 | 2 | -104/+104 |
| | | | | |||||
| | * | | version update | redmatrix | 2015-05-19 | 1 | -1/+1 |
| | |/ | |||||
| * | | mail_obscure - AES-256 is way too slow, simplify. Ideally a substitution ↵ | redmatrix | 2015-05-19 | 5 | -35/+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. | ||||
| * | | get rid of photo_flags in the code | redmatrix | 2015-05-18 | 1 | -7/+7 |
| | | | |||||
| * | | bring the new photo schema into play | redmatrix | 2015-05-18 | 5 | -53/+37 |
| | | | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |