Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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. | ||||
* | provide a lockstate for photo uploads | marijus | 2014-11-06 | 1 | -1/+4 |
| | |||||
* | if uploading a photo go away to album | marijus | 2014-11-03 | 1 | -2/+7 |
| | |||||
* | if deleting a photo go away to album | marijus | 2014-11-03 | 1 | -1/+3 |
| | |||||
* | even more photos work | marijus | 2014-11-01 | 1 | -11/+9 |
| | |||||
* | do not reload page for photo upload | marijus | 2014-10-31 | 1 | -12/+8 |
| | |||||
* | more work on photo upload | marijus | 2014-10-31 | 1 | -7/+5 |
| | |||||
* | some work on photo upload | marijus | 2014-10-30 | 1 | -36/+13 |
| | |||||
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-10-28 | 1 | -1/+1 |
|\ | |||||
| * | change the way tagrm works to allow tag removal on the fly | marijus | 2014-10-28 | 1 | -1/+1 |
| | | |||||
* | | change photo tag bubble tip | friendica | 2014-10-28 | 1 | -1/+1 |
|/ | |||||
* | do not reload page for edit album and some minor cleanup | marijus | 2014-10-27 | 1 | -27/+21 |
| | |||||
* | a couple of photo tag issues | friendica | 2014-10-26 | 1 | -5/+11 |
| | |||||
* | some work on photos like/dislike | marijus | 2014-10-25 | 1 | -3/+37 |
| | |||||
* | more work on photos | marijus | 2014-10-20 | 1 | -10/+10 |
| | |||||
* | merge madness | friendica | 2014-10-19 | 1 | -2/+2 |
| | |||||
* | $comments > $commentbox | marijus | 2014-10-15 | 1 | -1/+1 |
| | |||||
* | some work on single photo view comments | marijus | 2014-10-15 | 1 | -1/+2 |
| | |||||
* | one more item_id > id | marijus | 2014-10-15 | 1 | -1/+1 |
| | |||||
* | it seems we do not have an key called item_id here so must be id only | marijus | 2014-10-15 | 1 | -1/+1 |
| | |||||
* | it seems this is needed also to not allow editing profile photo album | marijus | 2014-10-03 | 1 | -2/+2 |
| | |||||
* | more work on photos | marijus | 2014-10-02 | 1 | -65/+49 |
| | |||||
* | some more work on photos | marijus | 2014-09-28 | 1 | -2/+2 |
| | |||||
* | some more work on photos - work in progress | marijus | 2014-09-26 | 1 | -9/+12 |
| | |||||
* | update jg to latest preview release and try once more to really justify the ↵ | marijus | 2014-09-20 | 1 | -11/+4 |
| | | | | whole gallery | ||||
* | set items/page back to 60 | marijus | 2014-09-11 | 1 | -2/+2 |
| | |||||
* | content-complete must not be in photo-album-contents | marijus | 2014-09-11 | 1 | -1/+4 |
| | |||||
* | typo | marijus | 2014-09-11 | 1 | -1/+1 |
| | |||||
* | another day another concept - hope this works better | marijus | 2014-09-11 | 1 | -6/+14 |
| | |||||
* | wrap photo albums (albums and top level) in a div id=photo-album-contents | friendica | 2014-09-08 | 1 | -1/+4 |
| | |||||
* | for webpages, hide the mimetype selector unless in advanced mode. For pages ↵ | friendica | 2014-09-07 | 1 | -2/+2 |
| | | | | that endless scroll and show blocky-block things, set the default items-per-page to 60. Why? It fits column-widths of 2,3,4,5,6,10,12,15, and 20 without leaving remaindered items dangling at the end. No other setting less than 100 has this much versatility. | ||||
* | and more ajax work | friendica | 2014-09-06 | 1 | -2/+2 |
| | |||||
* | ajax work | friendica | 2014-09-06 | 1 | -13/+52 |
| | |||||
* | doc update | friendica | 2014-08-15 | 1 | -0/+1 |
| | |||||
* | pkcs1 to pkcs8 key conversion - this is a lot easier than parsing ASN.1 DER ↵ | friendica | 2014-08-14 | 1 | -0/+5 |
| | | | | formats and rebuilding the darn things like we used to do. Check for illegal hex encoded album names in mod/photo so we don't throw php errors. Don't know where they come from but we get a lot of them. | ||||
* | Add HTML5 datalist to edit photo album field. | Klaus Weidenbach | 2014-06-22 | 1 | -0/+5 |
| | | | | | | | This patch provides a datalist for the edit photo album field. This makes it easier to move a picture to another existing folder in the way that it provides a list of all available albums as values for the album field. | ||||
* | oh this is nice... http://kmkeen.com/jshon - this is what we need to make ↵ | friendica | 2014-06-18 | 1 | -4/+2 |
| | | | | shred -- well "shred". I also had to change the photos album list API a bit to fix any imagined and/or real parsing issues and also fixed shred so it can find its auxiliary files. | ||||
* | only show jotnets when posting conversation items | friendica | 2014-06-14 | 1 | -1/+1 |
| | |||||
* | photos upload - remove phantom duplicated blank album name from selection list | friendica | 2014-03-23 | 1 | -2/+1 |
| | |||||
* | small changes to a couple of lookup functions which we need to use a bit more | friendica | 2014-02-20 | 1 | -1/+1 |
| | |||||
* | shamelessly steal, and cut/paste from the settings page to get mod_photos ↵ | friendica | 2014-02-11 | 1 | -0/+4 |
| | | | | edit permissions working - and it looks like we still have some other fancybox instances (yet another lightbox) which haven't yet been converted to colorbox and will need to be fixed. Way too many lightboxes. | ||||
* | photo tagging somewhat working - but can't remove photo tags until we update ↵ | friendica | 2014-02-03 | 1 | -4/+22 |
| | | | | tagrm | ||||
* | photo tagging still broken - but at least don't create a new linked item ↵ | friendica | 2014-01-27 | 1 | -0/+4 |
| | | | | every time a photo is edited. | ||||
* | bring photo tagging back which hasn't worked since forking from Friendica - ↵ | friendica | 2014-01-19 | 1 | -180/+49 |
| | | | | this is untested and displaying photo tags will now be broken as we're now storing tags with the item attached to the photo and not in the photo. But the point is we've eliminated the OStatus/SWAP0 forced spam crap and can start fresh. | ||||
* | some minor cleanup on plinks for some very subtle permissions issues | friendica | 2014-01-09 | 1 | -1/+8 |
| | |||||
* | Pass hash and extension to the photo templates for plugins that require | Thomas Willingham | 2014-01-08 | 1 | -0/+2 |
| | | | | links we can't construct from what's already there. | ||||
* | make storage limit service classes apply to accounts, not channels. Also ↵ | friendica | 2014-01-07 | 1 | -2/+2 |
| | | | | include a css file that was missing from work yesterday. |