| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-30 | 1 | -1/+1 |
| |\ | |||||
| | * | dummy update | redmatrix | 2015-07-30 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-23 | 1 | -1/+0 |
| |\| | | | | | | | | | Conflicts: include/diaspora.php | ||||
| | * | patch to allow theme based widgets | redmatrix | 2015-07-23 | 1 | -1/+0 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-03 | 1 | -1/+1 |
| |\| | | | | | | | | | | | | | Conflicts: boot.php include/items.php util/messages.po | ||||
| | * | in hubzilla we're going to convert doco to items. define it here so that an ↵ | redmatrix | 2015-07-03 | 1 | -0/+1 |
| | | | | | | | | | accidental import/export doesn't chuck a wobbly. | ||||
| * | | start doco cleanup | redmatrix | 2015-07-03 | 1 | -0/+3 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-28 | 1 | -1/+1 |
| |\| | | | | | | | | | | | | | Conflicts: include/zot.php mod/connedit.php util/messages.po | ||||
| | * | no this isn't it. well ok, it's part of it, but not the important part. it's ↵ | redmatrix | 2015-06-28 | 1 | -1/+1 |
| | | | | | | | | | still pretty cool. | ||||
| * | | more work on photos, including os_storage for the size '0' photo and ↵ | redmatrix | 2015-06-23 | 1 | -2/+2 |
| | | | | | | | | | numbering duplicate filenames | ||||
| * | | more work on item table optimisation | redmatrix | 2015-06-10 | 1 | -0/+1 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-09 | 1 | -1/+1 |
| |\| | | | | | | | | | | | | | | | | | Conflicts: install/schema_mysql.sql mod/home.php mod/page.php view/nl/messages.po view/nl/strings.php | ||||
| | * | add site_dead flag to prevent delivery to dead sites. Allow sys channel ↵ | redmatrix | 2015-06-08 | 1 | -1/+1 |
| | | | | | | | | | webpages to be viewed even if site is configured "block public". | ||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-28 | 1 | -1/+1 |
| |\| | | | | | | | | | | | | | | | Conflicts: install/schema_mysql.sql mod/impel.php view/pt-br/messages.po view/pt-br/strings.php | ||||
| | * | add menu_created, menu_edited fields to DB | redmatrix | 2015-05-28 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-27 | 1 | -2/+3 |
| |\| | | | | | | | | | Conflicts: mod/impel.php | ||||
| * | | Merge branch 'master' into tres | redmatrix | 2015-05-17 | 1 | -1/+13 |
| |\ \ | |||||
| | * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-17 | 1 | -1/+13 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | | * | Implement permission checking for OAuth clients using the xperm table. ↵ | redmatrix | 2015-05-17 | 1 | -0/+10 |
| | | | | | | | | | | | | | 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. | ||||
| | | * | preserve htmlhead in case somebody needs it | Mario Vavti | 2015-05-15 | 1 | -1/+3 |
| | | | | |||||
| * | | | Merge branch 'master' into tres | redmatrix | 2015-05-14 | 1 | -1/+1 |
| |\| | | |||||
| | * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-14 | 1 | -1/+1 |
| | |\| | |||||
| | | * | provide default permissions ('all') for existing and newly created OAuth app ↵ | redmatrix | 2015-05-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | clients, which will be extended in the future to allow specific permissions. | ||||
| * | | | Merge branch 'master' into tres | redmatrix | 2015-05-14 | 1 | -9/+9 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | -2/+2 |
| | |\| | | | | | | | | | | | | | | | | | | | 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 | 1 | -2/+2 |
| | | | | | | | | | | | | | and RED_PLATFORM is equally problematic for other reasons. | ||||
| | * | | second pass name change | redmatrix | 2015-05-05 | 1 | -3/+3 |
| | | | | |||||
| | * | | first pass name change | redmatrix | 2015-05-05 | 1 | -4/+4 |
| | | | | |||||
| | * | | change name | redmatrix | 2015-05-05 | 1 | -1/+1 |
| | |/ | |||||
| * | | Merge branch 'master' into tres | friendica | 2015-04-23 | 1 | -56/+167 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/Contact.php include/ItemObject.php include/api.php include/attach.php include/diaspora.php include/dir_fns.php include/enotify.php include/event.php include/expire.php include/items.php include/notifier.php include/notify.php include/photos.php include/taxonomy.php include/text.php include/widgets.php include/zot.php mod/admin.php mod/channel.php mod/dirsearch.php mod/display.php mod/editwebpage.php mod/events.php mod/home.php mod/item.php mod/manage.php mod/mood.php mod/network.php mod/page.php mod/photos.php mod/ping.php mod/post.php mod/thing.php mod/viewsrc.php view/css/mod_events.css | ||||
| | * | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-03-29 | 1 | -47/+32 |
| | |\ | |||||
| | | * | Correcting reported Doxygen syntax warnings. | Klaus Weidenbach | 2015-03-29 | 1 | -47/+32 |
| | | | | | | | | | | | | | | | | | | | | | | Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation. | ||||
| | * | | fix os_mkdir | friendica | 2015-03-29 | 1 | -2/+3 |
| | |/ | |||||
| | * | add channel_lastpost timestamp to help optimise some outrageously expensive ↵ | friendica | 2015-03-26 | 1 | -1/+1 |
| | | | | | | | | | queries. | ||||
| | * | reduce the occurrence of duplicated notice() messages | friendica | 2015-03-12 | 1 | -5/+8 |
| | | | |||||
| | * | channel delegation | friendica | 2015-03-10 | 1 | -0/+3 |
| | | | |||||
| | * | straighten out some directory stuff, which required some Comanche structural ↵ | friendica | 2015-03-05 | 1 | -2/+20 |
| | | | | | | | | | changes | ||||
| | * | add queue priority | friendica | 2015-03-04 | 1 | -1/+1 |
| | | | |||||
| | * | login adjustment | Mario Vavti | 2015-03-03 | 1 | -2/+2 |
| | | | |||||
| | * | automated warning after a few days if poller is dead | friendica | 2015-03-02 | 1 | -0/+43 |
| | | | |||||
| | * | Nag hub admins with self-signed certs to fix them. Otherwise we'll just have ↵ | friendica | 2015-03-01 | 1 | -0/+34 |
| | | | | | | | | | | | | | to start marking them as dead sites. | ||||
| | * | require access token to view, query, or join directories in private realms, ↵ | friendica | 2015-02-24 | 1 | -1/+1 |
| | | | | | | | | | if the realm is so configured. | ||||
| | * | Updated doxygen docu about deperecated functions. | Klaus Weidenbach | 2015-02-18 | 1 | -5/+27 |
| | | | | | | | | | | | Corrected wrong return types in doxygen docu and add a deprecation log entry. | ||||
| | * | hub upgrade w/name change via Alex | friendica | 2015-02-16 | 1 | -1/+1 |
| | | | |||||
| | * | Patches from Thomas regarding offline status off whogotzot.com | jeroenpraat | 2015-02-14 | 1 | -1/+0 |
| | | | |||||
| | * | provide relief to sites that are severely impacted by the slow ITEM_UNSEEN ↵ | friendica | 2015-02-12 | 1 | -1/+1 |
| | | | | | | | | | searches. This does not incorporate any other flag optimisations as that will require a major DB update and possibly involve significant downtime. This is just to bite off a little chunk now and provide some much needed relief. | ||||
| | * | more progress on event confirmations | friendica | 2015-02-10 | 1 | -0/+3 |
| | | | |||||
| * | | Merge branch 'master' into tres | friendica | 2015-02-05 | 1 | -0/+7 |
| |\| | | | | | | | | | | | Conflicts: view/css/mod_events.css view/theme/redbasic/css/style.css | ||||
| | * | improved directory registration - honour standalones and do the right thing | friendica | 2015-02-02 | 1 | -0/+7 |
| | | | |||||
| * | | Merge branch 'master' into tres | friendica | 2015-02-01 | 1 | -1/+14 |
| |\| | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |