aboutsummaryrefslogtreecommitdiffstats
path: root/mod/photos.php
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-151-3/+3
|\
| * 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
|\|
* | 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
|\|
| * 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
| * Change logic of "don't create a status post for this photo upload" and turn i...friendica2015-03-101-1/+1
| * 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 se...friendica2015-02-121-4/+2
* | Merge branch 'master' into tresfriendica2015-01-291-11/+11
|\|
| * 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
|\
| * 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 visi...friendica2015-01-121-1/+1
|/
* 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
* 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
|\
| * 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 vi...friendica2014-11-061-27/+31
| * 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
* | PostgreSQL support initial commitHabeas Codice2014-11-131-20/+27
|/
* do not reload page for photo uploadmarijus2014-10-311-12/+8
* more work on photo uploadmarijus2014-10-311-7/+5
* some work on photo uploadmarijus2014-10-301-36/+13
* Merge https://github.com/friendica/red into pending_mergefriendica2014-10-281-1/+1
|\
| * change the way tagrm works to allow tag removal on the flymarijus2014-10-281-1/+1
* | change photo tag bubble tipfriendica2014-10-281-1/+1
|/
* do not reload page for edit album and some minor cleanupmarijus2014-10-271-27/+21
* a couple of photo tag issuesfriendica2014-10-261-5/+11
* some work on photos like/dislikemarijus2014-10-251-3/+37