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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-09-07	1	-4/+6
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: include/items.php view/it/messages.po view/it/strings.php
\| *	fix postgres zotfeed	Habeas Codice	2015-09-07	1	-4/+6
\| \|
* \|	consolidate import_items/sync_items	redmatrix	2015-09-07	3	-3/+83
\| \|
* \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-09-07	1	-2/+2
\|\\| \| \| \| \| \| \| \| \|	Conflicts: util/messages.po
\| *	PRIVACY: item_private seems to have been removed from permissions_sql ↵	redmatrix	2015-09-07	1	-2/+2
\| \| \| \| \| \| \| \|	checking with an observer.
\| *	export chatrooms	redmatrix	2015-09-03	1	-0/+6
\| \|
* \|	make js_upload work with hubzilla. It still needs a rewrite.	redmatrix	2015-09-05	2	-12/+36
\| \|
* \|	Fix for PHP Fatal error: Function name must be a string in ↵	jeroenpraat	2015-09-04	1	-1/+1
\| \| \| \| \| \| \| \| \| \|	/var/www/hubzilla/include/items.php on line 3325 Please review if this is correct?
* \|	import and sync chatrooms	redmatrix	2015-09-03	4	-3/+108
\| \|
* \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-09-03	1	-5/+7
\|\\| \| \| \| \| \| \| \| \|	Conflicts: include/identity.php
\| *	channel export - don't include linked resource items (photos, events). These ↵	redmatrix	2015-09-03	1	-2/+4
\| \| \| \| \| \| \| \|	items will need to be provided with those objects so that they can be re-linked.
* \|	app sync	redmatrix	2015-09-02	3	-2/+91
\| \|
* \|	add timestamps for syncing apps	redmatrix	2015-09-02	1	-3/+10
\| \|
* \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-09-02	1	-4/+0
\|\\| \| \| \| \| \| \| \| \| \| \|	Conflicts: doc/credits.bb mod/thing.php
\| *	Update the credits	redmatrix	2015-09-02	1	-4/+0
\| \|
\| *	protect from sql injection	redmatrix	2015-09-02	1	-1/+1
\| \|
* \|	start to modularise the clone import and sync functions	redmatrix	2015-09-02	3	-0/+335
\| \|
* \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-09-02	1	-4/+3
\|\\| \| \| \| \| \| \| \| \|	Conflicts: include/zot.php
\| *	really fix post filtering	zottel	2015-09-02	1	-2/+2
\| \|
* \|	obscure mail subject in conversation structure	redmatrix	2015-09-01	1	-1/+10
\| \|
* \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-09-01	1	-0/+7
\|\\|
\| *	export apps	redmatrix	2015-09-01	1	-0/+7
\| \|
* \|	initial work on obj import, rename import_profile_photo to ↵	redmatrix	2015-09-01	7	-12/+12
\| \| \| \| \| \| \| \|	import_xchan_photo to more accurately state its purpose.
* \|	match the redmatrix output format for objects (which is the hubzilla table ↵	redmatrix	2015-09-01	1	-6/+2
\| \| \| \| \| \| \| \|	format)
* \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-09-01	1	-1/+9
\|\\|
\| *	add the baseurl so we can easily relocate objects	redmatrix	2015-09-01	1	-1/+2
\| \|
\| *	use different obj export output format for hubzilla compatibility	redmatrix	2015-09-01	1	-1/+8
\| \|
* \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-09-01	1	-1/+0
\|\\| \| \| \| \| \| \| \| \| \| \|	Conflicts: include/identity.php install/update.php
\| *	typo in sql	redmatrix	2015-08-31	1	-1/+1
\| \|
* \|	separate objs/things from taxonomy	redmatrix	2015-09-01	2	-11/+21
\| \|
* \|	don't log the mundane - especially at normal levels.	redmatrix	2015-08-31	1	-2/+3
\| \|
* \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-08-31	1	-0/+1
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: include/identity.php install/update.php util/messages.po view/nl/messages.po
\| *	change the likes db structure to make it more easily importable/exportable	redmatrix	2015-08-31	1	-1/+1
\| \|
* \|	mostly doc tweaks, some import/export work	redmatrix	2015-08-31	1	-1/+1
\| \|
* \|	rename 'register_account' hook to 'create_identity'.	redmatrix	2015-08-31	1	-1/+1
\| \|
* \|	unclosed link tags	redmatrix	2015-08-30	1	-4/+4
\| \|
* \|	schedule a doco update once weekly	redmatrix	2015-08-30	2	-0/+34
\| \|
* \|	more work on doco search	redmatrix	2015-08-30	1	-0/+12
\| \|
* \|	more AccessList stuff - this time it's mod-item, which is a biggie	redmatrix	2015-08-28	1	-1/+1
\| \|
* \|	now we get to the heavy lifting with AccessList stuff	redmatrix	2015-08-27	1	-57/+29
\| \|
* \|	more work on AccessList integration	redmatrix	2015-08-27	3	-58/+62
\| \|
* \|	start conversion to AccessList object	redmatrix	2015-08-27	2	-18/+17
\| \|
* \|	First attempt to turn access control into an object class. The access ↵	redmatrix	2015-08-27	1	-0/+72
\| \| \| \| \| \| \| \|	control manipulation is getting too complex and this will help keep it manageable and reduce a lot of code duplication.
* \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-08-26	1	-1/+1
\|\\|
\| *	use extended export format for items in api photo_detail	redmatrix	2015-08-26	1	-1/+1
\| \|
* \|	redphotos updates	redmatrix	2015-08-26	1	-1/+8
\| \|
* \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-08-26	1	-1/+21
\|\\|
\| *	add item info to photo detail in api	redmatrix	2015-08-26	1	-1/+21
\| \|
* \|	change attach_store to allow a predefined item to accompany a photo	redmatrix	2015-08-26	2	-44/+82
\| \|
* \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-08-26	1	-1/+12
\|\\| \| \| \| \| \| \| \| \|	Conflicts: include/diaspora.php