harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,120 Commits 6 Branches 36 Tags
91bbfcf554d190c1956d16c652ceefb95a18735a
Commit Graph

445 Commits

Author SHA1 Message Date
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 75560b0496 turn attached audio/video into audio/video elements as well as providing an attachment link 2015-07-01 16:23:25 -07:00
redmatrix 833098e346 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	include/items.php
	mod/item.php
 2015-06-23 17:30:35 -07:00
redmatrix 7975bc828f typo 2015-06-23 16:22:21 -07:00
redmatrix 45d66657d7 Merge pull request #356 from solstag/signature_edit_fix 
properly trims edited posts before signing so signature verification …
 2015-06-23 14:47:59 +10:00
Alexandre Hannud Abdo a189fc0872 properly trims edited posts before signing so signature verification works 2015-06-23 01:08:02 -03:00
redmatrix 9879cf3c6c ensure we always sign a trimmed item body. 2015-06-22 16:09:02 -07:00
redmatrix bdedda7c6b fix attachment permissions when they also contain an image. 2015-06-15 20:43:49 -07:00
redmatrix be0459a98b convert the abook fields 2015-06-14 21:08:00 -07:00
redmatrix 5733491ac8 more work on items 
and

Merge branch 'master' of https://github.com/redmatrix/redmatrix

Conflicts:
	include/items.php
	view/it/messages.po
	view/it/strings.php
 2015-06-11 17:56:56 -07:00
redmatrix ca870dbf31 more work on item table optimisation 2015-06-10 16:59:04 -07:00
redmatrix 2128d5a256 Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-06-10 15:47:23 -07:00
Alexandre Hannud Abdo a31fdd3fbb correctly fix attachment permissions from private mentions 
by postponing code that removes the attachment tag from the body
 2015-06-10 15:37:10 -03:00
redmatrix 7cbc504874 Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-06-02 17:47:47 -07:00
redmatrix e3606ec56f move the photo and attachment permission syncing past the tag replacement so that attachments get the correct permissions when private mentions are used. 2015-06-01 16:26:12 -07:00
redmatrix 5795e2a58b more migration of page types 2015-05-21 22:17:17 -07:00
redmatrix 25bd332aab Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-05-21 20:39:10 -07:00
redmatrix 81d94dae2c preserve lock on edited comments 2015-05-21 02:03:44 -07:00
redmatrix 3763f74a10 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	include/items.php
	include/text.php
	mod/item.php
	view/nl/messages.po
 2015-05-20 20:49:06 -07:00
redmatrix 6466774b6e PRIVACY: possible privacy leakage under a defined set of circumstances 2015-05-20 18:46:23 -07:00
redmatrix a6cb90c81c Merge branch 'master' into tres 
Conflicts:
	include/Import/refimport.php
	include/activities.php
	include/attach.php
	include/event.php
	include/externals.php
	include/identity.php
	include/items.php
	include/notifier.php
	include/photos.php
	include/taxonomy.php
	include/zot.php
	mod/channel.php
	mod/connedit.php
	mod/events.php
	mod/item.php
	mod/like.php
	mod/manage.php
	mod/mood.php
	mod/ping.php
	mod/poke.php
	mod/subthread.php
	mod/tagger.php
	mod/thing.php
 2015-05-14 18:02:29 -07:00
redmatrix 25b599a4bd convert ITEM_WALL from bitfield to standalone 2015-05-06 21:03:33 -07:00
redmatrix c9ec4f46b6 for hubzilla we won't be obscuring items, only private mail, this will allow us to search and cache private posts 2015-05-05 18:36:05 -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
friendica 53339d19a3 issue #176, sender copy of item not obscured if using private mention 2015-04-20 20:14:07 -07:00
Mario Vavti 9addc4581e provide a separate input field for rpost attachments 2015-04-16 23:26:11 +02:00
friendica d3bc721138 item_check_service_class wasn't returning correct results 2015-04-13 16:03:09 -07:00
friendica 37afc81847 update features, allow sys account page deletion 2015-04-08 17:54:52 -07:00
friendica 0bb89778d3 add channel_lastpost timestamp to help optimise some outrageously expensive queries. 2015-03-26 19:55:52 -07:00
friendica f1a1660709 item_check_service_class - the join is totally unnecessary 2015-03-25 19:13:53 -07:00
friendica 62b2fa6ac7 operation snakebite, cont. 2015-03-22 20:30:23 -07:00
friendica 7af012b1f9 The random bad signatures are because something somewhere is trimming the body text. It could be any one of hundreds of functions that touch the message body. We really want to trim the body text, so I'm putting back all the trim statements - in mod/item and item_store and item_store_update. The last fix for random bad sigs noted that one of the trims wasn't there, so the others were removed. The correct fix is for all the trims to be there. We will probably have a few (quite a few) bad sigs during the transition back to trimmed text but this should nail it for anybody on recent code and with new content. 2015-03-17 00:13:47 -07:00
friendica 53e908d7b7 when fixing "naked links" make sure not to double link double urls as seen in archive.org - which has the complete unescaped target url, scheme and all, as part of its own. 2015-03-06 20:45:26 -08:00
friendica 7ad425bbda failure to auto update comments if it's your own. 2015-02-14 21:57:47 -08:00
friendica 4b513d3322 issue #896 2015-02-12 19:22:07 -08:00
friendica 084ca3f4a1 typo 2015-02-12 18:49:42 -08: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 79223b6b3d item voting tools 2015-02-10 19:10:18 -08:00
friendica 08b757a22c Merge branch 'master' into tres 
Conflicts:
	mod/events.php
	view/css/mod_events.css
 2015-02-08 20:57:37 -08:00
friendica b8add899a2 undo extra logging 2015-02-08 19:28:18 -08:00
friendica 912be23e16 Merge branch 'master' into tres 
Conflicts:
	include/group.php
	include/text.php
	mod/acl.php
	mod/channel.php
	mod/connections.php
	mod/display.php
	mod/group.php
	mod/item.php
	mod/locs.php
	mod/network.php
	mod/photos.php
	mod/ping.php
	mod/starred.php
	mod/viewsrc.php
 2015-01-29 15:09:35 -08:00
friendica ff68ea6087 more message restrict conversions 2015-01-29 14:51:41 -08:00
friendica e157371c39 remote_user => remote_channel 2015-01-28 20:58:59 -08:00
friendica a496036066 local_user => local_channel 2015-01-28 20:56:04 -08:00
friendica 4c2a1e572a start on item_restrict conversion 2015-01-22 21:04:54 -08:00
friendica 6e0e3b2433 more expanding item flags 2015-01-22 18:41:10 -08:00
friendica e46eba1258 heavy lifting converting item flag bits 2015-01-22 17:41:16 -08:00
friendica 29436081a8 slow progress removing bitfields on item table 2015-01-21 16:06:25 -08:00
friendica 168b67fa41 correct some activity object types (for comments), also fix a foreach warning resulting from recent tag work 2015-01-14 18:36:23 -08:00
friendica 7a24943c34 some back-end code to support location activity objects. Work in progress. 2015-01-14 14:46:01 -08:00