Commit Graph

251 Commits

Author SHA1 Message Date
friendica
b6ae56b069 Merge https://github.com/friendica/red into pending_merge 2014-11-07 05:16:14 -08:00
friendica
1cc1bc8e81 fix broken photo edits when adult flag is changed 2014-11-07 05:15:39 -08:00
marijus
2cfe0f1545 provide lockstate for photo edit 2014-11-07 12:13:38 +01:00
friendica
1fbd1a79c7 Provide a way to mark photos as adult and hide them from the default album 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. 2014-11-06 17:27:28 -08:00
marijus
5e7e8d1089 provide a lockstate for photo uploads 2014-11-06 11:57:33 +01:00
marijus
287d5e0f10 if uploading a photo go away to album 2014-11-03 11:19:27 +01:00
marijus
2f85d12a6c if deleting a photo go away to album 2014-11-03 10:46:57 +01:00
marijus
dc5e05d334 even more photos work 2014-11-01 23:55:36 +01:00
marijus
5d151b9886 do not reload page for photo upload 2014-10-31 20:25:43 +01:00
marijus
2982212797 more work on photo upload 2014-10-31 14:33:41 +01:00
marijus
0ff4d9015b some work on photo upload 2014-10-30 14:10:55 +01:00
friendica
653305889c Merge https://github.com/friendica/red into pending_merge 2014-10-28 04:18:35 -07:00
friendica
36110831cb change photo tag bubble tip 2014-10-28 04:18:08 -07:00
marijus
ec8bab7784 change the way tagrm works to allow tag removal on the fly 2014-10-28 11:56:00 +01:00
marijus
d192bcad65 do not reload page for edit album and some minor cleanup 2014-10-27 21:31:54 +01:00
friendica
95de759766 a couple of photo tag issues 2014-10-26 21:37:59 -07:00
marijus
6497e78956 some work on photos like/dislike 2014-10-25 15:23:20 +02:00
marijus
11e8fe3085 more work on photos 2014-10-20 15:05:33 +02:00
friendica
bae3029c63 merge madness 2014-10-19 16:12:05 -07:00
marijus
997ec0911c $comments > $commentbox 2014-10-15 22:41:42 +02:00
marijus
04a254d94a some work on single photo view comments 2014-10-15 22:23:38 +02:00
marijus
dc23030dcb one more item_id > id 2014-10-15 21:17:07 +02:00
marijus
0c2d9edd83 it seems we do not have an key called item_id here so must be id only 2014-10-15 21:15:20 +02:00
marijus
55b75381ad it seems this is needed also to not allow editing profile photo album 2014-10-03 19:15:37 +02:00
marijus
df70c2c9b6 more work on photos 2014-10-02 21:04:50 +02:00
marijus
97c6ba77c7 some more work on photos 2014-09-28 23:14:49 +02:00
marijus
b948ab5955 some more work on photos - work in progress 2014-09-26 12:29:07 +02:00
marijus
9feb619bea update jg to latest preview release and try once more to really justify the whole gallery 2014-09-20 15:40:40 +02:00
marijus
1f16bad9d9 set items/page back to 60 2014-09-11 13:07:08 +02:00
marijus
5e54f47097 content-complete must not be in photo-album-contents 2014-09-11 12:42:16 +02:00
marijus
15ef4fea78 typo 2014-09-11 12:33:47 +02:00
marijus
3caee72aee another day another concept - hope this works better 2014-09-11 10:41:11 +02:00
friendica
b1254a71bc wrap photo albums (albums and top level) in a div id=photo-album-contents 2014-09-08 16:28:02 -07:00
friendica
75fc3a8ceb for webpages, hide the mimetype selector unless in advanced mode. For pages 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. 2014-09-07 19:16:48 -07:00
friendica
b9f221637b and more ajax work 2014-09-06 00:48:00 -07:00
friendica
28b75b028d ajax work 2014-09-06 00:37:15 -07:00
friendica
41aa9e13cf doc update 2014-08-15 06:05:52 -07:00
friendica
1978500e8f pkcs1 to pkcs8 key conversion - this is a lot easier than parsing ASN.1 DER 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. 2014-08-14 23:05:19 -07:00
Klaus Weidenbach
2504d4c2a2 Add HTML5 datalist to edit photo album field.
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.
2014-06-22 01:33:13 +02:00
friendica
c16b403cf7 oh this is nice... http://kmkeen.com/jshon - this is what we need to make 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. 2014-06-18 16:26:27 -07:00
friendica
0f6c321e3f only show jotnets when posting conversation items 2014-06-14 20:16:40 -07:00
friendica
02af02118d photos upload - remove phantom duplicated blank album name from selection list 2014-03-23 17:07:21 -07:00
friendica
e12f6f1bd9 small changes to a couple of lookup functions which we need to use a bit more 2014-02-20 17:20:24 -08:00
friendica
95a45a119d shamelessly steal, and cut/paste from the settings page to get mod_photos 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. 2014-02-11 18:45:50 -08:00
friendica
1572403e98 photo tagging somewhat working - but can't remove photo tags until we update tagrm 2014-02-03 20:44:42 -08:00
friendica
3100b5d93e photo tagging still broken - but at least don't create a new linked item every time a photo is edited. 2014-01-27 18:06:09 -08:00
friendica
d5bf53c54c bring photo tagging back which hasn't worked since forking from Friendica - 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. 2014-01-19 23:37:46 -08:00
friendica
db8ebc9f37 some minor cleanup on plinks for some very subtle permissions issues 2014-01-09 15:45:17 -08:00
Thomas Willingham
7930f6d7aa Pass hash and extension to the photo templates for plugins that require
links we can't construct from what's already there.
2014-01-08 22:50:44 +00:00
friendica
b8564134aa make storage limit service classes apply to accounts, not channels. Also include a css file that was missing from work yesterday. 2014-01-07 14:10:28 -08:00