Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | more work on media uploads via api | redmatrix | 2015-12-17 | 1 | -0/+4 |
| | |||||
* | more work on api media uploads | redmatrix | 2015-12-13 | 1 | -1/+1 |
| | |||||
* | handle old files with partial paths | redmatrix | 2015-11-05 | 1 | -3/+7 |
| | |||||
* | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-11-04 | 1 | -3/+3 |
|\ | | | | | | | | | Conflicts: install/update.php | ||||
* | | Support files with names like foo.0.1.3.ogg | ken restivo | 2015-10-27 | 1 | -3/+3 |
| | | |||||
* | | Correct mime types via https://wiki.xiph.org/MIME_Types_and_File_Extensions | ken restivo | 2015-10-27 | 1 | -1/+4 |
| | | |||||
* | | another try to avoid dubble photo deletion. allow to set a photo caption and ↵ | Mario Vavti | 2015-10-24 | 1 | -5/+10 |
| | | | | | | | | simple status body (if create status post is enabled) on upload | ||||
* | | if photo deleted from /cloud or /dav also delete from /photos | Mario Vavti | 2015-10-15 | 1 | -0/+5 |
| | | |||||
* | | issue #87 - photos not getting deleted from mod_photo when deleted in DAV or ↵ | redmatrix | 2015-10-14 | 1 | -1/+11 |
| | | | | | | | | cloud | ||||
* | | issue #82 - args not defined (should be arr) | redmatrix | 2015-10-14 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #80 from git-marijus/master | redmatrix | 2015-10-14 | 1 | -2/+2 |
|\ \ | | | | | | | fix /channel not updating after posting comment | ||||
| * | | fix photo visibility switch on photo upload | Mario Vavti | 2015-10-13 | 1 | -2/+2 |
| | | | |||||
* | | | file migration - continued | redmatrix | 2015-10-13 | 1 | -4/+29 |
|/ / | |||||
* | | missing underscore | redmatrix | 2015-10-12 | 1 | -1/+1 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-10-12 | 1 | -2/+2 |
|\| | | | | | | | | | Conflicts: include/attach.php | ||||
| * | attach_list_files had some problems - wasn't used until now apparently | redmatrix | 2015-10-12 | 1 | -2/+2 |
| | | |||||
* | | small change to allow a person with sufficient privileges the ability to ↵ | redmatrix | 2015-10-12 | 1 | -3/+12 |
| | | | | | | | | import a file into their cloud storage from elsewhere in the server filesystem - without nuking it in the process. | ||||
* | | change photo permissions when attach permissions are changed through ↵ | redmatrix | 2015-09-18 | 1 | -1/+11 |
| | | | | | | | | mod/filestorage, and fix lockview for photos. | ||||
* | | make js_upload work with hubzilla. It still needs a rewrite. | redmatrix | 2015-09-05 | 1 | -10/+34 |
| | | |||||
* | | change attach_store to allow a predefined item to accompany a photo | redmatrix | 2015-08-26 | 1 | -0/+2 |
| | | |||||
* | | lots of stuff that was needed for successful photo import from red | redmatrix | 2015-08-24 | 1 | -11/+66 |
| | | |||||
* | | attach_store needs a lot of documenting to understand what's going on and ↵ | redmatrix | 2015-08-13 | 1 | -0/+23 |
| | | | | | | | | how it got to be this way. Here's the bird's eye view. | ||||
* | | more file permissions inheritance work | redmatrix | 2015-08-06 | 1 | -4/+11 |
| | | |||||
* | | photo permission inheritance. We want to use the folder permissions unless ↵ | redmatrix | 2015-08-06 | 1 | -1/+13 |
| | | | | | | | | specific permissions have been set to over-ride them. If nothing is set, use the channel default. We may have to mess with his further in the case of somebody trying to create a public photo directory when their normal permissions are set to private. Kind of a chicken/egg problem because the folder permissions will be empty. | ||||
* | | minor - add all the newly supported table columns | redmatrix | 2015-07-30 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-30 | 1 | -25/+22 |
|\| | | | | | | | | | | | several dav fixes Conflicts: include/items.php | ||||
* | | some photo/attach permissions issues | redmatrix | 2015-07-18 | 1 | -12/+22 |
| | | |||||
* | | localise event calendar | redmatrix | 2015-06-25 | 1 | -54/+70 |
| | | |||||
* | | more work on photos, including os_storage for the size '0' photo and ↵ | redmatrix | 2015-06-23 | 1 | -8/+37 |
| | | | | | | | | numbering duplicate filenames | ||||
* | | all file attachments are now stored natively, still have photos-0 to store ↵ | redmatrix | 2015-06-18 | 1 | -11/+68 |
| | | | | | | | | natively | ||||
* | | more photos work | redmatrix | 2015-06-17 | 1 | -1/+1 |
| | | |||||
* | | lots of work on merging photo and file albums/folders | redmatrix | 2015-06-17 | 1 | -20/+40 |
| | | |||||
* | | attach_mkdirp - implement force option to return success if dir exists | redmatrix | 2015-06-17 | 1 | -2/+9 |
| | | |||||
* | | recursive mkdir (ala mkdir -p) for file and photo storage | redmatrix | 2015-06-16 | 1 | -1/+90 |
| | | |||||
* | | start work on photo directories | redmatrix | 2015-06-16 | 1 | -2/+30 |
| | | |||||
* | | remove file/attachments when their associated photos are removed | redmatrix | 2015-06-16 | 1 | -2/+3 |
| | | |||||
* | | move profile photos to new methods | redmatrix | 2015-06-15 | 1 | -1/+7 |
| | | |||||
* | | fix attachment permissions when they also contain an image. | redmatrix | 2015-06-15 | 1 | -0/+2 |
| | | |||||
* | | photo upload: pass in the contact_allow and resource_id via include/attach.php | redmatrix | 2015-06-15 | 1 | -2/+6 |
| | | |||||
* | | first cut at merging files and photos, not yet well integrated but they are ↵ | redmatrix | 2015-06-14 | 1 | -4/+10 |
| | | | | | | | | integrated | ||||
* | | isolate the os_storage flag | redmatrix | 2015-06-13 | 1 | -17/+23 |
| | | |||||
* | | start on the DAV/photos merger | redmatrix | 2015-06-11 | 1 | -12/+30 |
| | | |||||
* | | Merge branch 'master' into tres | redmatrix | 2015-05-17 | 1 | -32/+39 |
|\ \ | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-17 | 1 | -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 Weidenbach | 2015-05-17 | 1 | -32/+39 |
| | | | |||||
| * | | convert ITEM_WALL from bitfield to standalone | redmatrix | 2015-05-06 | 1 | -1/+2 |
| |/ | |||||
* | | Merge branch 'master' into tres | friendica | 2015-04-23 | 1 | -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 menu | Mario Vavti | 2015-04-12 | 1 | -1/+1 |
| | | |||||
| * | make fs deletion of directories work | Mario Vavti | 2015-04-12 | 1 | -2/+2 |
| | | |||||
| * | reverse file activity logic | Mario Vavti | 2015-04-12 | 1 | -2/+2 |
| | |