32457 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Hypolite Petovan	4fe1d804ab	Merge pull request #4511 from annando/no-activity ... Only show visible activities	2018-02-27 04:41:12 -05:00
Michael	74ff36eee9	Only show visible activities	2018-02-27 09:29:11 +00:00
Hypolite Petovan	9297f0305f	Merge pull request #4506 from annando/fix-update ... Fix for network update (number of maximum comments set to 0)	2018-02-27 04:18:13 -05:00
Michael Vogel	1a8d8e4c07	Merge pull request #4510 from tobiasd/20180227-zhcn ... update to the zh-cn THX mytbk	2018-02-27 08:13:13 +01:00
Tobias Diekershoff	52049d4cb2	update to the zh-cn THX mytbk	2018-02-27 08:00:28 +01:00
Tobias Diekershoff	0e0ba4a2dd	Merge pull request #4509 from annando/fix-network-update ... Bugfix: The network update after a post now works again	2018-02-27 07:32:18 +01:00
Michael	15cd4792b8	Bugfix: The network update after a post now works again	2018-02-27 06:28:53 +00:00
Hypolite Petovan	16a55a021c	Merge pull request #4505 from annando/update-avatar ... Contact updates should now work more reliable	2018-02-26 17:40:01 -05:00
Michael	20368cbbf4	Fix for network update (number of maximum comments set to 0)	2018-02-26 22:15:57 +00:00
Michael	d4c95e0032	Contact updates should now work more reliable	2018-02-26 21:53:42 +00:00
Hypolite Petovan	01d2f7d5fb	Merge pull request #4504 from tobiasd/20180226-msg ... regen master messages.po with new help text in settings	2018-02-26 12:01:48 -05:00
Tobias Diekershoff	324a2939c7	regen master messages.po with new help text in settings	2018-02-26 17:52:40 +01:00
Hypolite Petovan	ba560ff76c	Merge pull request #4491 from tobiasd/20180224-settinghelp ... added some help texts to the Security and Privacy profile settings	2018-02-26 11:30:23 -05:00
Tobias Diekershoff	56bd9ec148	not only the others	2018-02-26 17:27:00 +01:00
Tobias Diekershoff	1b7a307423	annon it is	2018-02-26 17:21:47 +01:00
Hypolite Petovan	3dac937f22	Merge pull request #4501 from annando/fix-tag-search ... Fix: Tag searches hadn't been stored as tags	2018-02-26 11:13:51 -05:00
Hypolite Petovan	04f48e4cf6	Merge pull request #4503 from tobiasd/20180226-ganggo ... added ganggo project to the federation statistics page	2018-02-26 11:13:34 -05:00
Tobias Diekershoff	3950b2f8c6	added ganggo project to the federation statistics page	2018-02-26 17:10:47 +01:00
Hypolite Petovan	2b9561a774	Merge pull request #4502 from annando/guid-from-mail ... guid creation: Take the hostname from mail addresses for mail posts	2018-02-26 09:36:56 -05:00
Hypolite Petovan	a64e7a988c	Merge pull request #4500 from annando/improve-network ... Loading of the network page should be faster now	2018-02-26 09:35:23 -05:00
Michael	9e721c0908	guid creation: Take the hostname from mail addresses for mail posts	2018-02-26 11:48:05 +00:00
Michael	84ea6cab32	Fix: Tag searches hadn't been stored as tags	2018-02-26 11:45:53 +00:00
Michael	a700b3a729	Fix for fetching too old dates	2018-02-26 10:44:54 +00:00
Michael	9ac9481105	Flexible update timeout value	2018-02-26 07:41:58 +00:00
Michael	fe68e99c7c	The tag query should be much faster now	2018-02-26 06:59:32 +00:00
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