| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-31 | 1 | -2/+1 | |
| |\| | | | | | | | | | | | | | | | Conflicts: include/identity.php install/update.php util/messages.po view/nl/messages.po | |||||
| | * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-31 | 1 | -1/+0 | |
| | |\ | ||||||
| | | * | Removed redmatrix.nl as a fallback server (directory mode to normal) + ↵ | jeroenpraat | 2015-08-29 | 1 | -1/+0 | |
| | | | | | | | | | | | | | update strings ES | |||||
| | * | | change the likes db structure to make it more easily importable/exportable | redmatrix | 2015-08-31 | 1 | -1/+1 | |
| | |/ | ||||||
| * | | Changed favicon to new one (based on new Hubzilla arrow). Please revert when ↵ | jeroenpraat | 2015-08-31 | 1 | -1/+1 | |
| | | | | | | | | | it's not okay. Also added a new optional default profile photo, in the same style. | |||||
| * | | more work on AccessList integration | redmatrix | 2015-08-27 | 1 | -0/+1 | |
| | | | ||||||
| * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-27 | 1 | -1/+1 | |
| |\| | ||||||
| | * | fallback directory server list update | redmatrix | 2015-08-27 | 1 | -1/+1 | |
| | | | ||||||
| * | | add load_pdl hook for plugins | redmatrix | 2015-08-22 | 1 | -0/+5 | |
| | | | ||||||
| * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-20 | 1 | -1/+1 | |
| |\| | ||||||
| | * | missed this one - it's required | redmatrix | 2015-08-20 | 1 | -1/+1 | |
| | | | ||||||
| * | | more work on tasks | redmatrix | 2015-08-20 | 1 | -0/+1 | |
| | | | ||||||
| * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-18 | 1 | -1/+1 | |
| |\| | ||||||
| | * | add event_sequence for vtodo's | redmatrix | 2015-08-18 | 1 | -1/+1 | |
| | | | ||||||
| * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-16 | 1 | -1/+1 | |
| |\| | ||||||
| | * | add DB support for tasks, todo items and repeating events | redmatrix | 2015-08-16 | 1 | -1/+1 | |
| | | | ||||||
| * | | update | redmatrix | 2015-08-07 | 1 | -17/+5 | |
| | | | ||||||
| * | | 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 | |
| | |/ | ||||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |