18339 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Hypolite Petovan	97d31255e5	Merge pull request #4634 from tobiasd/20180319-de ... update for DE translation THX utzer	2018-03-19 13:50:37 -04:00
Tobias Diekershoff	08ed310d83	update for DE translation THX utzer	2018-03-19 18:38:47 +01:00
Hypolite Petovan	7f01ee066c	Merge pull request #4631 from friendica/fabrixxm-36rc-patch-1 ... Small fix to translatable string	2018-03-19 08:39:50 -04:00
fabrixxm	d9aca508cd	Fix another closing bracket in translatable string	2018-03-19 11:19:09 +01:00
fabrixxm	e6c59b0593	fix docstring of get_poke_verbs()	2018-03-19 10:20:01 +01:00
fabrixxm	8a2a4510ec	Small fixes to translatable string ... and some small cosmetic fixup to docstring for `notification()`	2018-03-19 10:15:09 +01:00
Hypolite Petovan	9c5f2ad0fc	Merge pull request #4625 from annando/ostatus-groups ... OStatus: Forum feeds now look like OStatus group feeds	2018-03-18 10:33:53 -04:00
Michael Vogel	188ef4f2e6	Merge pull request #4626 from tobiasd/20180318-installer ... installer checks for POSIX functions	2018-03-18 15:31:52 +01:00
Tobias Diekershoff	5fad0cd123	count from zero...	2018-03-18 14:30:51 +01:00
Michael	d8824cc3bc	Improved similarity to ostatus group feeds	2018-03-18 11:18:25 +00:00
Michael	3ff6520ed5	OStatus: Forum feeds now look like OStatus group feeds	2018-03-18 10:31:12 +00:00
Tobias Diekershoff	a6845c0180	added check for POSIX kill to the installation wizard	2018-03-18 10:36:28 +01:00
Hypolite Petovan	25635295c7	Merge pull request #4624 from tobiasd/20180317-credits2 ... regen credits	2018-03-18 03:43:55 -04:00
Hypolite Petovan	cdcfabfd74	Merge pull request #4623 from tobiasd/20180318-installdocs ... added note about POSIX to the installation docs	2018-03-18 03:43:44 -04:00
Tobias Diekershoff	c08c2bc37c	regen credits	2018-03-18 07:42:16 +01:00
Tobias Diekershoff	608e034a15	added note about POSIX to the installation docs	2018-03-18 07:21:22 +01:00
Hypolite Petovan	e970bbdca8	Merge pull request #4621 from annando/not-null ... Avoid storing "null" values	2018-03-17 18:40:31 -04:00
Michael	9930c61263	Same same but different	2018-03-17 20:56:56 +00:00
Michael	c42c121e51	Fewer Defaults	2018-03-17 20:54:56 +00:00
Michael	8700d2a8ad	Avoid storing "null" values	2018-03-17 13:09:21 +00:00
Hypolite Petovan	d1c93e7a60	Merge pull request #4614 from annando/dir-own-contact ... Fix: In the contact search you had been able to delete your own contact	2018-03-17 08:42:51 -04:00
rabuzarus	0f9af5d193	Merge pull request #4619 from annando/missing-doxygen ... Added missing doxygen header	2018-03-17 10:47:03 +01:00
Michael	cd2c9722b0	Added missing doxygen header	2018-03-17 09:42:29 +00:00
Michael Vogel	bf0b98017d	Merge pull request #4618 from tobiasd/210180317-htconfig ... activate the frio theme during installation	2018-03-17 10:40:09 +01:00
Tobias Diekershoff	fea18c11ea	Merge pull request #4617 from annando/issue-4611 ... Possible fix issue 4611: Don't write to database before it is created	2018-03-17 10:29:55 +01:00
Michael	537ef83a24	If we aren't connected to the database, we shouldn't return "true" on connect	2018-03-17 09:21:06 +00:00
Tobias Diekershoff	7a13ede69f	activate the frio theme during installation	2018-03-17 10:14:19 +01:00
Michael	782d692b5a	Possible fix issue 4611: Don't write to database before it is created	2018-03-17 09:04:38 +00:00
Michael	8053172398	Issue 4610: The query is simplified and shouldn't fail again	2018-03-17 07:50:49 +00:00
Michael	c7dc3f94c9	Simplified query	2018-03-17 07:12:28 +00:00
Michael	69918f4ae9	Ignore obvious garbage results	2018-03-17 06:54:47 +00:00
Michael Vogel	7207a945ce	Merge pull request #4615 from tobiasd/20180317-credits ... regen credits	2018-03-17 07:27:43 +01:00
Tobias Diekershoff	4593ad5c92	regen credits	2018-03-17 07:22:22 +01:00
Michael	d616bb7564	Fix: In the contact search you had been able to delete your own contact	2018-03-17 06:17:32 +00:00
Hypolite Petovan	e2f5350e61	Merge pull request #4612 from annando/dfrn-batch-notify ... Fix: Private transmission via Diaspora to Friendica servers	2018-03-16 16:52:38 -04:00
Michael	ec9b7af25b	Fix: Private transmission via Diaspora to Friendica servers	2018-03-16 20:34:28 +00:00
Hypolite Petovan	3ca2dc70b3	Merge pull request #4607 from annando/dfrn-relationship ... DFRN: The relationship between contacts can now be changed afterwards	2018-03-16 03:55:34 -04:00
Michael	a62ccf0ec1	Added to-do	2018-03-16 07:27:18 +00:00
Michael	67fa6aa809	We now change relationships not only for OStatus contacts	2018-03-16 06:58:54 +00:00
Michael	59dd353464	DFRN: The relationship between contacts can now be changed afterwards	2018-03-16 06:43:10 +00:00
Hypolite Petovan	ba03991294	Merge pull request #4603 from annando/pleroma-like ... OStatus: Likes from Pleroma will now work	2018-03-15 17:42:53 -04:00
Michael	972c2c86ef	OStatus: Likes from Pleroma will now work	2018-03-15 21:33:28 +00:00
Hypolite Petovan	535ae04613	Merge pull request #4602 from tobiasd/20180316-installdoc ... php-zip module is needed for composer	2018-03-15 16:27:04 -04:00
Tobias Diekershoff	658812ff46	php-zip module is needed for composer	2018-03-15 20:40:22 +01:00
Michael Vogel	fc6576fd83	Merge pull request #4598 from MrPetovan/spoiler-cache ... Fix for CW: Items weren't cached (alt)	2018-03-15 10:29:35 +01:00
Hypolite Petovan	c53c00ba4e	Add rendred-hash to put_item_in_cache todo	2018-03-15 03:23:11 -04:00
Hypolite Petovan	644767519e	Ensure the item body stays the same in put_item_in_cache() ... - Add documentation	2018-03-15 02:13:00 -04:00
Hypolite Petovan	e28020c68a	Fix for CW: Items weren't cached	2018-03-15 01:32:04 -04:00
Hypolite Petovan	d376ed6f61	Merge pull request #4596 from annando/attachment-encode ... Attachment encode	2018-03-14 18:59:25 -04:00
Michael	4ba3ba391a	The attachment text had already been in HTML and mustn't be converted again	2018-03-14 22:51:14 +00:00