| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-10-13 | 1 | -3/+4 |
| |\ | | | | | | | | | Conflicts: include/api.php | ||||
| | * | api extenesions for file migration | redmatrix | 2015-10-13 | 1 | -4/+5 |
| | | | |||||
| * | | port of file detail api call | redmatrix | 2015-10-12 | 1 | -3/+1 |
| | | | |||||
| * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-10-12 | 1 | -0/+24 |
| |\| | |||||
| | * | file detail api call (will not work for huge files) | redmatrix | 2015-10-12 | 1 | -0/+24 |
| | | | |||||
| * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-10-12 | 1 | -0/+8 |
| |\| | | | | | | | | | Conflicts: include/attach.php | ||||
| | * | attach_list_files had some problems - wasn't used until now apparently | redmatrix | 2015-10-12 | 1 | -0/+8 |
| | | | |||||
| * | | preserve code blocks on item import if channel has code rights. When ↵ | redmatrix | 2015-09-08 | 1 | -0/+49 |
| | | | | | | | | | | | | | importing the channel itself, turn code access off unless this is the admin. | ||||
| * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-26 | 1 | -1/+1 |
| |\| | |||||
| | * | use extended export format for items in api photo_detail | redmatrix | 2015-08-26 | 1 | -1/+1 |
| | | | |||||
| * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-26 | 1 | -1/+21 |
| |\| | |||||
| | * | add item info to photo detail in api | redmatrix | 2015-08-26 | 1 | -1/+21 |
| | | | |||||
| * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-19 | 1 | -50/+71 |
| |\| | | | | | | | | | Conflicts: include/api.php | ||||
| | * | add photo_detail api call | redmatrix | 2015-08-18 | 1 | -68/+89 |
| | | | |||||
| * | | item flag fixes discovered after a few merges | redmatrix | 2015-06-23 | 1 | -10/+7 |
| | | | |||||
| * | | convert the abook fields | redmatrix | 2015-06-14 | 1 | -7/+7 |
| | | | |||||
| * | | more work on item table optimisation | redmatrix | 2015-06-10 | 1 | -13/+26 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-27 | 1 | -0/+32 |
| |\| | | | | | | | | | Conflicts: mod/impel.php | ||||
| | * | some high-level stuff we may need for shareable menus. Also make the client ↵ | redmatrix | 2015-05-27 | 1 | -11/+1 |
| | | | | | | | | | register function do the right thing even though I refuse to make it work. If **you** want service federation with things like pumpio and openid connect, it's time for **you** to put your own skin in the game and quit treating project volunteers like excrement just because you can't get up off your lazy buttocks. | ||||
| | * | Update api.php | jeroenpraat | 2015-05-26 | 1 | -1/+1 |
| | | | | | | | one comma to much | ||||
| | * | placeholder for dynamic rego | redmatrix | 2015-05-25 | 1 | -2/+2 |
| | | | |||||
| | * | slow but forward progress on dynamic client registration | redmatrix | 2015-05-25 | 1 | -0/+42 |
| | | | |||||
| * | | Merge branch 'master' into tres | redmatrix | 2015-05-17 | 1 | -1/+4 |
| |\ \ | |||||
| | * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-17 | 1 | -1/+4 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | -1/+4 |
| | | | | | | | | | | | | | 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. | ||||
| * | | | Merge branch 'master' into tres | redmatrix | 2015-05-14 | 1 | -2/+2 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: 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 | -1/+1 |
| | | | | | | | | | | | | | and RED_PLATFORM is equally problematic for other reasons. | ||||
| | * | | convert ITEM_WALL from bitfield to standalone | redmatrix | 2015-05-06 | 1 | -3/+2 |
| | | | | |||||
| | * | | first pass name change | redmatrix | 2015-05-05 | 1 | -1/+1 |
| | |/ | |||||
| * | | Merge branch 'master' into tres | friendica | 2015-04-23 | 1 | -93/+264 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | doco updates | friendica | 2015-04-19 | 1 | -3/+0 |
| | | | |||||
| | * | add favorites/create and destroy to api | friendica | 2015-04-19 | 1 | -36/+137 |
| | | | |||||
| | * | api performance enhancer | friendica | 2015-04-19 | 1 | -5/+2 |
| | | | |||||
| | * | assorted fixes to api direct messages | friendica | 2015-04-19 | 1 | -31/+35 |
| | | | |||||
| | * | some api cleanup | friendica | 2015-04-19 | 1 | -11/+15 |
| | | | |||||
| | * | api - unobscure mail | friendica | 2015-04-19 | 1 | -4/+4 |
| | | | |||||
| | * | log this since we may need it to track down failures | friendica | 2015-04-18 | 1 | -2/+3 |
| | | | |||||
| | * | remove failed experiment | friendica | 2015-04-17 | 1 | -2/+0 |
| | | | |||||
| | * | add last post to api/account/verify_credentials | friendica | 2015-04-17 | 1 | -5/+60 |
| | | | |||||
| | * | limit notification detail queries for items and events | friendica | 2015-03-23 | 1 | -1/+5 |
| | | | |||||
| | * | operation snakebite, cont. | friendica | 2015-03-22 | 1 | -0/+10 |
| | | | |||||
| | * | also update the api to match | friendica | 2015-03-16 | 1 | -2/+2 |
| | | | |||||
| | * | remove superfluous non-boolean boolean | Habeas Codice | 2015-02-16 | 1 | -2/+2 |
| | | | |||||
| | * | provide relief to sites that are severely impacted by the slow ITEM_UNSEEN ↵ | friendica | 2015-02-12 | 1 | -4/+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. | ||||
| * | | Merge branch 'master' into tres | friendica | 2015-01-29 | 1 | -2/+2 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/group.php include/text.php mod/acl.php mod/channel.php mod/connections.php mod/display.php mod/group.php mod/item.php mod/locs.php mod/network.php mod/photos.php mod/ping.php mod/starred.php mod/viewsrc.php | ||||
| | * | local_user => local_channel | friendica | 2015-01-28 | 1 | -2/+2 |
| | | | |||||
| * | | heavy lifting converting item flag bits | friendica | 2015-01-22 | 1 | -11/+6 |
| |/ | |||||
| * | some improvements in api direct messages | friendica | 2014-12-22 | 1 | -4/+9 |
| | | |||||
| * | direct messages in api have some issues, not properly ported from friendica ↵ | friendica | 2014-12-22 | 1 | -9/+10 |
| | | | | | | | originally. Here's a start. I think at best they may return encrypted gibberish currently, but let's work through them one at a time. | ||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |