| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-18 | 2 | -4/+6 |
| |\| | |||||
| | * | this should fix undeletable blocks and layouts | redmatrix | 2015-05-18 | 2 | -4/+6 |
| | | | |||||
| * | | fix some merge errors | redmatrix | 2015-05-18 | 3 | -1012/+1270 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-18 | 2 | -8/+16 |
| |\| | |||||
| | * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-05-18 | 4 | -385/+446 |
| | |\ | |||||
| | * | | fix po2php to handle projectname variables correctly | redmatrix | 2015-05-18 | 2 | -8/+16 |
| | | | | |||||
| * | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-18 | 7 | -134/+188 |
| |\ \ \ | | |/ | |/| | | | | | | | | | | Conflicts: view/nl/messages.po view/nl/strings.php | ||||
| | * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | Mario Vavti | 2015-05-18 | 1 | -0/+47 |
| | |\ \ | |||||
| | | * \ | Merge pull request #326 from sierracircle/patch-1 | redmatrix | 2015-05-19 | 1 | -0/+47 |
| | | |\ \ | | | | | | | | | | | Create Primary-Directory | ||||
| | | | * | | Create Primary-Directory | Adam Robertson | 2015-05-18 | 1 | -0/+47 |
| | | | | | | | | | | | | | | | | Description and Instruction on using a Primary Directory for a series of Private Hubs | ||||
| | * | | | | 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 |
| | |/ / | |||||
| | * / | Update Dutch (Projectname variable not translated yet, because of undefined ↵ | jeroenpraat | 2015-05-18 | 2 | -383/+390 |
| | |/ | | | | | | | variable) | ||||
| | * | spelling | redmatrix | 2015-05-17 | 2 | -4/+4 |
| | | | |||||
| * | | Merge branch 'tres' | redmatrix | 2015-05-18 | 69 | -843/+657 |
| |\ \ | |||||
| | * \ | Merge branch 'master' into tres | redmatrix | 2015-05-17 | 31 | -421/+612 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'master' into tres | redmatrix | 2015-05-14 | 19 | -18/+537 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'master' into tres | redmatrix | 2015-05-14 | 187 | -9453/+9692 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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' into tres | friendica | 2015-05-01 | 5 | -3/+37 |
| | |\ \ \ \ \ | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |