volse-hubzilla.git - Volse Hubzilla -- soft fork of main Hubzilla core for Volse

	Commit message (Collapse)	Author	Age	Files	Lines
*	more work on db storage of doco	redmatrix	2015-07-05	1	-0/+2
\|
*	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-07-03	1	-1/+0
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: boot.php include/items.php util/messages.po
\| *	in hubzilla we're going to convert doco to items. define it here so that an ↵	redmatrix	2015-07-03	1	-2/+5
\| \| \| \| \| \| \| \|	accidental import/export doesn't chuck a wobbly.
\| *	provide backward compatibility with hubzilla extended item export	redmatrix	2015-07-01	1	-0/+55
\| \|
* \|	start doco cleanup	redmatrix	2015-07-03	1	-0/+2
\| \|
* \|	provide compatibility with redmatrix extended item export	redmatrix	2015-07-01	1	-3/+50
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-06-29	1	-0/+5
\|\\|
\| *	turn the connection filter into a feature.	redmatrix	2015-06-29	1	-0/+5
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-06-28	1	-3/+62
\|\\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: include/zot.php mod/connedit.php util/messages.po
\| *	no this isn't it. well ok, it's part of it, but not the important part. it's ↵	redmatrix	2015-06-28	1	-3/+62
\| \| \| \| \| \| \| \|	still pretty cool.
* \|	more work on mail flags	redmatrix	2015-06-23	1	-4/+4
\| \|
* \|	item flag fixes discovered after a few merges	redmatrix	2015-06-23	1	-11/+0
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-06-23	1	-3/+4
\|\\| \| \| \| \| \| \| \| \| \| \|	Conflicts: include/items.php mod/item.php
\| *	ensure we always sign a trimmed item body.	redmatrix	2015-06-22	1	-3/+3
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-06-21	1	-6/+8
\|\\| \| \| \| \| \| \| \| \| \| \|	Conflicts: include/items.php util/messages.po
\| *	Make item_store_update only affect the data we requested	Alexandre Hannud Abdo	2015-06-20	1	-9/+10
\| \|
* \|	convert the abook fields	redmatrix	2015-06-14	1	-16/+12
\| \|
* \|	more work on items	redmatrix	2015-06-11	1	-18/+87
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and Merge branch 'master' of https://github.com/redmatrix/redmatrix Conflicts: include/items.php view/it/messages.po view/it/strings.php
\| *	hubzilla compatibility function	redmatrix	2015-06-11	1	-0/+14
\| \|
* \|	the hubzilla version of this function	redmatrix	2015-06-11	1	-0/+12
\| \|
* \|	more work on item table optimisation	redmatrix	2015-06-10	1	-17/+29
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-06-02	1	-6/+56
\|\\|
\| *	asjld work	redmatrix	2015-06-02	1	-3/+13
\| \|
\| *	bare bones ASLD	redmatrix	2015-05-31	1	-4/+44
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-05-31	1	-3/+40
\|\\|
\| *	some basic background work for activitystreams-json-ld-2.0 conversions	redmatrix	2015-05-31	1	-0/+37
\| \|
\| *	there was a reason we included that file	redmatrix	2015-05-28	1	-3/+3
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-05-24	1	-4/+2
\|\\| \| \| \| \| \| \| \| \| \| \|	Conflicts: index.php mod/setup.php
\| *	Merge pull request #332 from solstag/zotfeedcleanup	Klaus	2015-05-24	1	-3/+1
\| \|\ \| \| \| \| \| \|	Import security only when necessary, use correct variable in log
\| \| *	Import security only when necessary, use correct variable in log	Alexandre Hannud Abdo	2015-05-22	1	-3/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Just some cleanup, seemed like the intent of previous changes was so
\| * \|	federation problem from diaspora comments relayed through red channels due ↵	redmatrix	2015-05-23	1	-1/+1
\| \|/ \| \| \| \| \| \|	to typo
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-05-20	1	-6/+21
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: include/items.php include/text.php mod/item.php view/nl/messages.po
\| *	cloning abook entries was broken in several ways if the target xchan wasn't ↵	redmatrix	2015-05-20	1	-0/+8
\| \| \| \| \| \| \| \|	available on the clone site. This should make it less broken.
\| *	don't allow item_id to update without a valid post id	redmatrix	2015-05-20	1	-0/+5
\| \|
\| *	PRIVACY: possible privacy leakage under a defined set of circumstances	redmatrix	2015-05-20	1	-5/+8
\| \|
* \|	re-arrange the html cache a bit	redmatrix	2015-05-20	1	-0/+2
\| \|
* \|	add rot47 to the mix. This shouldn't affect the speed to any measurable degree.	redmatrix	2015-05-19	1	-4/+4
\| \|
* \|	mail_obscure - AES-256 is way too slow, simplify. Ideally a substitution ↵	redmatrix	2015-05-19	1	-9/+10
\| \| \| \| \| \| \| \|	cipher would be adequate for our requirements.
* \|	Merge branch 'master' into tres	redmatrix	2015-05-14	1	-60/+17
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-05-13	1	-1/+1
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: boot.php include/api.php include/enotify.php
\| \| *	product was a bad string to use because we may require it for e-commerce, ↵	redmatrix	2015-05-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	and RED_PLATFORM is equally problematic for other reasons.
\| * \|	convert ITEM_WALL from bitfield to standalone	redmatrix	2015-05-06	1	-20/+21
\| \| \|
\| * \|	no need to obscure the diaspora signature if we're not obscuring the posts	redmatrix	2015-05-06	1	-4/+10
\| \| \|
\| * \|	for hubzilla we won't be obscuring items, only private mail, this will allow ↵	redmatrix	2015-05-05	1	-50/+1
\| \|/ \| \| \| \| \| \|	us to search and cache private posts
* \|	Merge branch 'master' into tres	friendica	2015-04-29	1	-3/+9
\|\\| \| \| \| \| \| \| \| \|	Conflicts: include/notifier.php
\| *	zotfeed issues	friendica	2015-04-24	1	-3/+3
\| \|
\| *	block unfederated posts from zot_feed	friendica	2015-04-23	1	-0/+6
\| \|
* \|	Merge branch 'master' into tres	friendica	2015-04-23	1	-547/+633
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| *	issue #176, sender copy of item not obscured if using private mention	friendica	2015-04-20	1	-1/+3
\| \|
\| *	match parens	friendica	2015-04-14	1	-1/+1
\| \|