Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | do not try to remove photos twice | Mario Vavti | 2015-10-15 | 1 | -0/+6 |
| | |||||
* | issue #87 - photos not getting deleted from mod_photo when deleted in DAV or ↵ | redmatrix | 2015-10-14 | 1 | -2/+3 |
| | | | | cloud | ||||
* | issue #86 - like/dislike in photos not working | redmatrix | 2015-10-14 | 1 | -7/+7 |
| | |||||
* | change photo permissions when attach permissions are changed through ↵ | redmatrix | 2015-09-18 | 1 | -2/+2 |
| | | | | mod/filestorage, and fix lockview for photos. | ||||
* | syntax | redmatrix | 2015-09-05 | 1 | -1/+1 |
| | |||||
* | more work on AccessList integration | redmatrix | 2015-08-27 | 1 | -28/+25 |
| | |||||
* | prohibit some photo album edit operations until we figure out how to sync ↵ | redmatrix | 2015-08-05 | 1 | -20/+31 |
| | | | | them with dav | ||||
* | don't throw errors or do the wrong thing if photos have no album (placed on ↵ | redmatrix | 2015-08-05 | 1 | -8/+13 |
| | | | | your dav rootdir) | ||||
* | the view_photos and post_photos permissions are redundant and are now mapped ↵ | redmatrix | 2015-07-19 | 1 | -3/+3 |
| | | | | to view_storage and write_storage | ||||
* | more photos work | redmatrix | 2015-06-17 | 1 | -3/+9 |
| | |||||
* | lots of work on merging photo and file albums/folders | redmatrix | 2015-06-17 | 1 | -3/+2 |
| | |||||
* | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-16 | 1 | -0/+23 |
|\ | | | | | | | | | | | Conflicts: mod/photos.php mod/siteinfo.php | ||||
| * | make photo upload work for remote channels with perms | Mario Vavti | 2015-06-16 | 1 | -1/+13 |
| | | |||||
* | | remove file/attachments when their associated photos are removed | redmatrix | 2015-06-16 | 1 | -0/+7 |
| | | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-15 | 1 | -3/+3 |
|\| | | | | | | | | | | | Conflicts: view/nl/messages.po view/nl/strings.php | ||||
| * | do not allow/show acl button on photo edit if not owner | Mario Vavti | 2015-06-15 | 1 | -3/+3 |
| | | |||||
* | | convert the abook fields | redmatrix | 2015-06-14 | 1 | -1/+2 |
| | | |||||
* | | more work on items | redmatrix | 2015-06-11 | 1 | -1/+2 |
|\| | | | | | | | | | | | | | | | | | | | | | and Merge branch 'master' of https://github.com/redmatrix/redmatrix Conflicts: include/items.php view/it/messages.po view/it/strings.php | ||||
* | | more work on item table optimisation | redmatrix | 2015-06-10 | 1 | -3/+2 |
| | | |||||
* | | get rid of photo_flags in the code | redmatrix | 2015-05-18 | 1 | -7/+7 |
| | | |||||
* | | bring the new photo schema into play | redmatrix | 2015-05-18 | 1 | -9/+13 |
| | | |||||
* | | Merge branch 'master' into tres | friendica | 2015-04-23 | 1 | -3/+27 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | reverse file activity logic | Mario Vavti | 2015-04-12 | 1 | -1/+1 |
| | | |||||
| * | display a map for photos if allowed. Note: there is a bug in that if the map ↵ | friendica | 2015-03-16 | 1 | -0/+8 |
| | | | | | | | | div starts with display:none one needs to reload the frame or zoom in or they end up at minimum resolution. Still trying to sort this out. | ||||
| * | Change logic of "don't create a status post for this photo upload" and turn ↵ | friendica | 2015-03-10 | 1 | -1/+1 |
| | | | | | | | | it into a bona-fide on/off toggle. This takes up one more vertical line, but we have it to spare, and the single button (while concise visually) provided no feedback of the current state, or indicate whether a second click toggled it. Some addons use this setting so addons will need to be pulled when this is pulled in order to remain in sync. | ||||
| * | bring back like/dislike summaries on photos | friendica | 2015-02-16 | 1 | -4/+20 |
| | | |||||
| * | quick fix for photos page until calls to like_puller() are fixed | friendica | 2015-02-16 | 1 | -4/+4 |
| | | |||||
| * | provide relief to sites that are severely impacted by the slow ITEM_UNSEEN ↵ | friendica | 2015-02-12 | 1 | -4/+2 |
| | | | | | | | | 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 | -11/+11 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | remote_user => remote_channel | friendica | 2015-01-28 | 1 | -4/+4 |
| | | |||||
| * | local_user => local_channel | friendica | 2015-01-28 | 1 | -10/+10 |
| | | |||||
* | | start on item_restrict conversion | friendica | 2015-01-22 | 1 | -12/+1 |
| | | |||||
* | | heavy lifting converting item flag bits | friendica | 2015-01-22 | 1 | -4/+2 |
|/ | |||||
* | Merge branch 'moretagging' of git://github.com/pafcu/red into pafcu-moretagging | friendica | 2015-01-13 | 1 | -1/+1 |
|\ | | | | | | | | | Conflicts: mod/profiles.php | ||||
| * | Allow tags in mail, many profile fields, and admin info | Stefan Parviainen | 2015-01-13 | 1 | -1/+1 |
| | | |||||
* | | change deletion behaviour of linked photo items. Previously deleting the ↵ | friendica | 2015-01-12 | 1 | -1/+1 |
|/ | | | | visible item in the conversation deleted the photo as well. Now photos must be deleted in the photos module. Deleting the linked item removes any attached conversation elements (likes, etc.) and sets the conversation item to hidden. This may create an issue in the future if we move the photo tags, title, or other photo elements to the linked item rather than the photo. Noting here so this can potentially be discovered and remembered at that time. | ||||
* | Refactor mention code to make it more reusable | Stefan Parviainen | 2015-01-12 | 1 | -48/+19 |
| | |||||
* | Fix wrong require | Stefan Parviainen | 2015-01-04 | 1 | -1/+1 |
| | |||||
* | Cruft left over from stuff we don't have anymore. | Thomas Willingham | 2014-12-26 | 1 | -3/+0 |
| | |||||
* | minor photo flag issue - and some more whitespace edits | friendica | 2014-11-19 | 1 | -1/+1 |
| | |||||
* | turn the "adult photo flagging" (which prevents a particularly flagged photo ↵ | friendica | 2014-11-18 | 1 | -0/+1 |
| | | | | from showing up in your top level albums) into a feature so it doesn't clutter the normal photo edit form. This feature was a quick hack and needs more work; but it could be important to somebody. | ||||
* | another one | Habeas Codice | 2014-11-17 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' of https://github.com/habeascodice/red | Habeas Codice | 2014-11-17 | 1 | -1/+1 |
|\ | |||||
| * | fix lost $sql_extra in recent sql query changes | marijus | 2014-11-15 | 1 | -1/+1 |
| | | |||||
* | | fix boolean | Habeas Codice | 2014-11-17 | 1 | -1/+1 |
|/ | |||||
* | Merge remote-tracking branch 'upstream/master' | Habeas Codice | 2014-11-13 | 1 | -55/+64 |
|\ | | | | | | | | | | | | | | | | | | | | | | | Conflicts: boot.php include/dba/dba_driver.php include/diaspora.php include/follow.php include/session.php include/zot.php mod/photos.php mod/ping.php | ||||
| * | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-11-07 | 1 | -5/+6 |
| |\ | |||||
| | * | provide lockstate for photo edit | marijus | 2014-11-07 | 1 | -5/+6 |
| | | | |||||
| * | | fix broken photo edits when adult flag is changed | friendica | 2014-11-07 | 1 | -8/+7 |
| |/ | |||||
| * | Provide a way to mark photos as adult and hide them from the default album ↵ | friendica | 2014-11-06 | 1 | -27/+31 |
| | | | | | | | | view. Still need a button or setting to enable "unsafe viewing". This has no effect anywhere but in the album views. They can still be viewed by flipping through the individual photos with 'prev' and 'next'. We probably need a comprehensive strategy for how to deal with n-s-f-w photos in albums so consider this a band-aid which requires additional work and integration with other facilities which access these photos. It is entirely optional. |