aboutsummaryrefslogtreecommitdiffstats
path: root/mod/photos.php
Commit message (Collapse)AuthorAgeFilesLines
* syntaxredmatrix2015-09-051-1/+1
|
* more work on AccessList integrationredmatrix2015-08-271-28/+25
|
* prohibit some photo album edit operations until we figure out how to sync ↵redmatrix2015-08-051-20/+31
| | | | them with dav
* don't throw errors or do the wrong thing if photos have no album (placed on ↵redmatrix2015-08-051-8/+13
| | | | your dav rootdir)
* the view_photos and post_photos permissions are redundant and are now mapped ↵redmatrix2015-07-191-3/+3
| | | | to view_storage and write_storage
* more photos workredmatrix2015-06-171-3/+9
|
* lots of work on merging photo and file albums/foldersredmatrix2015-06-171-3/+2
|
* Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-161-0/+23
|\ | | | | | | | | | | Conflicts: mod/photos.php mod/siteinfo.php
| * make photo upload work for remote channels with permsMario Vavti2015-06-161-1/+13
| |
* | remove file/attachments when their associated photos are removedredmatrix2015-06-161-0/+7
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-151-3/+3
|\| | | | | | | | | | | Conflicts: view/nl/messages.po view/nl/strings.php
| * do not allow/show acl button on photo edit if not ownerMario Vavti2015-06-151-3/+3
| |
* | convert the abook fieldsredmatrix2015-06-141-1/+2
| |
* | more work on itemsredmatrix2015-06-111-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 optimisationredmatrix2015-06-101-3/+2
| |
* | get rid of photo_flags in the coderedmatrix2015-05-181-7/+7
| |
* | bring the new photo schema into playredmatrix2015-05-181-9/+13
| |
* | Merge branch 'master' into tresfriendica2015-04-231-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 logicMario Vavti2015-04-121-1/+1
| |
| * display a map for photos if allowed. Note: there is a bug in that if the map ↵friendica2015-03-161-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 ↵friendica2015-03-101-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 photosfriendica2015-02-161-4/+20
| |
| * quick fix for photos page until calls to like_puller() are fixedfriendica2015-02-161-4/+4
| |
| * provide relief to sites that are severely impacted by the slow ITEM_UNSEEN ↵friendica2015-02-121-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 tresfriendica2015-01-291-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_channelfriendica2015-01-281-4/+4
| |
| * local_user => local_channelfriendica2015-01-281-10/+10
| |
* | start on item_restrict conversionfriendica2015-01-221-12/+1
| |
* | heavy lifting converting item flag bitsfriendica2015-01-221-4/+2
|/
* Merge branch 'moretagging' of git://github.com/pafcu/red into pafcu-moretaggingfriendica2015-01-131-1/+1
|\ | | | | | | | | Conflicts: mod/profiles.php
| * Allow tags in mail, many profile fields, and admin infoStefan Parviainen2015-01-131-1/+1
| |
* | change deletion behaviour of linked photo items. Previously deleting the ↵friendica2015-01-121-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 reusableStefan Parviainen2015-01-121-48/+19
|
* Fix wrong requireStefan Parviainen2015-01-041-1/+1
|
* Cruft left over from stuff we don't have anymore.Thomas Willingham2014-12-261-3/+0
|
* minor photo flag issue - and some more whitespace editsfriendica2014-11-191-1/+1
|
* turn the "adult photo flagging" (which prevents a particularly flagged photo ↵friendica2014-11-181-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 oneHabeas Codice2014-11-171-1/+1
|
* Merge branch 'master' of https://github.com/habeascodice/redHabeas Codice2014-11-171-1/+1
|\
| * fix lost $sql_extra in recent sql query changesmarijus2014-11-151-1/+1
| |
* | fix booleanHabeas Codice2014-11-171-1/+1
|/
* Merge remote-tracking branch 'upstream/master'Habeas Codice2014-11-131-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_mergefriendica2014-11-071-5/+6
| |\
| | * provide lockstate for photo editmarijus2014-11-071-5/+6
| | |
| * | fix broken photo edits when adult flag is changedfriendica2014-11-071-8/+7
| |/
| * Provide a way to mark photos as adult and hide them from the default album ↵friendica2014-11-061-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.
| * provide a lockstate for photo uploadsmarijus2014-11-061-1/+4
| |
| * if uploading a photo go away to albummarijus2014-11-031-2/+7
| |
| * if deleting a photo go away to albummarijus2014-11-031-1/+3
| |
| * even more photos workmarijus2014-11-011-11/+9
| |