29873 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Tobias Diekershoff	a6e1f9c89d	Merge pull request #3695 from annando/repeat-picture ... OStatus: Attached pictures now show up in repeated posts as well.	2017-09-09 10:41:58 +02:00
Michael	52b12fccc9	OStatus: Attached pictures now show up in repeated posts as well.	2017-09-09 07:43:50 +00:00
Tobias Diekershoff	0ae2b1192f	Merge pull request #3694 from annando/bugfix-mail ... Bugfix: Mails weren't sent	2017-09-08 18:24:45 +02:00
Michael	637eb0bfb4	Bugfix: Mails weren't sent	2017-09-08 15:14:33 +00:00
Tobias Diekershoff	d79fe20f61	Merge pull request #3693 from annando/remote-self-finally ... "remote self" now finally really works with addons	2017-09-08 11:00:06 +02:00
Michael	c44448dd57	We should reset the session variable	2017-09-08 08:50:08 +00:00
Michael	a5a4f53287	This is a better place	2017-09-08 07:08:06 +00:00
Michael	3c6d83acd9	Remote self should now finally trigger all addons	2017-09-08 07:00:38 +00:00
Tobias Diekershoff	785cfbbaef	Merge pull request #3690 from annando/diaspora-like ... Diaspora will introduce "like on comment" so we doing it as well	2017-09-08 08:14:42 +02:00
Michael	6e196a6afd	Diaspora will introduce "like on comment" so we doing it as well	2017-09-08 05:36:00 +00:00
Tobias Diekershoff	1600d8e2a6	Merge pull request #3689 from annando/ostatus-attach ... OStatus: Better attachment handling for pictures	2017-09-08 06:46:52 +02:00
Michael	c3eaf336dc	Removed code	2017-09-07 15:48:25 +00:00
Michael	6e670df80f	OStatus: Better attachment handling for pictures	2017-09-07 15:34:50 +00:00
Michael Vogel	ce975ceba2	Merge pull request #3688 from tobiasd/20170906-reqs ... php xml package is required and sometimes not installed by default	2017-09-07 14:39:10 +02:00
Silke Meyer	106f4e62cf	Calling apt-get install twice less	2017-09-07 11:29:22 +02:00
Silke Meyer	236f53cec1	Replaced the test database for vagrant with a fresh one	2017-09-07 11:28:08 +02:00
Tobias Diekershoff	8cf00147b3	Merge pull request #3687 from annando/iso8601 ... Logger date format is now ISO8601 compatible	2017-09-07 07:54:09 +02:00
Michael	66968efb9a	Logger date format is now ISO8601 compatible	2017-09-06 21:13:06 +00:00
Silke Meyer	ac0d93ed58	Merge branch 'vagrant2' of https://github.com/silke/friendica into develop	2017-09-06 21:44:09 +02:00
Tobias Diekershoff	02ff6b77bc	php xml package is required and sometimes not installed by default	2017-09-06 21:05:10 +02:00
Tobias Diekershoff	29b0e5d71c	Merge pull request #3686 from annando/remote-self ... "remote self" should work now	2017-09-06 19:37:37 +02:00
Michael	d25670a4e6	"remote self" should work now	2017-09-06 16:20:14 +00:00
Silke Meyer	50cec46d1f	Vagrant only for Xenial, more RAM for debugging, no poller	2017-09-06 10:00:06 +02:00
Tobias Diekershoff	26a223c746	Merge pull request #3683 from annando/remote-self-addon ... "remote-self" hadn't worked well with addons	2017-09-06 08:18:02 +02:00
Michael	c35a43bcb8	"remote-self" hadn't worked well with addons	2017-09-06 06:02:26 +00:00
Tobias Diekershoff	692d7e356a	Merge pull request #3682 from annando/independent-links ... Support for server independant Diaspora style links	2017-09-06 07:24:47 +02:00
Michael	cb8581b29a	Support for server independant Diaspora style links	2017-09-06 04:55:36 +00:00
Michael Vogel	0c7b3174c0	Merge pull request #3681 from tobiasd/20170905-de ... update DE translation	2017-09-05 23:16:04 +02:00
Tobias Diekershoff	7ac56ed0bc	update DE translation	2017-09-05 18:19:52 +02:00
Tobias Diekershoff	8215b9da87	Merge pull request #3679 from annando/json-webfinger ... We are now probing differently for webfinger data	2017-09-04 21:34:31 +02:00
Michael	78d4386332	We are now probing differently for webfinger data	2017-09-04 19:13:33 +00:00
Michael Vogel	28ea280279	Merge pull request #3678 from tobiasd/20170904-langdet ... updated language detection library	2017-09-04 20:26:21 +02:00
Silke Meyer	663b6e9300	do not import test sql for the moment	2017-09-04 12:35:22 +02:00
Tobias Diekershoff	c86840c4b9	updated pear LangDetect to version 1.0.0	2017-09-04 09:52:14 +02:00
rabuzarus	2bf6b15833	Merge pull request #3675 from annando/mail-profile ... Links to profiles in mails now show the profile address as title	2017-09-03 11:54:21 +02:00
Michael Vogel	bfe9040113	Merge pull request #3677 from rabuzarus/20170902_-_fix_oembed_video ... fix some optical glitches with oembedded links and videos	2017-09-02 21:49:35 +02:00
Michael Vogel	6fe7944036	Merge pull request #3676 from rabuzarus/20170831_-_frio_register_template ... Frio: add register template	2017-09-02 21:48:51 +02:00
rabuzarus	4602a46585	fix some optical glitches with oembedded links and videos	2017-09-02 18:56:22 +02:00
rabuzarus	94f03efde0	Frio: add register template	2017-09-02 17:49:55 +02:00
Michael	b1668ffdda	Address instead of url	2017-09-01 19:32:12 +00:00
Michael	88fb02db8d	Small correction	2017-08-31 12:10:17 +00:00
Michael	0e8104b172	Links to profiles in mails mow show the profile address and "redir" always works	2017-08-31 12:01:44 +00:00
Tobias Diekershoff	a62e8b7c05	Merge pull request #3674 from annando/display ... Display hadn't shown public items that weren't known to the user	2017-08-30 22:34:51 +02:00
Tobias Diekershoff	65f1bcb780	Merge pull request #3673 from annando/contact-updating ... Better updating of contacts	2017-08-30 22:34:01 +02:00
Tobias Diekershoff	5f356fa5e3	Merge pull request #3672 from annando/api-repeat ... Bugfix: Repeating of posts generated a SQL error	2017-08-30 22:32:06 +02:00
Michael	5f33f28b9e	Display hadn't shown public items that weren't known to the user	2017-08-30 20:20:01 +00:00
Michael	1cc50a80f4	Only update if there is a change	2017-08-30 19:33:16 +00:00
Michael	0083c16e87	Better updating of contacts	2017-08-30 18:05:41 +00:00
Michael	dbaed91a75	Bugfix: Repeating of posts generated a SQL error	2017-08-30 17:55:23 +00:00
Tobias Diekershoff	0fa84d01b0	Merge pull request #3670 from annando/json-webfinger ... Support for JSON based webfinger	2017-08-30 08:31:30 +02:00