aboutsummaryrefslogtreecommitdiffstats
path: root/include/attach.php
Commit message (Collapse)AuthorAgeFilesLines
* first cut at merging files and photos, not yet well integrated but they are ↵redmatrix2015-06-141-4/+10
| | | | integrated
* isolate the os_storage flagredmatrix2015-06-131-17/+23
|
* start on the DAV/photos mergerredmatrix2015-06-111-12/+30
|
* Merge branch 'master' into tresredmatrix2015-05-171-32/+39
|\
| * Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-171-32/+39
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Add some more documentation to attach_store()Klaus Weidenbach2015-05-171-32/+39
| | |
| * | convert ITEM_WALL from bitfield to standaloneredmatrix2015-05-061-1/+2
| |/
* | Merge branch 'master' into tresfriendica2015-04-231-96/+162
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * make dropItem more universal and move delete up in the dropdown menuMario Vavti2015-04-121-1/+1
| |
| * make fs deletion of directories workMario Vavti2015-04-121-2/+2
| |
| * reverse file activity logicMario Vavti2015-04-121-2/+2
| |
| * Merge https://github.com/friendica/red into pending_mergefriendica2015-03-291-61/+55
| |\
| | * Correcting reported Doxygen syntax warnings.Klaus Weidenbach2015-03-291-61/+55
| | | | | | | | | | | | | | | | | | | | | 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_mkdirfriendica2015-03-291-1/+1
| |/
| * we only need item mid. some documentation.Mario Vavti2015-03-241-1/+35
| |
| * do not override item_private here anymoreMario Vavti2015-03-221-1/+1
| |
| * Bugfix und variable initialization.Klaus Weidenbach2015-03-211-23/+38
| | | | | | | | | | Fixed a wrong perm_is_allowed() parameter, commented some other places where we use variables that are not set and should not work.
| * some cleanupMario Vavti2015-03-201-13/+8
| |
| * possible improvement regarding deletionMario Vavti2015-03-201-29/+42
| |
| * do not send activity to channels with no permission to view filestoragemarijus2015-02-181-2/+21
| |
| * item_unseen updatemarijus2015-02-131-0/+1
| |
| * provide relief to sites that are severely impacted by the slow ITEM_UNSEEN ↵friendica2015-02-121-1/+3
| | | | | | | | 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.
| * issue #843friendica2015-02-111-2/+2
| |
| * improve sql querymarijus2015-02-091-6/+1
| |
* | Merge branch 'master' into tresfriendica2015-02-051-1/+150
|\| | | | | | | | | | | Conflicts: view/css/mod_events.css view/theme/redbasic/css/style.css
| * typomarijus2015-02-051-1/+1
| |
| * forgot to remove some debug stuffmarijus2015-02-051-2/+0
| |
| * make file activity respect parent dir permissions workmarijus2015-02-051-22/+66
| |
| * not quite there yet but getting closer a littlemarijus2015-02-041-28/+60
| |
| * comment out latest changes - needs more testingmarijus2015-02-021-4/+4
| |
| * comment this out for now - it is not always truemarijus2015-02-021-2/+2
| |
| * one important line missingmarijus2015-02-021-0/+1
| |
| * we also need folder heremarijus2015-02-021-1/+1
| |
| * typomarijus2015-02-021-1/+1
| |
| * just select permsmarijus2015-02-021-1/+1
| |
| * respect parent dir permissionsmarijus2015-02-021-0/+74
| |
* | Merge branch 'master' into tresfriendica2015-01-291-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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_channelfriendica2015-01-281-1/+1
| |
* | Merge branch 'master' into tres and add some work on the item_deleted flag ↵friendica2015-01-261-55/+137
|\| | | | | | | | | | | | | | | | | | | refactor Conflicts: include/attach.php include/onedirsync.php include/zot.php mod/locs.php
| * optimize check querymarijus2015-01-241-2/+7
| |
| * the old item must be removed before the new is createdmarijus2015-01-241-1/+8
| |
| * disable noticesmarijus2015-01-241-2/+2
| |
| * some more kissmarijus2015-01-241-65/+51
| |
| * typomarijus2015-01-231-1/+1
| |
| * we get the object info before it is deleted nowmarijus2015-01-231-12/+12
| |
| * some code restructuremarijus2015-01-231-43/+55
| |
| * add some mimetypesmarijus2015-01-221-0/+21
| |
| * make $links an array of linksmarijus2015-01-221-1/+2
| |
| * change mod/sharedwithme backend to use activity object - this is not ↵marijus2015-01-221-27/+76
| | | | | | | | backwards compatible
* | slow progress removing bitfields on item tablefriendica2015-01-211-3/+6
|/