15446 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
wave72	598a428c6b	Added 'invitation_only' to site info	2015-12-20 14:41:49 +01:00
Wave	2aad4c2cf9	Merge pull request #4 from redmatrix/master ... Merge master into dev branch	2015-12-20 10:20:36 +01:00
Wave	e2692a4baa	Merge pull request #230 from wave72/master ... Updated Italian strings	2015-12-20 10:17:55 +01:00
wave72	474a1267d7	Updated Italian strings	2015-12-20 10:08:43 +01:00
redmatrix	ed5ca9e4cc	use realpath to bypass symlinks and check actually directory	2015-12-18 14:55:19 -08:00
redmatrix	8d61efa0e8	allow widget 'packages' as well as individual files	2015-12-18 14:10:06 -08:00
redmatrix	b816a575eb	Merge https://github.com/redmatrix/hubzilla into pending_merge	2015-12-18 13:46:38 -08:00
redmatrix	a99d28dea9	sql delete with limit	2015-12-18 13:46:03 -08:00
Mario Vavti	84bf705811	update smarty to 3.1.28 stable	2015-12-18 11:33:34 +01:00
redmatrix	1b9722c65a	loop detection	2015-12-17 18:16:46 -08:00
redmatrix	62a60e5542	more work on media uploads via api	2015-12-17 16:22:13 -08:00
redmatrix	539d06f02d	Merge https://github.com/redmatrix/hubzilla into pending_merge	2015-12-17 14:27:07 -08:00
redmatrix	9c23fe5ab6	issue #228	2015-12-17 14:26:42 -08:00
Mario Vavti	f78e9001f3	fix search item attachment rendering	2015-12-17 19:39:26 +01:00
zzottel	dee1841394	Merge pull request #227 from zzottel/master ... add forgotten German docs	2015-12-17 14:33:38 +01:00
zottel	a5201a90e8	Merge remote-tracking branch 'upstream/master'	2015-12-17 14:30:34 +01:00
zottel	5f5e4ee6b9	add forgotten German docs	2015-12-17 14:29:35 +01:00
zzottel	cf6519da99	Merge pull request #226 from zzottel/master ... help files	2015-12-17 14:28:15 +01:00
zottel	63eaf643a8	small fixes to English docs	2015-12-17 14:27:13 +01:00
zottel	a57a3c709e	reorganize German docs to fit the new docs structure ... fix mentions of RedMatrix	2015-12-17 14:25:16 +01:00
redmatrix	bcebd1d5b9	Merge https://github.com/redmatrix/hubzilla into pending_merge	2015-12-16 22:47:23 -08:00
redmatrix	4cacfe59bd	queue/notification/delivery refactor continued	2015-12-16 22:42:33 -08:00
redmatrix	f3ad7b9a16	Merge pull request #225 from zzottel/master ... help files	2015-12-17 10:39:49 +11:00
redmatrix	b909c878b1	Merge https://github.com/redmatrix/hubzilla into pending_merge	2015-12-16 14:49:20 -08:00
redmatrix	b155f2260f	some notifier optimisations. Also put a fixme on the invite total generations for new accounts, which is incorrect and now commented out.	2015-12-16 14:47:30 -08:00
zottel	63256bc9b2	small fixes in English help files	2015-12-16 17:00:05 +01:00
zottel	87519e107a	updates to some German help files	2015-12-16 16:59:17 +01:00
zzottel	a38710aa4e	Merge pull request #224 from zzottel/master ... update to German strings	2015-12-16 14:01:33 +01:00
zottel	020fea3031	update to German strings	2015-12-16 14:00:23 +01:00
zzottel	b4102489aa	Merge pull request #223 from zzottel/master ... remove directory red.zottel.red, add hubzilla.zottel.net instead	2015-12-16 12:32:17 +01:00
Wave	871ee0f571	Merge pull request #222 from wave72/master ... Updated Italian strings	2015-12-16 09:13:40 +01:00
zottel	f0d90005ea	remove directory fallback server red.zottel.red, add hubzilla.zottel.net instead	2015-12-16 09:06:20 +01:00
Paolo Tacconi	933e105f32	Updated Italian strings	2015-12-16 09:00:27 +01:00
redmatrix	9b4e6e1ec0	some more minor api tweaks	2015-12-15 20:21:40 -08:00
redmatrix	46e4d2d573	bring back the schemaspy makefile	2015-12-15 20:00:48 -08:00
redmatrix	2aa3acae6b	remove deprecated table	2015-12-15 19:46:24 -08:00
redmatrix	8514789da9	additional fix for the array_key_exists message in #221	2015-12-15 17:50:14 -08:00
redmatrix	20dcf37976	issue #221	2015-12-15 17:42:49 -08:00
redmatrix	38d513181d	Merge https://github.com/redmatrix/hubzilla into pending_merge	2015-12-15 15:17:39 -08:00
redmatrix	f121b74bec	enhance whitespace	2015-12-15 15:17:10 -08:00
redmatrix	cb8cccc537	fix typos before merging	2015-12-15 15:13:16 -08:00
redmatrix	2924b9182e	revise the photo activity a bit so that we always have a valid activity body. Several network connectors can get empty posts or posts that don't contain any reference whatsoever to the actual photo. Since this can cause duplicate images on our own site, just provide the activity summary and any included body text to the activity by default. Provide a function to enhance this activity with an actual photo which can be applied on demand for any network connectors that desire it. Otherwise they'll just get a link to the photo in the activity statement - which is better than an empty post. Have applied this "add actual photo to the post" function to both Diaspora and RSS feeds. Also provide the album as the activity target.	2015-12-15 15:01:54 -08:00
jeroenpraat	5a59cd9b8c	Invitation only added to the admin site page. Plus css wrapper class to docu search.	2015-12-15 21:00:40 +01:00
redmatrix	ba463afbdc	even more queue api	2015-12-15 00:42:19 -08:00
redmatrix	6f2a5117dc	more queue api	2015-12-15 00:04:30 -08:00
redmatrix	b13241564b	more work on queue api	2015-12-14 22:44:05 -08:00
redmatrix	76816de3aa	simplify queue insertion for normal items	2015-12-14 20:49:12 -08:00
redmatrix	49108c230b	regenerate the item body for linked photo items that now have no body to provide legal activities when going to other networks. Remove the signature since the signed text was an empty string and we've just replaced it with content that will not verify.	2015-12-14 17:58:39 -08:00
redmatrix	b32bba47c8	set following to false	2015-12-14 17:25:40 -08:00
redmatrix	dcf7946673	revert include/photos.php:L380	2015-12-14 02:34:18 -08:00