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	2	-4/+19
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: include/items.php view/it/messages.po view/it/strings.php
\| *	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-09-07	3	-380/+393
\| \|\
\| \| *	fix postgres zotfeed	Habeas Codice	2015-09-07	1	-4/+6
\| \| \|
\| \| *	Merge pull request #391 from tuscanhobbit/master	Wave	2015-09-07	2	-376/+387
\| \| \|\ \| \| \| \| \| \| \| \|	Updated Italian strings
\| \| \| *	Updated Italian strings	Paolo Tacconi	2015-09-07	2	-376/+387
\| \| \| \|
\| * \| \|	sync posted top level items rather than deliver them (actually we do both, ↵	redmatrix	2015-09-07	1	-3/+30
\| \|/ / \| \| \| \| \| \| \| \| \|	but sync comes first). This way we get the ACL transferred.
* \| \|	consolidate import_items/sync_items	redmatrix	2015-09-07	6	-102/+112
\| \| \|
* \| \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-09-07	3	-9/+12
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: util/messages.po
\| * \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-09-07	1	-6/+9
\| \|\ \
\| \| * \|	uexport template fixes	Mario Vavti	2015-09-04	1	-6/+9
\| \| \| \|
\| * \| \|	PRIVACY: item_private seems to have been removed from permissions_sql ↵	redmatrix	2015-09-07	3	-182/+182
\| \|/ / \| \| \| \| \| \| \| \| \|	checking with an observer.
* \| \|	Always open rpost editor on document ready	redmatrix	2015-09-06	2	-9/+7
\| \| \|
* \| \|	use conversation defaults for /public page instead of collapsed list mode, ↵	redmatrix	2015-09-06	1	-3/+5
\| \| \| \| \| \| \| \| \| \| \| \|	but allow over-ride
* \| \|	Update dav_windows.bb	jeroenpraat	2015-09-06	1	-3/+3
\| \| \|
* \| \|	Update dav_nemo.bb	jeroenpraat	2015-09-06	1	-5/+5
\| \| \|
* \| \|	Update dav_mount.bb	jeroenpraat	2015-09-06	1	-3/+3
\| \| \|
* \| \|	Update dav_mount.bb	jeroenpraat	2015-09-06	1	-1/+1
\| \| \|
* \| \|	Update dav_dolphin.bb	jeroenpraat	2015-09-06	1	-2/+2
\| \| \|
* \| \|	Update dav_nautilus.bb	jeroenpraat	2015-09-06	1	-2/+2
\| \| \|
* \| \|	make js_upload work with hubzilla. It still needs a rewrite.	redmatrix	2015-09-05	2	-12/+36
\| \| \|
* \| \|	syntax	redmatrix	2015-09-05	1	-1/+1
\| \| \|
* \| \|	Merge pull request #26 from anaqreon/logo-in-readme	redmatrix	2015-09-05	2	-3/+3
\|\ \ \ \| \| \| \| \| \| \| \|	Updating logo icon in Readme file and change markup heading
\| * \| \|	Updating logo icon in Readme file and change markup heading for universality.	Andrew Manning	2015-08-15	2	-3/+3
\| \| \| \|
* \| \| \|	Merge pull request #35 from redmatrix/jeroenpraat-patch-1	redmatrix	2015-09-05	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Fix for PHP Fatal error: Function name must be a string in /var/www/…
\| * \| \| \|	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?
* \| \| \|	fix typos before pushing0.9	redmatrix	2015-09-03	1	-1/+1
\| \| \| \|
* \| \| \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-09-03	0	-0/+0
\|\ \ \ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	export chatrooms	redmatrix	2015-09-03	1	-0/+6
\| \| \| \|
* \| \| \|	import and sync chatrooms	redmatrix	2015-09-03	6	-4/+114
\| \| \| \|
* \| \| \|	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.
* \| \| \|	profile import error #34	redmatrix	2015-09-03	1	-3/+2
\| \| \| \|
* \| \| \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-09-03	1	-3/+2
\|\\| \| \|
\| * \| \|	in this case no results is not an error	redmatrix	2015-09-03	1	-3/+2
\| \| \| \|
* \| \| \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-09-03	3	-13/+20
\|\\| \| \|
\| * \| \|	revision update	redmatrix	2015-09-03	1	-1/+1
\| \| \| \|
\| * \| \|	Merge pull request #390 from zzottel/master	redmatrix	2015-09-04	2	-12/+19
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	fix update 1148
\| \| * \| \|	fix update 1148	zottel	2015-09-03	2	-12/+19
\| \|/ / /
* \| \| \|	bug reporting doc	redmatrix	2015-09-03	2	-0/+32
\| \| \| \|
* \| \| \|	app sync	redmatrix	2015-09-02	3	-2/+91
\| \| \| \|
* \| \| \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-09-02	3	-3/+15
\|\\| \| \|
\| * \| \|	more adjustment to apps containers	redmatrix	2015-09-02	1	-2/+3
\| \| \| \|
\| * \| \|	sort out some app display weirdness	redmatrix	2015-09-02	3	-3/+14
\| \| \| \|
\| * \| \|	increase height of app-container so edit controls aren't shadowed	redmatrix	2015-09-02	1	-1/+1
\| \| \| \|
* \| \| \|	add timestamps for syncing apps	redmatrix	2015-09-02	4	-6/+35
\| \| \| \|
* \| \| \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-09-02	2	-3/+11
\|\\| \| \|
\| * \| \|	dummy update	redmatrix	2015-09-02	2	-3/+11
\| \| \| \|
* \| \| \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-09-02	3	-5/+8
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: doc/credits.bb mod/thing.php
\| * \| \|	sync "things" (obj elements)	redmatrix	2015-09-02	1	-0/+28
\| \| \| \|
\| * \| \|	Update the credits	redmatrix	2015-09-02	2	-5/+7
\| \| \| \|