12400 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
fabrixxm	e44b831a21	Merge pull request #2156 from gerhard6380/develop ... new API calls for managing contact groups	2015-12-11 12:37:26 +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
Tobias Diekershoff	49b4be1670	regenerated credits.txt	2015-12-11 08:04:35 +01:00
Tobias Diekershoff	36769d77eb	FR update to the strings THX Perig	2015-12-11 08:03:09 +01:00
Michael Vogel	300007a0cf	Bugfix: Posts weren't always shown for feeds that start with "www."	2015-12-10 22:47:58 +01:00
Michael Vogel	138d745f5e	Sometimes there wasn't a linebreak before the address in the profile	2015-12-10 21:39:44 +01:00
Michael Vogel	e8b13bacec	Merge pull request #2161 from ddorian1/release-3.4.3-rc ... fix path for photo and proxy	2015-12-10 21:20:37 +01:00
Michael Vogel	1e0f26da8d	Merge pull request #2166 from rabuzarus/1012_vier-forum ... vier: fix little misspelling	2015-12-10 21:19:16 +01:00
Michael Vogel	6dd39760ac	Support for real repeated messages	2015-12-10 18:16:16 +01:00
rabuzarus	776cbe4a37	vier: fix little misspelling	2015-12-10 13:30:11 +01:00
Michael Vogel	45f4af66e7	OStatus: Basic support for groups, new function to detect reshared items	2015-12-10 01:10:54 +01:00
fabrixxm	679ae1c035	Merge pull request #2164 from annando/1512-basepath-2 ... Avoid problems with wrong configured server variables	2015-12-09 19:17:48 +01:00
Tobias Diekershoff	3ac75eebbc	Merge pull request #2163 from annando/1512-rendertime-css ... Do a linebreak before the output of rendertime	2015-12-08 21:05:05 +01:00
Michael Vogel	57576e09ed	Avoid problems with wrong configured server variables	2015-12-08 19:53:01 +01:00
Michael Vogel	59b2bde9a7	Do a linebreak before the output of rendertime	2015-12-08 19:41:27 +01:00
Johannes Schwab	2f866fecf9	fix path for photo and proxy	2015-12-08 11:31:50 +01:00
fabrixxm	f97e20acd3	add support to schema modification with multi-column primary key	2015-12-08 10:35:08 +01:00
fabrixxm	5d04818df7	Merge pull request #2162 from annando/1512-basepath ... Add an additional way to fetch the basepath (See pull request 2161)	2015-12-08 09:08:48 +01:00
Michael Vogel	d7fc8d7c12	Add an additional way to fetch the basepath (See pull request 2161)	2015-12-08 08:17:29 +01:00
Michael Vogel	a2fa791bbd	Always include the direct parent in the mentions	2015-12-07 23:35:33 +01:00
fabrixxm	29e9a7947e	Update FRIENDICA_VERSION	2015-12-07 23:24:55 +01:00
fabrixxm	f359731fc1	Merge pull request #2159 from annando/1512-worker-processes ... Better control for the number of workers	2015-12-07 23:20:02 +01:00
fabrixxm	e5a6d91cc4	Merge pull request #2158 from annando/1512-vier-fonts ... Vier: The line-height seems to make problems with windows	2015-12-07 23:06:50 +01:00
Michael Vogel	88da58ed3e	OStatus: Deactivated The resharing until it is tested completely.	2015-12-07 23:06:28 +01:00
gerhard6380	1d3b61c3b9	Update api.md ... changed from api/users/group_* to api/friendica/group_*	2015-12-07 22:42:43 +01:00
root	e1c6d80c01	change api/user/group_* to api/friendica/group_*	2015-12-07 22:18:55 +01:00
gerhard6380	77f1357123	Update api.md ... add documentation for new API calls for Managing groups	2015-12-07 22:07:20 +01:00
Michael Vogel	bfc0857953	OStatus: Send even Friendica comments to OStatus	2015-12-07 21:52:42 +01:00
Michael Vogel	1fb636ba1e	Vier: The line-height seems to make problems with windows	2015-12-07 21:45:33 +01:00
Gerhard Seeber	8128a28a6c	new API calls for managing contact groups	2015-12-07 19:38:11 +01:00
Tobias Diekershoff	d944b65253	Merge pull request #2151 from annando/1512-misconfigured-friendica ... Workaround for misconfigured Friendica servers with probe_url	2015-12-07 06:37:37 +01:00
Tobias Diekershoff	bd8b5ad881	Merge pull request #2153 from annando/issue-1924 ... Issue 1924: New configuration value for permitting crawler access	2015-12-07 06:32:01 +01:00
Tobias Diekershoff	6fb5e0a15d	Merge pull request #2152 from annando/bugfix-socgraph ... Bugfix for pull request #2147 (Fix for issue #2122)	2015-12-07 06:29:38 +01:00
Michael Vogel	bcf7e673c9	Issue 1924: New configuration value for permitting crawler access	2015-12-06 22:01:20 +01:00
Michael Vogel	6b0b9481cb	Bugfix for pull request #2147 (Fix for issue #2122)	2015-12-06 20:05:57 +01:00
Michael Vogel	fbbba6828b	Some better logging	2015-12-06 20:04:33 +01:00
Michael Vogel	d06717798b	Code beautification	2015-12-06 18:57:23 +01:00
Michael Vogel	f880bdd33b	Workaround for misconfigured Friendica servers	2015-12-06 18:52:19 +01:00
Michael Vogel	9f8da37c99	Move the process check at the beginning of the script	2015-12-06 16:40:31 +01:00
Michael Vogel	54085508e5	Double check for maximum number of workers	2015-12-06 16:28:28 +01:00
Tobias Diekershoff	2dc0b2b731	Merge pull request #2150 from annando/1512-probe-url-caching ... probe_url: Only cache successful results	2015-12-06 12:22:43 +01:00
Michael Vogel	7c7baa77d6	probe_url: Only cache successful results	2015-12-06 12:15:31 +01:00
Tobias Diekershoff	6a05112d98	Merge pull request #2149 from annando/issue-1921 ... Issue 1921: Disable the auto update	2015-12-06 07:31:13 +01:00