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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-09-01	16	-0/+0
\|\
\| *	Updated all 300px default profile photos to 300px. Most using the SVG ↵	jeroenpraat	2015-09-01	16	-0/+0
\| \| \| \| \| \| \| \|	source, some enlarged using the Gimp.
* \|	Fix filename	Haakon Meland Eriksen	2015-09-01	1	-2/+1
\| \|
* \|	Fixed deploy script	Haakon Meland Eriksen	2015-09-01	1	-8/+37
\| \|
* \|	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-09-01	1	-2/+3
\|\\|
\| *	don't log the mundane - especially at normal levels.	redmatrix	2015-08-31	1	-2/+3
\| \|
* \|	Added openshift-hubzilla-deploy to .openshift/action_hooks/deploy	Haakon Meland Eriksen	2015-09-01	1	-0/+110
\| \|
* \|	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-09-01	47	-663/+722
\|\\|
\| *	this is a bit harder than anticipated.	redmatrix	2015-08-31	1	-14/+15
\| \|
\| *	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-08-31	10	-192/+224
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: include/identity.php install/update.php util/messages.po view/nl/messages.po
\| \| *	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-08-31	5	-272/+283
\| \| \|\
\| \| \| *	Removed redmatrix.nl as a fallback server (directory mode to normal) + ↵	jeroenpraat	2015-08-29	3	-56/+55
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	update strings ES
\| \| \| *	Update es and nl strings	jeroenpraat	2015-08-28	4	-245/+257
\| \| \| \|
\| \| * \|	change the likes db structure to make it more easily importable/exportable	redmatrix	2015-08-31	8	-258/+282
\| \| \|/
\| * \|	mostly doc tweaks, some import/export work	redmatrix	2015-08-31	5	-28/+23
\| \| \|
\| * \|	update history	redmatrix	2015-08-31	1	-6/+12
\| \| \|
\| * \|	documentation re-org	redmatrix	2015-08-31	7	-73/+90
\| \| \|
\| * \|	Merge https://github.com/redmatrix/hubzilla into pending_merge	redmatrix	2015-08-31	7	-1/+1
\| \|\ \
\| \| * \|	Changed favicon to new one (based on new Hubzilla arrow). Please revert when ↵	jeroenpraat	2015-08-31	7	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	it's not okay. Also added a new optional default profile photo, in the same style.
\| * \| \|	rename 'register_account' hook to 'create_identity'.	redmatrix	2015-08-31	2	-13/+15
\| \|/ /
\| * \|	unclosed link tags	redmatrix	2015-08-30	2	-6/+9
\| \| \|
\| * \|	schedule a doco update once weekly	redmatrix	2015-08-30	2	-0/+34
\| \| \|
\| * \|	more work on doco search	redmatrix	2015-08-30	5	-1/+30
\| \| \|
\| * \|	improvements to documentation search	redmatrix	2015-08-30	2	-34/+18
\| \| \|
\| * \|	more AccessList stuff - this time it's mod-item, which is a biggie	redmatrix	2015-08-28	2	-73/+20
\| \| \|
\| * \|	now we get to the heavy lifting with AccessList stuff	redmatrix	2015-08-27	3	-83/+48
\| \| \|
\| * \|	more work on AccessList integration	redmatrix	2015-08-27	9	-139/+113
\| \| \|
\| * \|	start conversion to AccessList object	redmatrix	2015-08-27	3	-25/+20
\| \| \|
\| * \|	First attempt to turn access control into an object class. The access ↵	redmatrix	2015-08-27	2	-0/+75
\| \| \| \| \| \| \| \| \| \| \| \|	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-27	2	-2/+2
\| \|\\|
\| \| *	fallback directory server list update	redmatrix	2015-08-27	2	-2/+2
\| \| \|
* \| \|	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-08-27	23	-1165/+1188
\|\\| \|
\| * \|	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
\| \| *	support likes on comments with diaspora owner by sending as activity	redmatrix	2015-08-26	1	-14/+19
\| \| \|
\| \| *	required for future work	redmatrix	2015-08-26	1	-1/+12
\| \| \|
\| * \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-08-26	2	-2/+1
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: mod/import.php
\| \| *	syntax error in last checkin	redmatrix	2015-08-26	1	-4/+4
\| \| \|
\| \| *	import fixes	redmatrix	2015-08-26	2	-2/+34
\| \| \|
\| * \|	import fixes	redmatrix	2015-08-26	1	-2/+15
\| \| \|
\| * \|	add repository type as one that is able to self-identify as a public forum	redmatrix	2015-08-25	1	-1/+1
\| \| \|
\| * \|	this is weird	redmatrix	2015-08-25	4	-205/+191
\| \| \|
\| * \|	make diaspora person guids for hubzilla folks globally unique. That's what a ↵	redmatrix	2015-08-25	2	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \|	globally unique ID is. This forever kills the prospect of making nomadic identity work flawlessly on Diaspora. But since all your identities have the same guid, this allows your different identities to communicate with Diaspora; which would otherwise fail to connect to your other instances because of the guid collision.
\| * \|	lots of stuff that was needed for successful photo import from red	redmatrix	2015-08-24	2	-17/+81
\| \| \|
\| * \|	don't try to optimise the session table. Just let it fragment and let the DB ↵	redmatrix	2015-08-24	1	-3/+0
\| \| \| \| \| \| \| \| \| \| \| \|	worry about it.