22922 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
tobiasd	3069e5eb1a	Merge pull request #1219 from annando/1411-hostname ... It is now possible to define the hostname from the admin page.	2014-11-09 09:18:17 +01:00
Michael Vogel	9172ea2246	Some more values that need to be set to avoid SQL warnings.	2014-11-09 01:13:07 +01:00
Michael Vogel	030784ad35	Fix for issue "Field 'type' doesn't have a default value" in the challenge table.	2014-11-08 20:52:15 +01:00
Michael Vogel	70ba1667e1	It is now possible to define the hostname from the admin page. This should definetely end the problem that the hostname couldn't be detected unter certain conditions.	2014-11-08 00:07:21 +01:00
fabrixxm	d81289c58b	Merge branch 'master' into develop	2014-11-06 20:53:49 +01:00
fabrixxm	ac29e831b2	Merge branch 'release-3.3.1'	2014-11-06 20:43:38 +01:00
fabrixxm	86c8362bb8	Bump version to 3.3.1. Add CHANGELOG file	2014-11-06 20:31:27 +01:00
fabrixxm	3c6bfe6033	Merge pull request #1217 from annando/1411-newlines-beyand-attachments ... Suppress newlines beneath attachments	2014-11-03 14:18:25 +01:00
Michael Vogel	cd0bdd7dd2	Merge pull request #1216 from cpfeiffer/TinyMCE-resizable ... Make TinyMCE editors resizable	2014-11-03 01:00:05 +01:00
Michael Vogel	3eed5bbd3e	Further improvement for newlines after attachments	2014-11-02 18:39:23 +01:00
Michael Vogel	14ea4b972e	BBCode: Newlines under attachments are now removed	2014-11-02 17:35:49 +01:00
Carsten Pfeiffer	00c16b387a	Make TinyMCE editors resizable	2014-11-01 22:18:42 +01:00
Fabrixxm	a32682d78c	Merge branch 'develop' into release-3.3.1	2014-10-31 14:50:46 +01:00
fabrixxm	a818ed2d49	Merge pull request #1213 from annando/1410-keyword-blacklist ... Blacklist for generating hashtags from keywords	2014-10-31 14:40:27 +01:00
Michael Vogel	5e303f9905	Removed some more special characters from hashtags	2014-10-30 11:33:33 +01:00
Michael Vogel	691aa17025	fetch further information: it is now possible to define a blacklist for keywords for "fetch further information"	2014-10-30 00:24:23 +01:00
tobiasd	ec4e3d76bc	Merge pull request #1212 from annando/1410-remote-self ... Remote-Self is now working for Friendica and Diaspora contacts as well	2014-10-29 15:06:21 +01:00
Michael Vogel	17f87ef9b2	Remote-self: It does only make sense to check for duplicates from friendica	2014-10-29 08:24:05 +01:00
Michael Vogel	59517f6e58	Remote self is now working for diaspora contacts as well.	2014-10-29 01:42:43 +01:00
Michael Vogel	338ad1d85f	Additional check for repeated posts	2014-10-29 01:31:29 +01:00
Michael Vogel	3e57954807	remote-self: Moved the code in a single function and cleaned it up.	2014-10-29 01:05:09 +01:00
Michael Vogel	01cb340752	Let remote-self posts appear as own posts - for test reasons	2014-10-28 22:10:58 +01:00
Michael Vogel	e46f597b00	Remote-self functionality added at another place - time for a separated function. (tbd)	2014-10-28 08:30:04 +01:00
Michael Vogel	f4860d3fd0	Remote-self: relocated the code (may now work?)	2014-10-27 21:44:30 +01:00
Michael Vogel	332531599e	Create a new guid and a separated item if remote self is used on a network that isn't a feed	2014-10-27 21:13:21 +01:00
Michael Vogel	b1cdaefcb2	Merge branch 'develop' of github.com:annando/friendica into 1410-remote-self	2014-10-27 11:45:39 +01:00
tobiasd	1150036d0d	Merge pull request #1210 from annando/1410-endless-ssl-redirecting ... Forcing all non-SSL requests to SSL requests is now an option.	2014-10-27 06:39:58 +01:00
Michael Vogel	2b5372aebe	Forcing all non-SSL requests to SSL requests is now an option.	2014-10-26 22:15:12 +01:00
tobiasd	f1697d3e5d	Merge pull request #1209 from FX7/master ... Added exact time to items after 24 hours	2014-10-25 19:21:21 +02:00
effex7	eb5bf2a733	Added exact time to items after 24 hours	2014-10-25 16:44:24 +02:00
tobiasd	6360330248	Merge pull request #1201 from fabrixxm/messages ... update messages.po and run_xgettext.sh	2014-10-24 14:06:31 +02:00
fabrixxm	53f3b8ab53	Merge pull request #1206 from annando/1410-refresh-to-ssl ... Reload a non-ssl-request to a ssl-request. (only when SSL_POLICY_FULL is enabled)	2014-10-24 10:56:19 +02:00
fabrixxm	4c66a3486a	Merge pull request #1207 from annando/1410-remote-self-with-keywords ... remote self: There is now an option if the keyswords should be used as tags or not	2014-10-24 10:55:22 +02:00
Michael Vogel	c77a63fb27	remote self: There is now an option if the keyswords should be used as tags or not.	2014-10-24 01:37:33 +02:00
Michael Vogel	68e75b4623	Reload a non-ssl-request to a ssl-request. (only when SSL_POLICY_FULL is enabled)	2014-10-24 00:52:29 +02:00
Michael Vogel	26c82f210e	Merge pull request #1198 from fabrixxm/issues/1190 ... Issues/1190	2014-10-23 22:29:50 +02:00
Michael Vogel	bd4410f11b	Merge pull request #1200 from fabrixxm/issues/1193 ... Fix #1193	2014-10-23 18:18:31 +02:00
Michael Vogel	c2989cc8db	Merge pull request #1203 from fabrixxm/feature/1134 ... Issue #1134	2014-10-23 17:44:58 +02:00
Fabrixxm	ba6f391635	replace embedded images before statustext is shortened	2014-10-23 17:04:07 +02:00
Fabrixxm	b1e83f331e	workaround for issue #1134	2014-10-23 16:27:30 +02:00
Fabrixxm	8bf19aabb0	api: allow filter of direct messages sender by user_id or screen_name	2014-10-23 08:59:48 +02:00
Fabrixxm	97d34f02da	update messages.po	2014-10-22 10:12:58 +02:00
Fabrixxm	d3edc513c2	run_xgettext.sh: fix xgettext warnings	2014-10-22 10:12:27 +02:00
Fabrixxm	634a03dd45	Fix #1193	2014-10-22 09:46:51 +02:00
Fabrixxm	f7cf72e450	fix use of $->query_string	2014-10-22 09:32:24 +02:00
Fabrixxm	63168905ec	Fix #1190	2014-10-22 09:04:32 +02:00
Michael Vogel	f6522658f6	Using "remote self" to synchronize Frandiaca accounts	2014-10-22 08:30:16 +02:00
fabrixxm	9d6bcd2572	Merge pull request #1195 from annando/1410-new-hook-getsiteinfo ... New hook "getsiteinfo" and "page_info_data"	2014-10-22 08:18:42 +02:00
fabrixxm	bb9a335d00	Merge pull request #1196 from annando/1410-store-extid ... New feature: Storing the field "extid" is now possible	2014-10-22 08:16:18 +02:00
Michael Vogel	97ec2787c6	New feature: Storing the field "extid" is now possible	2014-10-20 08:21:23 +02:00