aboutsummaryrefslogtreecommitdiffstats
path: root/mod/photos.php
Commit message (Expand)AuthorAgeFilesLines
* 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
* more work on photosmarijus2014-10-201-10/+10
* merge madnessfriendica2014-10-191-2/+2
* $comments > $commentboxmarijus2014-10-151-1/+1
* some work on single photo view commentsmarijus2014-10-151-1/+2
* one more item_id > idmarijus2014-10-151-1/+1
* it seems we do not have an key called item_id here so must be id onlymarijus2014-10-151-1/+1
* it seems this is needed also to not allow editing profile photo albummarijus2014-10-031-2/+2
* more work on photosmarijus2014-10-021-65/+49
* some more work on photosmarijus2014-09-281-2/+2
* some more work on photos - work in progressmarijus2014-09-261-9/+12
* update jg to latest preview release and try once more to really justify the w...marijus2014-09-201-11/+4
* set items/page back to 60marijus2014-09-111-2/+2
* content-complete must not be in photo-album-contentsmarijus2014-09-111-1/+4
* typomarijus2014-09-111-1/+1