Commit graph

116 commits

Author SHA1 Message Date
redmatrix
55ab968edf make js_upload work with hubzilla. It still needs a rewrite. 2015-09-05 17:35:00 -07:00
redmatrix
9cebd24987 change attach_store to allow a predefined item to accompany a photo 2015-08-26 22:13:20 -07:00
redmatrix
5fa2aa6d48 lots of stuff that was needed for successful photo import from red 2015-08-24 20:58:12 -07:00
redmatrix
50a1e0c618 attach_store needs a lot of documenting to understand what's going on and how it got to be this way. Here's the bird's eye view. 2015-08-13 17:11:59 -07:00
redmatrix
7e43da43a1 more file permissions inheritance work 2015-08-06 17:42:53 -07:00
redmatrix
91bbfcf554 photo permission inheritance. We want to use the folder permissions unless specific permissions have been set to over-ride them. If nothing is set, use the channel default. We may have to mess with his further in the case of somebody trying to create a public photo directory when their normal permissions are set to private. Kind of a chicken/egg problem because the folder permissions will be empty. 2015-08-06 17:09:09 -07:00
redmatrix
f45cb8cf1f minor - add all the newly supported table columns 2015-07-30 20:04:02 -07:00
redmatrix
d5a40cac25 Merge branch 'master' of https://github.com/redmatrix/redmatrix
several dav fixes
Conflicts:
	include/items.php
2015-07-30 17:11:16 -07:00
redmatrix
ed3d9d1f80 some photo/attach permissions issues 2015-07-18 16:39:12 -07:00
redmatrix
b06b6f798f localise event calendar 2015-06-25 18:23:48 -07:00
redmatrix
86588bdd6c more work on photos, including os_storage for the size '0' photo and numbering duplicate filenames 2015-06-23 22:46:39 -07:00
redmatrix
33c9d8e06b all file attachments are now stored natively, still have photos-0 to store natively 2015-06-18 22:12:26 -07:00
redmatrix
2963be60e5 more photos work 2015-06-17 18:26:56 -07:00
redmatrix
6ab20eb1b5 lots of work on merging photo and file albums/folders 2015-06-17 17:44:31 -07:00
redmatrix
c6c17182e5 attach_mkdirp - implement force option to return success if dir exists 2015-06-17 01:18:55 -07:00
redmatrix
4ecee713d5 recursive mkdir (ala mkdir -p) for file and photo storage 2015-06-16 22:58:26 -07:00
redmatrix
39309ad45c start work on photo directories 2015-06-16 19:05:09 -07:00
redmatrix
d84b3cfc3c remove file/attachments when their associated photos are removed 2015-06-16 17:50:15 -07:00
redmatrix
bc72d3fd26 move profile photos to new methods 2015-06-15 23:37:51 -07:00
redmatrix
bdedda7c6b fix attachment permissions when they also contain an image. 2015-06-15 20:43:49 -07:00
redmatrix
2adc7a51ad photo upload: pass in the contact_allow and resource_id via include/attach.php 2015-06-15 19:52:17 -07:00
redmatrix
9642728e7d first cut at merging files and photos, not yet well integrated but they are integrated 2015-06-14 16:50:24 -07:00
redmatrix
b7be79c5e7 isolate the os_storage flag 2015-06-13 15:57:28 -07:00
redmatrix
41085ae03f start on the DAV/photos merger 2015-06-11 22:32:08 -07:00
redmatrix
7c7a5cba8f Merge branch 'master' into tres 2015-05-17 19:49:36 -07:00
redmatrix
76558df966 Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
	include/bb2diaspora.php
	include/diaspora.php
	include/enotify.php
	mod/admin.php
	mod/cloud.php
	mod/dav.php
	mod/home.php
	mod/invite.php
	mod/like.php
	mod/mitem.php
	mod/p.php
	mod/pubsites.php
	mod/setup.php
	mod/siteinfo.php
	util/messages.po
2015-05-17 19:48:57 -07:00
Klaus Weidenbach
6757e86e85 Add some more documentation to attach_store() 2015-05-17 01:24:47 +02:00
redmatrix
25b599a4bd convert ITEM_WALL from bitfield to standalone 2015-05-06 21:03:33 -07:00
friendica
6679734135 Merge branch 'master' into tres
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
2015-04-23 19:49:41 -07:00
Mario Vavti
70b109702e make dropItem more universal and move delete up in the dropdown menu 2015-04-12 14:30:33 +02:00
Mario Vavti
962fdf08c0 make fs deletion of directories work 2015-04-12 13:58:04 +02:00
Mario Vavti
7c8b9397ae reverse file activity logic 2015-04-12 13:13:22 +02:00
friendica
b546f8d702 Merge https://github.com/friendica/red into pending_merge 2015-03-29 16:05:24 -07:00
friendica
505e5e90b2 fix os_mkdir 2015-03-29 16:05:08 -07:00
Klaus Weidenbach
d0361582b0 Correcting reported Doxygen syntax warnings.
Fixed wrong Doxygen syntax and add some of the available FIXME to
Doxygen documentation.
Updated Doxygen configuration to add also all capital letter tags.
Adding some more Doxygen documentation.
2015-03-29 22:23:00 +02:00
Mario Vavti
c21a21be3e we only need item mid. some documentation. 2015-03-24 11:38:54 +01:00
Mario Vavti
47c055e7f3 do not override item_private here anymore 2015-03-22 14:24:07 +01:00
Klaus Weidenbach
daed7fbead Bugfix und variable initialization.
Fixed a wrong perm_is_allowed() parameter, commented some other places
where we use variables that are not set and should not work.
2015-03-21 22:28:07 +01:00
Mario Vavti
264b43db05 some cleanup 2015-03-20 17:46:13 +01:00
Mario Vavti
6698d7b03a possible improvement regarding deletion 2015-03-20 17:37:01 +01:00
marijus
2fbb6a5ff5 do not send activity to channels with no permission to view filestorage 2015-02-18 10:41:38 +01:00
marijus
fb198b8a05 item_unseen update 2015-02-13 10:01:26 +01:00
friendica
da2349bb6a provide relief to sites that are severely impacted by the slow ITEM_UNSEEN 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. 2015-02-12 17:45:25 -08:00
friendica
2b2fa5a973 issue #843 2015-02-11 20:38:06 -08:00
marijus
e2aa0a273c improve sql query 2015-02-09 21:46:22 +01:00
friendica
4b348d2489 Merge branch 'master' into tres
Conflicts:
	view/css/mod_events.css
	view/theme/redbasic/css/style.css
2015-02-05 19:38:43 -08:00
marijus
1abb17c880 typo 2015-02-05 21:46:46 +01:00
marijus
1d5321798a forgot to remove some debug stuff 2015-02-05 21:31:05 +01:00
marijus
be0e6ed6d7 make file activity respect parent dir permissions work 2015-02-05 21:16:21 +01:00
marijus
e5849f9432 not quite there yet but getting closer a little 2015-02-04 22:55:22 +01:00