| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-20 | 4 | -11/+24 |
| |\ | | | | | | | | | | | | | | | Conflicts: include/items.php include/text.php mod/item.php view/nl/messages.po | ||||
| | * | check for success before updating remote id | redmatrix | 2015-05-20 | 1 | -8/+9 |
| | | | |||||
| | * | PRIVACY: possible privacy leakage under a defined set of circumstances | redmatrix | 2015-05-20 | 3 | -5/+15 |
| | | | |||||
| * | | 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 |
| | | | |||||
| * | | mail_obscure - AES-256 is way too slow, simplify. Ideally a substitution ↵ | redmatrix | 2015-05-19 | 1 | -2/+0 |
| | | | | | | | | | cipher would be adequate for our requirements. | ||||
| * | | 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 | 2 | -27/+19 |
| | | | |||||
| * | | 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 | 1 | -2/+4 |
| | | | |||||
| * | | Merge branch 'master' into tres | redmatrix | 2015-05-17 | 11 | -22/+20 |
| |\ \ | |||||
| | * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-17 | 11 | -22/+20 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | | * | more work isolating the projectname from core. | redmatrix | 2015-05-17 | 11 | -18/+18 |
| | | | | |||||
| * | | | Merge branch 'master' into tres | redmatrix | 2015-05-14 | 1 | -10/+15 |
| |\| | | |||||
| | * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-14 | 1 | -10/+15 |
| | |\| | |||||
| | | * | provide default permissions ('all') for existing and newly created OAuth app ↵ | redmatrix | 2015-05-14 | 1 | -10/+15 |
| | | | | | | | | | | | | | clients, which will be extended in the future to allow specific permissions. | ||||
| * | | | Merge branch 'master' into tres | redmatrix | 2015-05-14 | 24 | -69/+67 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -1/+1 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/DerivedTheme1.md doc/Developers.md doc/Features.md doc/Plugins.md doc/Privacy.md doc/README.md doc/Remove-Account.md doc/Translations.md doc/about.bb doc/account_basics.bb doc/accounts_profiles_channels_basics.bb doc/addons.bb doc/addons_gnusocial.bb doc/bbcode.html doc/campaign.bb doc/classRedmatrix_1_1Import_1_1Import-members.html doc/classRedmatrix_1_1Import_1_1Import.html doc/cloud.bb doc/connecting_to_channels.bb doc/connecting_to_channels.md doc/credits.bb doc/de/channels.bb doc/de/features.bb doc/de/main.bb doc/de/registration.bb doc/developers.bb doc/encryption.bb doc/external-resource-links.bb doc/extra_features.bb doc/faq_admins.bb doc/faq_developers.bb doc/faq_members.bb doc/features.bb doc/hidden_configs.bb doc/history.md doc/html/index.php doc/main.bb doc/permissions.bb doc/plugins.bb doc/problems-following-an-update.bb doc/profiles.bb doc/red2pi.bb doc/registration.bb doc/roadmap.bb doc/sv/main.bb doc/what_is_zot.bb doc/zot.md | ||||
| | | * | remove project name dependency from most of the doc files to ease project ↵ | redmatrix | 2015-05-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | merging, there are going to be some edge cases requiring manual tweaking as most of this was done by script. | ||||
| | * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-13 | 5 | -7/+11 |
| | |\| | | | | | | | | | | | | | | | | | | | Conflicts: boot.php include/api.php include/enotify.php | ||||
| | | * | restrict webpage list to undeleted items | redmatrix | 2015-05-13 | 2 | -3/+3 |
| | | | | |||||
| | | * | product was a bad string to use because we may require it for e-commerce, ↵ | redmatrix | 2015-05-13 | 3 | -3/+3 |
| | | | | | | | | | | | | | and RED_PLATFORM is equally problematic for other reasons. | ||||
| | | * | issue #187 | redmatrix | 2015-05-12 | 1 | -1/+5 |
| | | | | |||||
| | * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-12 | 1 | -0/+3 |
| | |\| | | | | | | | | | | | | | | | | Conflicts: mod/mitem.php view/nl/strings.php | ||||
| | | * | let the site admin import a record directly from the probe diagnostic | redmatrix | 2015-05-11 | 1 | -0/+3 |
| | | | | |||||
| | | * | missing translation | redmatrix | 2015-05-11 | 1 | -1/+1 |
| | | | | |||||
| | * | | missing merge conflict | redmatrix | 2015-05-11 | 1 | -6/+1 |
| | | | | |||||
| | * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-10 | 1 | -4/+18 |
| | |\| | | | | | | | | | | | | | | | | | | | Conflicts: mod/mitem.php view/de/messages.po view/de/strings.php | ||||
| | | * | provide drop down submenu suggestions in edit mode | Mario Vavti | 2015-05-10 | 1 | -3/+4 |
| | | | | |||||
| | | * | provide ability to create submenus | Mario Vavti | 2015-05-10 | 1 | -2/+10 |
| | | | | |||||
| | * | | missed one... | redmatrix | 2015-05-06 | 1 | -1/+1 |
| | | | | |||||
| | * | | convert ITEM_WALL from bitfield to standalone | redmatrix | 2015-05-06 | 13 | -41/+38 |
| | | | | |||||
| | * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-06 | 1 | -1/+1 |
| | |\| | |||||
| | | * | avoid double slash after editing layout | Mario Vavti | 2015-05-06 | 1 | -1/+1 |
| | | | | |||||
| | * | | for hubzilla we won't be obscuring items, only private mail, this will allow ↵ | redmatrix | 2015-05-05 | 1 | -8/+0 |
| | | | | | | | | | | | | | us to search and cache private posts | ||||
| | * | | second pass name change | redmatrix | 2015-05-05 | 6 | -7/+7 |
| | | | | |||||
| | * | | first pass name change | redmatrix | 2015-05-05 | 9 | -20/+20 |
| | |/ | |||||
| * | | Merge branch 'master' into tres | friendica | 2015-04-29 | 8 | -54/+91 |
| |\| | | | | | | | | | Conflicts: include/notifier.php | ||||
| | * | disable voting in blocks, layouts and webpages | Mario Vavti | 2015-04-29 | 3 | -2/+5 |
| | | | |||||
| | * | fix $noloc state in mod editwebpages | Mario Vavti | 2015-04-29 | 1 | -1/+1 |
| | | | |||||
| | * | adjust placeholder naming | Mario Vavti | 2015-04-29 | 2 | -2/+3 |
| | | | |||||
| | * | Provide webpage layout description | Mario Vavti | 2015-04-25 | 1 | -2/+5 |
| | | | |||||
| | * | Merge https://github.com/redmatrix/redmatrix into pending_merge | friendica | 2015-04-24 | 5 | -46/+32 |
| | |\ | |||||
| | | * | provide block titles in blocklist | Mario Vavti | 2015-04-24 | 1 | -1/+3 |
| | | | | |||||
| | | * | add title to element array | Mario Vavti | 2015-04-24 | 3 | -3/+5 |
| | | | | |||||
| | | * | there is no key named term in this array | Mario Vavti | 2015-04-24 | 1 | -1/+0 |
| | | | | |||||
| | | * | copy/paste typo | Mario Vavti | 2015-04-24 | 1 | -1/+1 |
| | | | | |||||
| | | * | webpages layout fixes | Mario Vavti | 2015-04-24 | 3 | -43/+26 |
| | | | | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |