32282 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Michael	d2728cad2e	Children for the network page are now fetched correctly in the conversation	2018-02-26 06:38:27 +00:00
Michael	9308b7f2df	inner join is better	2018-02-25 21:58:21 +00:00
Michael	a1eb5a584f	Improve the queries on the network page	2018-02-25 21:33:15 +00:00
Tobias Diekershoff	28fa27ea0e	some wording changes	2018-02-25 08:50:50 +01:00
Michael Vogel	b8114f4e9d	Merge pull request #4493 from tobiasd/20180223-vagrant ... Some changes to the Vagrant configuration	2018-02-24 13:31:20 +01:00
Tobias Diekershoff	8a844b1440	added some help texts to the Security and Privacy profile settings	2018-02-24 08:00:11 +01:00
Tobias Diekershoff	b0b690ac94	the host name in the VM does not need the xenial anymore	2018-02-23 16:04:20 +01:00
Tobias Diekershoff	0efbbe18bf	make /tmp writeable in the Vagrant VM	2018-02-23 16:02:37 +01:00
Hypolite Petovan	9fc0e02bf9	Merge pull request #4490 from annando/item-enhanced ... Enhanced logging for salmon posts	2018-02-22 09:56:16 -05:00
Michael	d7442559e0	Merge remote-tracking branch 'upstream/develop' into item-enhanced	2018-02-22 10:04:57 +00:00
Hypolite Petovan	8a3927e12c	Merge pull request #4489 from annando/missing-fid ... When refreshing the fcontact, the returned array was incomplete	2018-02-22 05:03:30 -05:00
Michael	a74b5fdde8	When refreshing the fcontact, the returned array was incomplete	2018-02-22 09:59:21 +00:00
Michael	24a20fc294	Improved logging for salmon posts to check for missing contacts in item post	2018-02-22 09:57:06 +00:00
Hypolite Petovan	f8cb18ff64	Merge pull request #4487 from annando/item-enhanced ... The item class had been improved (e.g. database calls)	2018-02-22 04:55:31 -05:00
Michael	2f2e7b9d5a	fetch_first is now used / additional logging	2018-02-22 09:51:59 +00:00
Michael	046352606e	Bugfix: $uid wasn't available in that context	2018-02-22 07:05:56 +00:00
Michael	2897333c28	Most queries are now done with the dba functions	2018-02-22 06:52:58 +00:00
Michael	8ad2ebbf47	$u is now $user	2018-02-21 23:10:29 +00:00
Michael	8e0496c040	Better naming of variables	2018-02-21 22:55:23 +00:00
Michael	5a91c746e9	$arr is now $item	2018-02-21 21:39:07 +00:00
Michael	82bd26edb9	The item class had been improved (e.g. database calls)	2018-02-21 21:08:37 +00:00
Hypolite Petovan	6067c29524	Merge pull request #4485 from annando/fewer-gcontact ... No gcontact-id anymore (It wasn't really used)	2018-02-21 00:26:18 -05:00
Michael	ae705261f1	Function is only used locally	2018-02-21 05:21:55 +00:00
Michael	a59796d1d4	No gcontact-id anymore (It wasn't really used)	2018-02-21 05:15:55 +00:00
Hypolite Petovan	eed35c3e69	Merge pull request #4484 from annando/item-guid ... The guid creation for posts is now done in a separate function	2018-02-20 23:22:11 -05:00
Hypolite Petovan	1fb82720be	Merge pull request #4483 from annando/not-always-db-update ... Only do a database update when the current system version is lower	2018-02-20 23:16:55 -05:00
Hypolite Petovan	cf74da9c86	Merge pull request #4480 from annando/better-resource-id ... Improved resource id creation	2018-02-20 23:13:24 -05:00
Michael	475969a1d3	The guid creation for posts is now done in a separate function	2018-02-21 04:13:13 +00:00
Michael	ecc0395151	Only do a database update when the current system version is lower	2018-02-21 04:06:17 +00:00
Michael	6e642ad6d4	Only not generate prefix when parameter is false	2018-02-21 03:37:20 +00:00
Michael	5a30dfcf34	Merge remote-tracking branch 'upstream/develop' into better-resource-id	2018-02-21 03:28:47 +00:00
Hypolite Petovan	dd0147bd01	Merge pull request #4479 from annando/db-structure ... Improvements to the database structure	2018-02-20 21:38:35 -05:00
Michael	60764b7bc3	Oops ...	2018-02-20 12:59:37 +00:00
Michael	3e46382459	Standard stuff	2018-02-20 11:20:28 +00:00
Michael	a3af6807ac	Improved resource id creation	2018-02-20 10:02:07 +00:00
Michael	d90b93cfda	Several more improvements to the database structure	2018-02-20 07:40:21 +00:00
Michael	6c26dcf1c7	The network is now just a 4 character field	2018-02-19 13:58:04 +00:00
Hypolite Petovan	dcd08c5236	Merge pull request #4474 from annando/issue-1312 ... Issue 1312: Improve account expiry	2018-02-18 17:37:01 -05:00
Michael	0062fede79	Issue 1312: Improve account expiry	2018-02-18 22:19:20 +00:00
Hypolite Petovan	2351e14e16	Merge pull request #4473 from annando/issue-4228 ... Don't post an item if it belongs to a picture upload without an post	2018-02-18 13:28:47 -05:00
Michael	d0fa80b195	Issue 4228: Don't post an item if it belongs to a picture upload without an post	2018-02-18 17:29:14 +00:00
Hypolite Petovan	281734d5dc	Merge pull request #4471 from annando/parent-uid ... Frontend to set the parent-uid field	2018-02-18 11:48:39 -05:00
Hypolite Petovan	eac6168553	Merge pull request #4472 from annando/issue-4369 ... Issue 4369: Added logging to know why a post is stored	2018-02-18 11:46:04 -05:00
Michael	a9a85849f4	Issue 4369: Added logging to know why a post is stored	2018-02-18 16:43:18 +00:00
Tobias Diekershoff	a62dd4debf	Merge pull request #4465 from MrPetovan/task/4463-frio-style-settings-addon ... [frio] Style settings/addon	2018-02-18 17:12:15 +01:00
Michael	fd53b541e5	Frontend to set the parent-uid field	2018-02-18 13:19:47 +00:00
Hypolite Petovan	f0268c6142	Fix indentation in frio/css/style.css	2018-02-18 08:13:59 -05:00
Hypolite Petovan	96078a1fca	[frio] Make settings/addon look like settings/display	2018-02-18 08:13:59 -05:00
Michael Vogel	b52252bf39	Merge pull request #4470 from tobiasd/20180218-de ... update for DE translation	2018-02-18 11:05:49 +01:00
Michael Vogel	a920896fa5	Merge pull request #4469 from tobiasd/20180218-missingL10n ... missing L10n::t for date string formatting	2018-02-18 11:04:42 +01:00