11027 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Fabrixxm	6fa729b0bb	Merge branch 'hotfix_diaspora'	2016-01-20 08:45:42 +01:00
Michael Vogel	c6b0e57aa4	Bugfix: Comments weren't relayed anymore to Diaspora due to a Diaspora change	2016-01-20 08:40:04 +01:00
Fabrixxm	21f044e305	Friendica 3.4.3	2015-12-22 10:45:43 +01:00
Fabrixxm	c007722041	Merge branch 'release-3.4.3-rc'	2015-12-22 10:43:57 +01:00
Michael Vogel	989d949bd0	Merge pull request #2193 from fabrixxm/changelog ... Update CHANGELOG	2015-12-22 09:52:12 +01:00
Fabrixxm	156be7a17b	Update CHANGELOG	2015-12-22 09:08:53 +01:00
Michael Vogel	1b0b4d8c57	Merge pull request #2195 from fabrixxm/last-minute ... Last minute	2015-12-21 22:50:51 +01:00
Fabrixxm	770bba021e	call resizeIframe() function until size is stable ... (iframe content finished to load, hopefully) should remove scrollbars on rich oembeds	2015-12-21 16:41:55 +01:00
Fabrixxm	d4dd863b4b	quattro: style managed unread notification	2015-12-21 16:19:56 +01:00
Fabrixxm	bb7330cf2e	Update CHANGELOG	2015-12-21 15:51:21 +01:00
Tobias Diekershoff	7faa88613d	Merge pull request #2192 from fabrixxm/quattro-message-aside ... quattro: fix PM aside template	2015-12-21 09:57:17 +01:00
Fabrixxm	b79d98aea5	quattro: fix PM aside template ... errors was raised with new "show message list in aside" patch	2015-12-21 09:43:10 +01:00
Michael Vogel	185f03f12c	Merge pull request #2191 from tobiasd/20151217-fr ... FR: update to the translation	2015-12-20 22:17:26 +01:00
Tobias Diekershoff	719989249f	FR: update to the translation	2015-12-17 08:27:02 +01:00
Tobias Diekershoff	8944ad1ac1	Merge pull request #2190 from annando/1512-getload ... Sometimes the function "sys_getloadavg" doesn't return an array.	2015-12-16 06:21:17 +01:00
Michael Vogel	33f354a68c	Bugfix for the maximum load check in worker.	2015-12-16 00:14:53 +01:00
Michael Vogel	6e03477598	Sometimes the function "sys_getloadavg" doesn't return an array. This is a workaround.	2015-12-15 23:26:58 +01:00
Michael Vogel	f19d9aa430	Merge pull request #2189 from rabuzarus/1512_vier_images ... vier: fix missing icons	2015-12-15 15:47:09 +01:00
rabuzarus	19a72b30b4	vier: fix missing icons	2015-12-15 15:13:46 +01:00
Michael Vogel	8972c8c219	Merge pull request #2188 from rabuzarus/1512_allfriends_pager ... add pager to common friends and allfriends	2015-12-15 14:53:06 +01:00
rabuzarus	2cf1aaa791	add pager to common friends and allfriends	2015-12-15 14:31:24 +01:00
Tobias Diekershoff	791d152b8f	Merge pull request #2186 from annando/1512-profile-bbcode ... Bugfix: The bbcode conversion of the profile was inconsistent	2015-12-15 08:09:41 +01:00
Michael Vogel	f42a7a3469	Just one more place where we had forgotten to use the bbcode function for the about text	2015-12-15 00:11:19 +01:00
Michael Vogel	d077dbbcde	Bugfix: The bbcode conversion of the profile was inconsistent	2015-12-14 23:53:35 +01:00
Michael Vogel	2e0ebcd1c8	The "about" in feed has to be rendered as HTML	2015-12-14 23:02:49 +01:00
fabrixxm	ca201476b6	Merge pull request #2185 from tobiasd/20151214-translations ... update to translation for DE, FR; IT	2015-12-14 17:04:02 +01:00
Tobias Diekershoff	9640eb7c81	IT update to the strings	2015-12-14 16:56:40 +01:00
Tobias Diekershoff	053b69eee4	FR update to the strings	2015-12-14 16:30:28 +01:00
Tobias Diekershoff	e97a6dfb77	DE update to the strings	2015-12-14 16:27:00 +01:00
fabrixxm	7a5ac4490d	Merge pull request #2183 from rabuzarus/1412_profile_addr_fix ... fix displaying forum in hcard	2015-12-14 15:21:14 +01:00
rabuzarus	e61d6e030e	fix account_type	2015-12-14 14:12:56 +01:00
Tobias Diekershoff	616477d6a3	Merge pull request #2178 from annando/1512-slapper-400 ... OStatus: Make sure that mentions are always accepted	2015-12-14 07:57:44 +01:00
Michael Vogel	e0b53aa0ac	OStatus: Make sure that mentions are always accepted	2015-12-13 14:10:18 +01:00
Tobias Diekershoff	b0f55ca9f2	Merge pull request #2176 from annando/1512-warning ... Bugfix: Notice because of undefined constant	2015-12-13 10:22:13 +01:00
Michael Vogel	143e1a4a83	Bugfix: Warning because of undefined constant	2015-12-13 09:43:47 +01:00
fabrixxm	5b5b942325	Merge pull request #2172 from tobiasd/20151212-frosticons ... added event icons from frost-mobile to frost	2015-12-13 09:21:03 +01:00
Tobias Diekershoff	c0c0d62a2e	Merge pull request #2173 from annando/1512-optimize-fragmentation ... There is now a fragmentation level for the table optimization	2015-12-13 08:32:03 +01:00
Tobias Diekershoff	224ff8c132	Merge pull request #2174 from annando/1512-ostatus-subscribe ... Bugfix: OStatus subscription worked by random until now ...	2015-12-13 08:30:43 +01:00
Tobias Diekershoff	4a7d6eb13c	resized icons to 16px	2015-12-13 08:09:53 +01:00
Michael Vogel	5a1041578c	Bugfix: The subscribe process took the own contact by random ...	2015-12-12 17:55:57 +01:00
Michael Vogel	ec9b1b7afd	There is now a fragmentation level for the table optimisation	2015-12-12 17:46:24 +01:00
Michael Vogel	0869cce45f	Code cleaning, real changes will follow	2015-12-12 17:41:25 +01:00
Tobias Diekershoff	a7b37faafd	added event icons from frost-mobile to frost	2015-12-12 06:23:54 +01:00
Tobias Diekershoff	3c55214f28	Merge pull request #2171 from rabuzarus/1212_directory_fix ... fix directory search	2015-12-12 05:56:27 +01:00
rabuzarus	f513b25f6f	fix directory search	2015-12-12 01:27:31 +01:00
Tobias Diekershoff	f479692966	Merge pull request #2170 from fabrixxm/issue_1953 ... missing frost-mobile event icons	2015-12-11 19:45:09 +01:00
fabrixxm	8d1af68f44	missing frost-mobile event icons	2015-12-11 19:38:00 +01:00
Michael Vogel	6bd23721c2	Merge pull request #2169 from tobiasd/20151211-FR ... update to the French translation	2015-12-11 11:23:49 +01:00
Tobias Diekershoff	f304ba74fb	Merge pull request #2168 from annando/1512-contact-posts ... Bugfix: Posts weren't always shown for feeds that start with "www."	2015-12-11 08:11:16 +01:00
Tobias Diekershoff	5f27f509cb	Merge pull request #2167 from annando/1512-profile-aside ... Sometimes there wasn't a linebreak before the address in the profile	2015-12-11 08:10:23 +01:00