Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | |||||
| * | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-03-29 | 1 | -61/+55 |
| |\ | |||||
| | * | Correcting reported Doxygen syntax warnings. | Klaus Weidenbach | 2015-03-29 | 1 | -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_mkdir | friendica | 2015-03-29 | 1 | -1/+1 |
| |/ | |||||
| * | we only need item mid. some documentation. | Mario Vavti | 2015-03-24 | 1 | -1/+35 |
| | | |||||
| * | do not override item_private here anymore | Mario Vavti | 2015-03-22 | 1 | -1/+1 |
| | | |||||
| * | Bugfix und variable initialization. | Klaus Weidenbach | 2015-03-21 | 1 | -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 cleanup | Mario Vavti | 2015-03-20 | 1 | -13/+8 |
| | | |||||
| * | possible improvement regarding deletion | Mario Vavti | 2015-03-20 | 1 | -29/+42 |
| | | |||||
| * | do not send activity to channels with no permission to view filestorage | marijus | 2015-02-18 | 1 | -2/+21 |
| | | |||||
| * | item_unseen update | marijus | 2015-02-13 | 1 | -0/+1 |
| | | |||||
| * | provide relief to sites that are severely impacted by the slow ITEM_UNSEEN ↵ | friendica | 2015-02-12 | 1 | -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 #843 | friendica | 2015-02-11 | 1 | -2/+2 |
| | | |||||
| * | improve sql query | marijus | 2015-02-09 | 1 | -6/+1 |
| | | |||||
* | | Merge branch 'master' into tres | friendica | 2015-02-05 | 1 | -1/+150 |
|\| | | | | | | | | | | | Conflicts: view/css/mod_events.css view/theme/redbasic/css/style.css | ||||
| * | typo | marijus | 2015-02-05 | 1 | -1/+1 |
| | | |||||
| * | forgot to remove some debug stuff | marijus | 2015-02-05 | 1 | -2/+0 |
| | | |||||
| * | make file activity respect parent dir permissions work | marijus | 2015-02-05 | 1 | -22/+66 |
| | | |||||
| * | not quite there yet but getting closer a little | marijus | 2015-02-04 | 1 | -28/+60 |
| | | |||||
| * | comment out latest changes - needs more testing | marijus | 2015-02-02 | 1 | -4/+4 |
| | | |||||
| * | comment this out for now - it is not always true | marijus | 2015-02-02 | 1 | -2/+2 |
| | | |||||
| * | one important line missing | marijus | 2015-02-02 | 1 | -0/+1 |
| | | |||||
| * | we also need folder here | marijus | 2015-02-02 | 1 | -1/+1 |
| | | |||||
| * | typo | marijus | 2015-02-02 | 1 | -1/+1 |
| | | |||||
| * | just select perms | marijus | 2015-02-02 | 1 | -1/+1 |
| | | |||||
| * | respect parent dir permissions | marijus | 2015-02-02 | 1 | -0/+74 |
| | |